Add a new input file after the changes in EDM4hep (#58)

key4hep · Sep 5, 2024 · 0bdb35b · 0bdb35b
1 parent 1877183
commit 0bdb35b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 4 deletions.
diff --git a/docs/clic-recipe.md b/docs/clic-recipe.md
@@ -30,7 +30,7 @@ git clone [email protected]: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
@@ -97,7 +97,6 @@ class CLUENtuplizer : public Gaudi::Algorithm {
   mutable DataHandle<edm4hep::CalorimeterHitCollection> EE_calo_handle {"EndcapInputHits", Gaudi::DataHandle::Reader, this};
   mutable DataHandle<edm4hep::EventHeaderCollection> ev_handle {"EventHeader", Gaudi::DataHandle::Reader, this};
   mutable DataHandle<edm4hep::MCParticleCollection> mcp_handle {"MCParticles", Gaudi::DataHandle::Reader, this};
-  mutable DataHandle<edm4hep::ClusterCollection> cluster_handle {ClusterCollectionName, Gaudi::DataHandle::Reader, this};
   MetaDataHandle<std::string> cellIDHandle {EB_calo_handle, edm4hep::CellIDEncoding, Gaudi::DataHandle::Reader};
 
   bool singleMCParticle = false;

diff --git 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<edm4hep::ClusterCollection> cluster_handle {
+    ClusterCollectionName, Gaudi::DataHandle::Reader, const_cast<CLUENtuplizer*>(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
@@ -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
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
@@ -0,0 +1 @@
+6ff3529e4b7a35f96977d58db352a184