From 8f419f995202c67a9ecf7ce88c059d632450b2b3 Mon Sep 17 00:00:00 2001
From: christopher dilks <christopher.j.dilks@gmail.com>
Date: Fri, 17 Jun 2022 21:01:38 -0400
Subject: [PATCH] remove TrajectoryPoint; add one-to-one relation between
 CherenkovParticleID and ReconstructedParticle

---
 eic_data.yaml | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/eic_data.yaml b/eic_data.yaml
index e6f6255..fb522f4 100644
--- a/eic_data.yaml
+++ b/eic_data.yaml
@@ -200,15 +200,6 @@ components:
       - float             pathlength      // Pathlength from the origin to this point
       - float             pathlengthError // Error on the pathlenght
  
-  ## A point along a trajectory
-  eic::TrajectoryPoint:
-    Members:
-      - eic::VectorXYZ    position      // Position of the trajectory point [mm]
-      - eic::VectorXYZ    p             // 3-momentum at the point [GeV]
-      - eic::Direction    direction     // (theta, phi) direction of track at the surface [mrad]
-      - float             momentum      // magnitude of 3-momentum [GeV]
-      - float             pathlength    // Pathlength from the origin to this point
-
   ## PID hypothesis from Cherenkov detectors
   eic::CherenkovPdgHypothesis:
     Members:
@@ -294,16 +285,15 @@ datatypes:
         bool isCompound() const {return particles_size() > 0;}\n
         "
 
-
   eic::CherenkovParticleID:
     Description: "Cherenkov detector PID"
     Author: "A. Kiselev, C. Dilks"
-    Members:
-      - eic::Index        ID                       // Unique entry ID
-      - eic::Index        recID                    // Index of the associated ReconstructedParticle particle, if any
     VectorMembers:
       - eic::CherenkovPdgHypothesis options        // Evaluated PDG hypotheses, typically (e/pi/K/p)
       - eic::CherenkovThetaAngleMeasurement angles // Evaluated Cherenkov angles for different radiators
+    OneToOneRelations:
+      ## @TODO: should it be one-to-one?
+      - eicd::ReconstructedParticle associatedParticle // associated reconstructed particle
 
   ## ==========================================================================
   ## Calorimetry
-- 
GitLab