From 92bb325415746ca407db9f1c9ab55adfdbfb3912 Mon Sep 17 00:00:00 2001 From: mhkim Date: Sat, 22 Nov 2025 23:46:01 -0600 Subject: [PATCH 1/2] Add CALOROC1B data model --- edm4eic.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/edm4eic.yaml b/edm4eic.yaml index dfaa144..1b048e5 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -200,6 +200,13 @@ components: - bool TOTInProgress // Flag which indicates if TOT calculation is ongoing, ADC value may be corrupted if this is true - bool TOTComplete // Flag which indicates if a TOT calculation is complete and TOT value is valid + ## An individual sample output by a CALOROC1B chip + edm4eic::CALOROC1BSample: + Members: + - uint16_t lowGainADC // [ADC Counts], amplitude of signal during sample in the low gain mode + - uint16_t highGainADC // [ADC Counts], amplitude of signal during sample in the high gain mode + - uint16_t timeOfArrival // Time of arrival (TOA) [TDC counts] + datatypes: edm4eic::Tensor: @@ -278,6 +285,16 @@ datatypes: VectorMembers: - edm4eic::HGCROCSample samples // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out + edm4eic::RawCALOROC1BHit: + Description: "Raw hit from an CALOROC1B chip" + Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky, D. Kalinkin, M. H. Kim" + Members: + - uint64_t cellID // Detector specific (geometrical) cell id + - int32_t samplePhase // Phase of samples in [# samples], for synchronizing across chips + - int32_t timeStamp // [TDC counts] + VectorMembers: + - edm4eic::CALOROC1BSample samples // Low- and high-gain ADC and Time of Arrival (TOA) values for each sample read out + edm4eic::CalorimeterHit: Description: "Calorimeter hit" Author: "W. Armstrong, S. Joosten" From f28cd38bce0b29bc579c9dae301f5571f0887a93 Mon Sep 17 00:00:00 2001 From: mhkim Date: Sat, 29 Nov 2025 20:28:16 -0600 Subject: [PATCH 2/2] Combine the RawHGCROCHit and RawCALOROC1BHit --- edm4eic.yaml | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 1b048e5..da49c42 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -191,8 +191,8 @@ components: - uint32_t boundValuesSize // size of bound values - std::array transform // row-wise 4x4 affine transform [R T; 0 1] with 3x3 rotation matrix R and translation column 3-vector T - ## An individual sample output by an HGCROC chip - edm4eic::HGCROCSample: + ## An individual sample output by a CALOROC1A chip + edm4eic::CALOROC1ASample: Members: - uint16_t ADC // [ADC Counts], amplitude of signal during sample, valid IFF TOTInProgress is false - uint16_t timeOfArrival // Time of arrival (TOA) [TDC counts], nonzero IFF ADC crossed threshold upwards during sample @@ -275,25 +275,16 @@ datatypes: ## Calorimetry ## ========================================================================== - edm4eic::RawHGCROCHit: - Description: "Raw hit from an HGCROC chip" - Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky, D. Kalinkin" - Members: - - uint64_t cellID // Detector specific (geometrical) cell id - - int32_t samplePhase // Phase of samples in [# samples], for synchronizing across chips - - int32_t timeStamp // [TDC counts] - VectorMembers: - - edm4eic::HGCROCSample samples // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out - - edm4eic::RawCALOROC1BHit: - Description: "Raw hit from an CALOROC1B chip" - Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky, D. Kalinkin, M. H. Kim" + edm4eic::RawCALOROCHit: + Description: "Raw hit from a CALOROC1A/B chip" + Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky, D. Kalinkin, M. Zurek, M. H. Kim" Members: - uint64_t cellID // Detector specific (geometrical) cell id - int32_t samplePhase // Phase of samples in [# samples], for synchronizing across chips - int32_t timeStamp // [TDC counts] VectorMembers: - - edm4eic::CALOROC1BSample samples // Low- and high-gain ADC and Time of Arrival (TOA) values for each sample read out + - edm4eic::CALOROC1ASample aSamples // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out + - edm4eic::CALOROC1BSample bSamples // Low- and high-gain ADC and Time of Arrival (TOA) values for each sample read out edm4eic::CalorimeterHit: Description: "Calorimeter hit"