From 68c32cd05984d83d61c3a22f2dfbe3c56616bda4 Mon Sep 17 00:00:00 2001 From: Tyler Kutz Date: Thu, 10 Aug 2023 10:37:54 -0400 Subject: [PATCH 1/4] Added int32_t member to TrackPoint to store surface ID --- edm4eic.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/edm4eic.yaml b/edm4eic.yaml index 64bfd91..2eaae8a 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -140,6 +140,7 @@ components: - edm4eic::Cov2f directionError // Error on the polar and azimuthal angles - float pathlength // Pathlength from the origin to this point - float pathlengthError // Error on the pathlength + - int32_t surface // Surface on which the track point lies ## PID hypothesis from Cherenkov detectors edm4eic::CherenkovParticleIDHypothesis: From f19727b7601756ef446cd49f05660667dcd3f8e7 Mon Sep 17 00:00:00 2001 From: Tyler Kutz Date: Fri, 25 Aug 2023 15:22:18 -0400 Subject: [PATCH 2/4] Switched from single 32-bit integer for TrackPoint surface ID to two 16-bit integers for TrackPoint detector and surface ID --- edm4eic.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 2111686..cfbfaae 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -140,7 +140,8 @@ components: - edm4eic::Cov2f directionError // Error on the polar and azimuthal angles - float pathlength // Pathlength from the origin to this point - float pathlengthError // Error on the pathlength - - int32_t surface // Surface on which the track point lies + - uint16_t detectorID // Detector to which the track point was propagated to + - uint16_t surfaceID // Surface on which the track point lies (for multiple surfaces per detector) ## PID hypothesis from Cherenkov detectors edm4eic::CherenkovParticleIDHypothesis: From f2bd0edf16d0e1e5d934491e01f11099fd3c404f Mon Sep 17 00:00:00 2001 From: Tyler Kutz Date: Thu, 31 Aug 2023 11:13:27 -0400 Subject: [PATCH 3/4] Changed type and names of surface/detector identifiers in TrackPoint --- edm4eic.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index cfbfaae..112089a 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -140,8 +140,8 @@ components: - edm4eic::Cov2f directionError // Error on the polar and azimuthal angles - float pathlength // Pathlength from the origin to this point - float pathlengthError // Error on the pathlength - - uint16_t detectorID // Detector to which the track point was propagated to - - uint16_t surfaceID // Surface on which the track point lies (for multiple surfaces per detector) + - uint64_t surface // Surface track was propagated to (possibly multiple per detector) + - uint16_t system // Detector system track was propagated to ## PID hypothesis from Cherenkov detectors edm4eic::CherenkovParticleIDHypothesis: From 5e16e07005a0c1bc8f39895a3cbd95dbe7a26a34 Mon Sep 17 00:00:00 2001 From: Tyler Kutz Date: Thu, 31 Aug 2023 14:56:02 -0400 Subject: [PATCH 4/4] Changed type and ordering of new TrackPoint members --- edm4eic.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edm4eic.yaml b/edm4eic.yaml index 112089a..52aef0a 100644 --- a/edm4eic.yaml +++ b/edm4eic.yaml @@ -129,6 +129,8 @@ components: ## A point along a track edm4eic::TrackPoint: Members: + - uint64_t surface // Surface track was propagated to (possibly multiple per detector) + - uint32_t system // Detector system track was propagated to - edm4hep::Vector3f position // Position of the trajectory point [mm] - edm4eic::Cov3f positionError // Error on the position - edm4hep::Vector3f momentum // 3-momentum at the point [GeV] @@ -140,8 +142,6 @@ components: - edm4eic::Cov2f directionError // Error on the polar and azimuthal angles - float pathlength // Pathlength from the origin to this point - float pathlengthError // Error on the pathlength - - uint64_t surface // Surface track was propagated to (possibly multiple per detector) - - uint16_t system // Detector system track was propagated to ## PID hypothesis from Cherenkov detectors edm4eic::CherenkovParticleIDHypothesis: