From 705ffb1cfd0a4849806d311bac400d716793e4e4 Mon Sep 17 00:00:00 2001
From: lintao <lintao51@gmail.com>
Date: Fri, 24 Sep 2021 23:54:10 +0800
Subject: [PATCH] update TPCDigiAlg, Generator.
---
Digitisers/SimpleDigi/src/TPCDigiAlg.cpp | 4 ++--
Digitisers/SimpleDigi/src/TPCDigiAlg.h | 3 +++
Generator/CMakeLists.txt | 5 +++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp b/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
index 239048f4..10247c12 100644
--- a/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
+++ b/Digitisers/SimpleDigi/src/TPCDigiAlg.cpp
@@ -529,9 +529,9 @@ StatusCode TPCDigiAlg::execute()
if (!STHcol) {
return StatusCode::SUCCESS;
}
- auto SimTHit0 = STHcol->at(0);
+ // auto SimTHit0 = STHcol->at(0);
- std::map< Voxel_tpc *, decltype(SimTHit0) > _tpcHitMap;
+ // std::map< Voxel_tpc *, decltype(SimTHit0) > _tpcHitMap;
_tpcHitMap.clear();
diff --git a/Digitisers/SimpleDigi/src/TPCDigiAlg.h b/Digitisers/SimpleDigi/src/TPCDigiAlg.h
index c1c6eabd..1eb97e9c 100644
--- a/Digitisers/SimpleDigi/src/TPCDigiAlg.h
+++ b/Digitisers/SimpleDigi/src/TPCDigiAlg.h
@@ -29,6 +29,8 @@ Steve Aplin 26 June 2009 (DESY)
#include <gsl/gsl_rng.h>
+#include <type_traits>
+
//#ifdef MARLIN_USE_AIDA
//#include <marlin/AIDAProcessor.h>
@@ -211,6 +213,7 @@ protected:
std::vector< std::vector <Voxel_tpc *> > _tpcRowHits;
// std::map< Voxel_tpc *,edm4hep::SimTrackerHit > _tpcHitMap;
+ std::map< Voxel_tpc *, edm4hep::ConstSimTrackerHit > _tpcHitMap;
UTIL::BitField64* _cellid_encoder;
diff --git a/Generator/CMakeLists.txt b/Generator/CMakeLists.txt
index 0a244a3a..bf233d1b 100644
--- a/Generator/CMakeLists.txt
+++ b/Generator/CMakeLists.txt
@@ -27,6 +27,11 @@ gaudi_add_module(GenAlgo
ROOT::EG
)
+target_include_directories(GenAlgo
+ PUBLIC ${LCIO_INCLUDE_DIRS}
+ PUBLIC ${HEPMC_INCLUDE_DIRS}
+)
+
install(TARGETS GenAlgo
EXPORT CEPCSWTargets
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin
--
GitLab