From 76a049546f8fc43e4d555b0a5b699c50b31569cc Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Thu, 25 Jul 2024 17:15:14 -0400 Subject: [PATCH 01/11] Add association between raw tracker hit and tracker hit --- edm4eic.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 9de1462..250efe1 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -367,7 +367,10 @@ datatypes: - float timeError // Error on the time - float edep // Energy deposit in this hit [GeV] - float edepError // Error on the energy deposit [GeV] - + - float weight // Weight of association with raw hit + OneToOneRelations: + - edm4eic::RawTrackerHit rawHit // Associated raw hit + edm4eic::Measurement2D: Description: "2D measurement (on an arbitrary surface)" Author: "W. Deconinck" From b9849b3a985b4769ed3fde86c3c87f6796a82945 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Thu, 25 Jul 2024 17:31:44 -0400 Subject: [PATCH 02/11] Weight is unnecessary Reco always matches with one raw hit --- edm4eic.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 250efe1..45ccda2 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -367,7 +367,6 @@ datatypes: - float timeError // Error on the time - float edep // Energy deposit in this hit [GeV] - float edepError // Error on the energy deposit [GeV] - - float weight // Weight of association with raw hit OneToOneRelations: - edm4eic::RawTrackerHit rawHit // Associated raw hit From 0d6e792e93d49c9fb087ece0d6890cb4bb60b575 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Thu, 25 Jul 2024 17:57:47 -0400 Subject: [PATCH 03/11] Add related raw calorimeter hit to calorimeter hit --- edm4eic.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 45ccda2..33a8467 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -259,6 +259,8 @@ datatypes: - int32_t sector // Sector that this hit occurred in - int32_t layer // Layer that the hit occurred in - edm4hep::Vector3f local // The local coordinates of the hit in the detector segment [mm]. + OneToOneRelations: + - edm4eic::RawTrackerHit rawCalorimeterHit // Related raw calorimeter hit ## ========================================================================== ## Clustering @@ -368,7 +370,7 @@ datatypes: - float edep // Energy deposit in this hit [GeV] - float edepError // Error on the energy deposit [GeV] OneToOneRelations: - - edm4eic::RawTrackerHit rawHit // Associated raw hit + - edm4eic::RawTrackerHit rawHit // Related raw hit edm4eic::Measurement2D: Description: "2D measurement (on an arbitrary surface)" From 05e58b27856dbefb377d31dff8360001935f83a3 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Fri, 26 Jul 2024 08:44:00 -0400 Subject: [PATCH 04/11] Add raw calorimeter hit and sim calorimeter hit association. Remove ambiguity in nomenclature. --- edm4eic.yaml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 33a8467..c4d30b3 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -260,7 +260,7 @@ datatypes: - int32_t layer // Layer that the hit occurred in - edm4hep::Vector3f local // The local coordinates of the hit in the detector segment [mm]. OneToOneRelations: - - edm4eic::RawTrackerHit rawCalorimeterHit // Related raw calorimeter hit + - edm4eic::RawCalorimeterHit rawCalorimeterHit // Related raw calorimeter hit ## ========================================================================== ## Clustering @@ -370,7 +370,7 @@ datatypes: - float edep // Energy deposit in this hit [GeV] - float edepError // Error on the energy deposit [GeV] OneToOneRelations: - - edm4eic::RawTrackerHit rawHit // Related raw hit + - edm4eic::RawTrackerHit rawTrackerHit // Related raw tracker hit edm4eic::Measurement2D: Description: "2D measurement (on an arbitrary surface)" @@ -562,3 +562,12 @@ datatypes: OneToOneRelations: - edm4eic::RawTrackerHit rawHit // reference to the digitized hit - edm4hep::SimTrackerHit simHit // reference to the simulated hit + + edm4eic::MCRecoCalorimeterHitAssociation: + Description: "Association between a RawCalorimeterHit and a SimCalorimeterHit" + Author: "C. Dilks, W. Deconinck" + Members: + - float weight // weight of this association + OneToOneRelations: + - edm4eic::RawCalorimeterHit rawCalorimeterHit // reference to the digitized calorimeter hit + - edm4hep::SimCalorimeterHit simCalorimeterHit // reference to the simulated calorimeter hit From 7d669819d8c66081ac8a286be5e9157f94e75775 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Fri, 26 Jul 2024 08:50:17 -0400 Subject: [PATCH 05/11] More nomenclature changes --- edm4eic.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index c4d30b3..4c822dd 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -260,7 +260,7 @@ datatypes: - int32_t layer // Layer that the hit occurred in - edm4hep::Vector3f local // The local coordinates of the hit in the detector segment [mm]. OneToOneRelations: - - edm4eic::RawCalorimeterHit rawCalorimeterHit // Related raw calorimeter hit + - edm4eic::RawCalorimeterHit rawHit // Related raw calorimeter hit ## ========================================================================== ## Clustering @@ -370,7 +370,7 @@ datatypes: - float edep // Energy deposit in this hit [GeV] - float edepError // Error on the energy deposit [GeV] OneToOneRelations: - - edm4eic::RawTrackerHit rawTrackerHit // Related raw tracker hit + - edm4eic::RawTrackerHit rawHit // Related raw tracker hit edm4eic::Measurement2D: Description: "2D measurement (on an arbitrary surface)" @@ -569,5 +569,5 @@ datatypes: Members: - float weight // weight of this association OneToOneRelations: - - edm4eic::RawCalorimeterHit rawCalorimeterHit // reference to the digitized calorimeter hit - - edm4hep::SimCalorimeterHit simCalorimeterHit // reference to the simulated calorimeter hit + - edm4eic::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit + - edm4hep::SimCalorimeterHit simHit // reference to the simulated calorimeter hit From 4d5810ffa5aaa1778bfe6b71ebdbf0ad3f9e0e91 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 26 Jul 2024 10:24:46 -0500 Subject: [PATCH 06/11] fix: spacing --- edm4eic.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 4c822dd..04b198d 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -260,7 +260,7 @@ datatypes: - int32_t layer // Layer that the hit occurred in - edm4hep::Vector3f local // The local coordinates of the hit in the detector segment [mm]. OneToOneRelations: - - edm4eic::RawCalorimeterHit rawHit // Related raw calorimeter hit + - edm4eic::RawCalorimeterHit rawHit // Related raw calorimeter hit ## ========================================================================== ## Clustering @@ -561,7 +561,7 @@ datatypes: - float weight // weight of this association OneToOneRelations: - edm4eic::RawTrackerHit rawHit // reference to the digitized hit - - edm4hep::SimTrackerHit simHit // reference to the simulated hit + - edm4hep::SimTrackerHit simHit // reference to the simulated hit edm4eic::MCRecoCalorimeterHitAssociation: Description: "Association between a RawCalorimeterHit and a SimCalorimeterHit" @@ -569,5 +569,5 @@ datatypes: Members: - float weight // weight of this association OneToOneRelations: - - edm4eic::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit - - edm4hep::SimCalorimeterHit simHit // reference to the simulated calorimeter hit + - edm4eic::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit + - edm4hep::SimCalorimeterHit simHit // reference to the simulated calorimeter hit From a25efbc85dbaea4033ea6e0f77e162d5e9ea3548 Mon Sep 17 00:00:00 2001 From: Wouter Deconinck Date: Fri, 26 Jul 2024 10:24:58 -0500 Subject: [PATCH 07/11] fix: author --- edm4eic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 04b198d..00e94aa 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -565,7 +565,7 @@ datatypes: edm4eic::MCRecoCalorimeterHitAssociation: Description: "Association between a RawCalorimeterHit and a SimCalorimeterHit" - Author: "C. Dilks, W. Deconinck" + Author: "S. Rahman" Members: - float weight // weight of this association OneToOneRelations: From 04b7a91242eea278c080d08f992ca16f3baf345e Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Fri, 26 Jul 2024 13:15:02 -0400 Subject: [PATCH 08/11] Use edm4hep type which uses signed instead of unsigned members Suggested by @veprbl --- edm4eic.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 00e94aa..e1fddd4 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -260,7 +260,7 @@ datatypes: - int32_t layer // Layer that the hit occurred in - edm4hep::Vector3f local // The local coordinates of the hit in the detector segment [mm]. OneToOneRelations: - - edm4eic::RawCalorimeterHit rawHit // Related raw calorimeter hit + - edm4hep::RawCalorimeterHit rawHit // Related raw calorimeter hit ## ========================================================================== ## Clustering @@ -569,5 +569,5 @@ datatypes: Members: - float weight // weight of this association OneToOneRelations: - - edm4eic::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit + - edm4hep::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit - edm4hep::SimCalorimeterHit simHit // reference to the simulated calorimeter hit From a0288caad2415b6459019736bbebcfcaccd44b4f Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 26 Jul 2024 13:37:12 -0400 Subject: [PATCH 09/11] formatting nitpick --- edm4eic.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index e1fddd4..5fa6f90 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -560,8 +560,8 @@ datatypes: Members: - float weight // weight of this association OneToOneRelations: - - edm4eic::RawTrackerHit rawHit // reference to the digitized hit - - edm4hep::SimTrackerHit simHit // reference to the simulated hit + - edm4eic::RawTrackerHit rawHit // reference to the digitized hit + - edm4hep::SimTrackerHit simHit // reference to the simulated hit edm4eic::MCRecoCalorimeterHitAssociation: Description: "Association between a RawCalorimeterHit and a SimCalorimeterHit" @@ -569,5 +569,5 @@ datatypes: Members: - float weight // weight of this association OneToOneRelations: - - edm4hep::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit - - edm4hep::SimCalorimeterHit simHit // reference to the simulated calorimeter hit + - edm4hep::RawCalorimeterHit rawHit // reference to the digitized calorimeter hit + - edm4hep::SimCalorimeterHit simHit // reference to the simulated calorimeter hit From cd751704dc1d9c22b75a41fa301933db01a06ca8 Mon Sep 17 00:00:00 2001 From: Sakib Rahman Date: Fri, 26 Jul 2024 13:49:33 -0400 Subject: [PATCH 10/11] Remove redundant edm4eic RawCalorimeterHit type --- edm4eic.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 5fa6f90..6d11477 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -234,17 +234,6 @@ datatypes: ## ========================================================================== ## Calorimetry ## ========================================================================== - edm4eic::RawCalorimeterHit: - Description: "Raw (digitized) calorimeter hit" - Author: "W. Armstrong, S. Joosten" - Members: - - uint64_t cellID // The detector specific (geometrical) cell id. - - uint64_t amplitude // The magnitude of the hit in ADC counts. - ## @TODO: should we also add integral and time-over-threshold (ToT) here? Or should - ## those all be different raw sensor types? Amplitude is - ## really not what most calorimetry sensors will give us AFAIK... - - uint64_t timeStamp // Timing in TDC - edm4eic::CalorimeterHit: Description: "Calorimeter hit" Author: "W. Armstrong, S. Joosten" From 0b2838ec0679642d815078101d1692cc454b9087 Mon Sep 17 00:00:00 2001 From: SAKIB RAHMAN Date: Fri, 26 Jul 2024 15:10:05 -0400 Subject: [PATCH 11/11] Revert "Remove redundant edm4eic RawCalorimeterHit type" This reverts commit cd751704dc1d9c22b75a41fa301933db01a06ca8. --- edm4eic.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/edm4eic.yaml b/edm4eic.yaml index 6d11477..5fa6f90 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -234,6 +234,17 @@ datatypes: ## ========================================================================== ## Calorimetry ## ========================================================================== + edm4eic::RawCalorimeterHit: + Description: "Raw (digitized) calorimeter hit" + Author: "W. Armstrong, S. Joosten" + Members: + - uint64_t cellID // The detector specific (geometrical) cell id. + - uint64_t amplitude // The magnitude of the hit in ADC counts. + ## @TODO: should we also add integral and time-over-threshold (ToT) here? Or should + ## those all be different raw sensor types? Amplitude is + ## really not what most calorimetry sensors will give us AFAIK... + - uint64_t timeStamp // Timing in TDC + edm4eic::CalorimeterHit: Description: "Calorimeter hit" Author: "W. Armstrong, S. Joosten"