diff --git a/docs/clic-recipe.md b/docs/clic-recipe.md index 5cefe75..14cb52a 100644 --- a/docs/clic-recipe.md +++ b/docs/clic-recipe.md @@ -30,7 +30,7 @@ git clone git@github.com:key4hep/k4MarlinWrapper.git git clone https://github.com/iLCSoft/CLICPerformance cd CLICPerformance/clicConfig -ddsim --steeringFile clic_steer.py --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml --enableGun --gun.distribution uniform --gun.particle gamma --gun.energy 10*GeV --outputFile gamma_10GeV_edm4hep.root --numberOfEvents 10 +ddsim --steeringFile clic_steer.py --compactFile $LCGEO/CLIC/compact/CLIC_o3_v14/CLIC_o3_v14.xml --enableGun --gun.distribution uniform --gun.particle gamma --gun.energy "10*GeV" --outputFile gamma_10GeV_edm4hep.root --numberOfEvents 10 cp $K4MARLINWRAPPER/examples/clicRec_e4h_input.py . k4run clicRec_e4h_input.py --EventDataSvc.input gamma_10GeV_edm4hep.root diff --git a/include/CLUENtuplizer.h b/include/CLUENtuplizer.h index f351d82..278b5c3 100644 --- a/include/CLUENtuplizer.h +++ b/include/CLUENtuplizer.h @@ -97,7 +97,6 @@ class CLUENtuplizer : public Gaudi::Algorithm { mutable DataHandle EE_calo_handle {"EndcapInputHits", Gaudi::DataHandle::Reader, this}; mutable DataHandle ev_handle {"EventHeader", Gaudi::DataHandle::Reader, this}; mutable DataHandle mcp_handle {"MCParticles", Gaudi::DataHandle::Reader, this}; - mutable DataHandle cluster_handle {ClusterCollectionName, Gaudi::DataHandle::Reader, this}; MetaDataHandle cellIDHandle {EB_calo_handle, edm4hep::CellIDEncoding, Gaudi::DataHandle::Reader}; bool singleMCParticle = false; diff --git a/src/CLUENtuplizer.cpp b/src/CLUENtuplizer.cpp index 431ac38..ed643f0 100644 --- a/src/CLUENtuplizer.cpp +++ b/src/CLUENtuplizer.cpp @@ -105,6 +105,10 @@ StatusCode CLUENtuplizer::execute(const EventContext&) const { debug() << "ECAL Calorimeter Hits Size = " << (*EB_calo_coll).size()+(*EE_calo_coll).size() << endmsg; // Read cluster collection + // This should be fixed, for now the const cast is added to be able to create the handle + // as it was done before https://github.com/key4hep/k4Clue/pull/60 + DataHandle cluster_handle { + ClusterCollectionName, Gaudi::DataHandle::Reader, const_cast(this) }; cluster_coll = cluster_handle.get(); // Get collection metadata cellID which is valid for both EB, EE and Clusters diff --git a/src/k4clue/CMakeLists.txt b/src/k4clue/CMakeLists.txt index be74a02..a3d163d 100644 --- a/src/k4clue/CMakeLists.txt +++ b/src/k4clue/CMakeLists.txt @@ -42,7 +42,7 @@ target_include_directories(ClueGaudiAlgorithmWrapper PUBLIC ) ExternalData_Add_Test(k4clue_tests NAME gaudiWrapper WORKING_DIRECTORY ${PROJECT_BINARY_DIR} - COMMAND bash -c "k4run ${PROJECT_SOURCE_DIR}/gaudi_opts/clue_gaudi_wrapper.py --EventDataSvc.input DATA{${PROJECT_SOURCE_DIR}/test/input_files/20240226_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root} --ClueGaudiAlgorithmWrapperName.OutputLevel 2 --CLUEAnalysis.OutputLevel 2") + COMMAND bash -c "k4run ${PROJECT_SOURCE_DIR}/gaudi_opts/clue_gaudi_wrapper.py --EventDataSvc.input DATA{${PROJECT_SOURCE_DIR}/test/input_files/20240905_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root} --ClueGaudiAlgorithmWrapperName.OutputLevel 2 --CLUEAnalysis.OutputLevel 2") set_tests_properties(gaudiWrapper PROPERTIES FAIL_REGULAR_EXPRESSION "ERROR;Failed") diff --git a/test/input_files/20240226_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root.md5 b/test/input_files/20240226_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root.md5 deleted file mode 100644 index 56cf345..0000000 --- a/test/input_files/20240226_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root.md5 +++ /dev/null @@ -1 +0,0 @@ -534c086df3c125d3d0328b6565115729 \ No newline at end of file diff --git a/test/input_files/20240905_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root.md5 b/test/input_files/20240905_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root.md5 new file mode 100644 index 0000000..ea638b0 --- /dev/null +++ b/test/input_files/20240905_gammaFromVertex_10GeV_uniform_10events_reco_edm4hep.root.md5 @@ -0,0 +1 @@ +6ff3529e4b7a35f96977d58db352a184 \ No newline at end of file