From fe0f7836611df15737ee85e8ed9be04765bda681 Mon Sep 17 00:00:00 2001 From: ruse-traveler Date: Mon, 9 Jun 2025 11:09:02 -0400 Subject: [PATCH 1/3] Add reworked CALOROC proposal --- edm4eic.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/edm4eic.yaml b/edm4eic.yaml index 8aeead7..922b17e 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -191,6 +191,15 @@ 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 a HGC/CALOROC chip + edm4eic::CALOROCSample: + 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 + - uint16_t timeOverThreshold // Time over threshold (TOT) [TDC counts], nonzero IFF ADC crossed threshold downwards during sample AND if TOA fired in a previous sample + - bool TOTInProgress // Flag which indicates if a TOT fired in a previous sample and 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 + datatypes: edm4eic::Tensor: @@ -265,6 +274,17 @@ datatypes: ## ========================================================================== ## Calorimetry ## ========================================================================== + + edm4eic::RawCALOROCHit: + Description: "Raw hit from a CALOROC/HGCROC chip" + Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky" + 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::CALOROCSample sample // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out + edm4eic::CalorimeterHit: Description: "Calorimeter hit" Author: "W. Armstrong, S. Joosten" From f5b28f112fbb4f95cadb579f1ff3461191136e82 Mon Sep 17 00:00:00 2001 From: ruse-traveler Date: Mon, 30 Jun 2025 09:32:41 -0400 Subject: [PATCH 2/3] Remove CALOROC mention --- edm4eic.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 922b17e..f47c84a 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 a HGC/CALOROC chip - edm4eic::CALOROCSample: + ## An individual sample output by an HGCROC chip + edm4eic::HGCROCSample: 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,15 +275,15 @@ datatypes: ## Calorimetry ## ========================================================================== - edm4eic::RawCALOROCHit: - Description: "Raw hit from a CALOROC/HGCROC chip" + edm4eic::RawHGCROCHit: + Description: "Raw hit from an HGCROC chip" Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky" 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] + - 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::CALOROCSample sample // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out + - edm4eic::HGCROCSample sample // ADC, Time of Arrival (TOA), and Time over Threshold (TOT) values for each sample read out edm4eic::CalorimeterHit: Description: "Calorimeter hit" From f7402372fd6dbc97b77ae345f913b8b784117bf8 Mon Sep 17 00:00:00 2001 From: ruse-traveler Date: Mon, 30 Jun 2025 09:33:49 -0400 Subject: [PATCH 3/3] Update author list --- edm4eic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index f47c84a..aeb76e5 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -277,7 +277,7 @@ datatypes: edm4eic::RawHGCROCHit: Description: "Raw hit from an HGCROC chip" - Author: "D. Anderson, S. Joosten, T. Protzman, N. Novitzky" + 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