From 8ca6831a0a621e828593cc3d4bcabef769a07326 Mon Sep 17 00:00:00 2001 From: lintao <lintao51@gmail.com> Date: Fri, 24 Sep 2021 23:00:12 +0800 Subject: [PATCH] Update G2CDArbor. --- Digitisers/G2CDArbor/CMakeLists.txt | 6 ++++++ Digitisers/G2CDArbor/src/G2CDArborAlg.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Digitisers/G2CDArbor/CMakeLists.txt b/Digitisers/G2CDArbor/CMakeLists.txt index cc6bf389..85949dbb 100644 --- a/Digitisers/G2CDArbor/CMakeLists.txt +++ b/Digitisers/G2CDArbor/CMakeLists.txt @@ -11,7 +11,13 @@ gaudi_add_module(G2CDArbor ${GSL_LIBRARIES} ${LCIO_LIBRARIES} EDM4HEP::edm4hep EDM4HEP::edm4hepDict + DD4hep::DDRec ) + +target_include_directories(G2CDArbor + PUBLIC ${LCIO_INCLUDE_DIRS}) + + install(TARGETS G2CDArbor EXPORT CEPCSWTargets RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT bin diff --git a/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp b/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp index a38826b9..e9042584 100644 --- a/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp +++ b/Digitisers/G2CDArbor/src/G2CDArborAlg.cpp @@ -508,7 +508,7 @@ StatusCode G2CDArborAlg::execute() // LayerNum = idDecoder(SimEcalhit)["K-1"]; // edm4hep::SimCalorimeterHit aa(SimEcalhit.getCellID(), SimEcalhit.getEnergy(), SimEcalhit.getPosition()); - ID_UTIL::CellIDDecoder<edm4hep::SimCalorimeterHit> cellIdDecoder(m_encoder_str); + ID_UTIL::CellIDDecoder< decltype(SimEcalhit) > cellIdDecoder(m_encoder_str); const std::string layerCodingString(m_encoder_str); const std::string layerCoding(this->GetLayerCoding(layerCodingString)); if(m_readLCIO==false) LayerNum = m_decoder->get(cellid, "layer");//from 0 - 29, 0 is preshower -- GitLab