Merged changes to eic_data.yaml

eic_data.yaml

@@ -248,10 +248,13 @@ components:
   ## A point along a trajectory
   eic::TrajectoryPoint:
     Members:
-      - eic::VectorXYZ    position      // Position of the trajectory point
-      - eic::VectorPolar  p             // 3-momentum at the point (in P, theta, phi)
+      - 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:
       - int32_t           pdg               // PDG code
@@ -324,7 +327,6 @@ datatypes:
     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)
 
@@ -509,20 +511,20 @@ datatypes:
     Members:
       - eic::Index        ID                // Unique trajectory ID
       - eic::Index        trackID           // Corresponding track ID
-      - eic::VectorXYZ    momentum          // 3-momentum at the vertex for the trajectory
-      - float             charge            // Charge of particle trajectory
+      - eic::VectorXYZ    p                 // 3-momentum at the vertex for the trajectory
+      - float             charge            // Charge of the particle trajectory
     VectorMembers:
       - eic::TrajectoryPoint  points        // Points along this trajectory
 
-
   eic::Track:
-    Description: "Particle Track"
+    Description: "Track information"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - eic::Index        ID                // Unique track ID.
-      - eic::Index        parameters        // Index for track parameters
-      - eic::VectorXYZT   momentum          // Momentum of vertex [mm]
-
+      - eic::Index        ID                // Unique track ID, same as the ID in the corresponding TrackParameters
+      - eic::VectorXYZ    p                 // Track momementum
+      - float             charge            // Charge of particle trajectory
+      - float             length            // Track length from first to last hit[mm]
+      - float             TOF               // Time of flight from first to last hit [ns]
 
   ## ==========================================================================
   ## Vertexing