From 161daf63cf8befcd2f0e72ed769b664b872e683c Mon Sep 17 00:00:00 2001 From: wonyongc Date: Fri, 25 Oct 2024 16:02:36 -0400 Subject: [PATCH 1/3] Added SimDRCalorimeterHit for dual-readout --- edm4hep.yaml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/edm4hep.yaml b/edm4hep.yaml index 5fff0bc6..a9a88b29 100644 --- a/edm4hep.yaml +++ b/edm4hep.yaml @@ -402,6 +402,28 @@ datatypes: - edm4hep::Vector3f position [mm] // position of the hit in world coordinates - int32_t type // type of hit + + edm4hep::SimDRCalorimeterHit: + Description: "Simulated dual-readout calorimeter hit with S/C counts and wavelength/timing bins" + Author: "Wonyong Chung" + Members: + - uint64_t cellID // detector cellID + - float energy [GeV] // energy of the hit + - edm4hep::Vector3f position [mm] // position of the calorimeter cell in world coords + - int32_t eta // detector cell eta + - int32_t phi // detector cell phi + - int32_t depth // detector cell depth + - int32_t system // detector cell system + - int32_t ncerenkov // number of cerenkov hits + - int32_t nscintillator // number of scint hits + - std::array nwavelen_cer // number of cerenkov wavelength hits + - std::array nwavelen_scint // number of scint wavelength hits + - std::array ntime_cer // number of cerenkov time hits + - std::array ntime_scint // number of scint hits + OneToManyRelations: + - edm4hep::CaloHitContribution contributions // Monte Carlo step contributions + + edm4hep::ParticleID: Description: "ParticleID" Author: "EDM4hep authors" From e685ea6cb38ed9a4e12acd85da3b26a965dff3d9 Mon Sep 17 00:00:00 2001 From: Thomas Madlener Date: Fri, 8 Nov 2024 10:18:06 +0100 Subject: [PATCH 2/3] Make sure to only run tests with compatible root versions (#381) --- test/backwards_compat/CMakeLists.txt | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/test/backwards_compat/CMakeLists.txt b/test/backwards_compat/CMakeLists.txt index bb1b6cb5..a822cd0b 100644 --- a/test/backwards_compat/CMakeLists.txt +++ b/test/backwards_compat/CMakeLists.txt @@ -2,14 +2,26 @@ ExternalData_Add_Test(backward_compat_tests NAME backwards_compat_v00-99 COMMAND pytest -v --inputfile=DATA{${CMAKE_CURRENT_SOURCE_DIR}/input_files/edm4hep_example_v00-99-01_podio_v01-01.root}) set_test_env(backwards_compat_v00-99) -ExternalData_Add_Test(backward_compat_tests - NAME backwards_compat_rntuple_v00-99 COMMAND pytest -v --inputfile=DATA{${CMAKE_CURRENT_SOURCE_DIR}/input_files/edm4hep_example_rntuple_v00-99-01_podio_v01-01.root}) -set_test_env(backwards_compat_rntuple_v00-99) - set_tests_properties( backwards_compat_v00-99 - backwards_compat_rntuple_v00-99 PROPERTIES WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test ) + + +if (ROOT_VERSION VERSION_LESS 6.33) + # This input file has been written with RNTuple RC2 which is only present up + # to the 6.32 release series. Trying to read this with a newer version of ROOT + # doesn't work + ExternalData_Add_Test(backward_compat_tests + NAME backwards_compat_rntuple_v00-99 COMMAND pytest -v --inputfile=DATA{${CMAKE_CURRENT_SOURCE_DIR}/input_files/edm4hep_example_rntuple_v00-99-01_podio_v01-01.root}) + set_test_env(backwards_compat_rntuple_v00-99) + + set_tests_properties( + backwards_compat_rntuple_v00-99 + + PROPERTIES + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/test + ) +endif() From f18a2f2a9e6b070e971e185e8030896484ac8d25 Mon Sep 17 00:00:00 2001 From: wonyongc Date: Wed, 11 Dec 2024 16:04:15 -0500 Subject: [PATCH 3/3] Simpler DR Calorimeter Hits --- edm4hep.yaml | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/edm4hep.yaml b/edm4hep.yaml index a9a88b29..b83fa5f6 100644 --- a/edm4hep.yaml +++ b/edm4hep.yaml @@ -404,26 +404,19 @@ datatypes: edm4hep::SimDRCalorimeterHit: - Description: "Simulated dual-readout calorimeter hit with S/C counts and wavelength/timing bins" + Description: "Simulated dual-readout calorimeter hit" Author: "Wonyong Chung" Members: - - uint64_t cellID // detector cellID - - float energy [GeV] // energy of the hit - - edm4hep::Vector3f position [mm] // position of the calorimeter cell in world coords - - int32_t eta // detector cell eta - - int32_t phi // detector cell phi - - int32_t depth // detector cell depth - - int32_t system // detector cell system - - int32_t ncerenkov // number of cerenkov hits - - int32_t nscintillator // number of scint hits - - std::array nwavelen_cer // number of cerenkov wavelength hits - - std::array nwavelen_scint // number of scint wavelength hits - - std::array ntime_cer // number of cerenkov time hits - - std::array ntime_scint // number of scint hits + - uint64_t cellID // detector cellID + - float energy [GeV] // energy of the hit + - edm4hep::Vector3f position [mm] // position of the calorimeter cell in world coords + - int32_t nCerenkovProd // number of cerenkov photons produced + - int32_t nScintillationProd // number of scint photons produced + - float tAvgC [ns] // avg arrival time for cerenkov photons + - float tAvgS [ns] // avg arrival time for scint photons OneToManyRelations: - edm4hep::CaloHitContribution contributions // Monte Carlo step contributions - edm4hep::ParticleID: Description: "ParticleID" Author: "EDM4hep authors"