first pass done, ready for debugging (and comments)

eic_data.yaml

@@ -17,37 +17,73 @@ options:
 ##  - Data alignment: data should be aligned with a 64-bit structure. 
 ##    Make sure 32 bit values (eg int32_t) come either in pairs, or are 
 ##    located at the end of the structure
-##  - Indices are stored as signed integers, where -1 significes "no index"
+##  - Indices are stored as signed integers, where -1 significes "no index". This is
+##    automatically provided by the eic::Index component, with good defaults
 ##  - Provide explicit copy/assignment instructors from the Const... classes, as
 ##    doing this here will avoid errors in the algorithms.
+##  - Explicitly specify the integer length (use the typedefs from <cstdint>, 
+##    such as int32_t etc)
 
 components:
 
-  ## first-second or first-last pair of integers
-  eic::IntegerPair:
+  ## simple numerical index, but with good automatic default values
+  eic::Index:
+    Members:
+      - int32_t value
+    ExtraCode:
+      declaration: "
+      Index() : value{-1} {}\n
+      Index(int32_t idx) : value {idx} {}\n
+      Index& operator=(int32_t idx) {value = idx; return *this;}\n
+      Index(const ConstIndex& cv) : value{cv.value()} {}\n
+      Index& operator=(const ConstIndex& cv) {value = cv.value(); return *this;}\n
+      operator int32_t() const {return value;}\n
+      bool valid() const {return value >= 0;}
+      bool empty() const {return value < 0;}
+      "
+    ConstExtraCode:
+      declaration: "
+      ConstIndex() : value{-1} {}\n
+      ConstIndex(int32_t idx) : value {idx} {}\n
+      operator int32_t() const {return value;}\n
+      bool valid() const {return value >= 0;}
+      bool empty() const {return value < 0;}
+      "
+
+  ## first-second or first-last Index pair 
+  eic::IndexPair:
     Members:
       - int32_t first
       - int32_t second
     ExtraCode:
-      includes: "#include <span>\n#include <cmath>\n#include <pair>"
-      declaration: "
-      IntegerPair() : first{0}, second{0} {}\n
-      IntegerPair(int32_t a, int32_t b) : first{a}, second{b} {}\n
-      IntegerPair(std::span<int32_t> v) : first{v[0]}, second{v[1]} {}\n
-      IntegerPair& operator=(std::span<int32_t> v) {first=v[0]; second=v[1]; return *this;}\n
-      IntegerPair(const std::pair<int32_t, int32_t>& p) : first{p.first}, second{p.second} {}\n
-      IntegerPair& operator=(const std::pair<int32_t, int32_t>& p) {first = p.first; second = p.second; return *this;}\n
-      explicit IntegerPair(const ConstIntegerPair& cv) : first{cv.first()}, second{cv.second()}} {}\n
-      IntegerPair& operator=(const ConstIntegerPair& cv) {first = cv.first(); second = cv.second(); return *this;}\n
+      includes: "#include <span>\n#include <pair>"
+      declaration: "
+      IndexPair() : first{-1}, second{-1} {}\n
+      IndexPair(int32_t a) : first{a}, second{-1} {}\n
+      IndexPair operator=(int32_t a) {first = a; second = -1; return *this;}
+      IndexPair(int32_t a, int32_t b) : first{a}, second{b} {}\n
+      IndexPair(std::span<int32_t> v) : first{v[0]}, second{v[1]} {}\n
+      IndexPair& operator=(std::span<int32_t> v) {first=v[0]; second=v[1]; return *this;}\n
+      IndexPair(const std::pair<int32_t, int32_t>& p) : first{p.first}, second{p.second} {}\n
+      IndexPair& operator=(const std::pair<int32_t, int32_t>& p) {first = p.first; second = p.second; return *this;}\n
+      explicit IndexPair(const ConstIndexPair& cv) : first{cv.first()}, second{cv.second()}} {}\n
+      IndexPair& operator=(const ConstIndexPair& cv) {first = cv.first(); second = cv.second(); return *this;}\n
       int32_t operator[](unsigned i) const { return *(&first + i); }\n
       int32_t last() const {return second;}\n
       int32_t last(int32_t b) {second = b; return second;}\n
+      operator std::pair<int32_t>() const {return {first, second};}
+      bool valid() const {return first >= 0;}
+      bool empty() const {return first < 0;}
+      bool single() const {return !empty() && second < 0;}
       "
     ConstExtraCode:
-      includes: "#include <cmath>"
       declaration: "
       int32_t operator[](unsigned i) const { return *(&first + i); }\n
       int32_t last() const {return second;}\n
+      operator std::pair<int32_t>() const {return {first, second};}
+      bool valid() const {return first >= 0;}
+      bool empty() const {return first < 0;}
+      bool single() const {return !empty() && second < 0;}
       "
 
   ## first-second pair of float s
@@ -56,7 +92,7 @@ components:
       - float first
       - float second
     ExtraCode:
-      includes: "#include <span>\n#include <cmath>\n#include <pair>"
+      includes: "#include <span>\n#include <pair>"
       declaration: "
       FloatPair() : first{0}, second{0} {}\n
       FloatPair(float  a, float  b) : first{a}, second{b} {}\n
@@ -68,11 +104,13 @@ components:
       explicit FloatPair(const ConstFloatPair& cv) : first{cv.first()}, second{cv.second()}} {}\n
       FloatPair& operator=(const ConstFloatPair& cv) {first = cv.first(); second = cv.second(); return *this}\n
       float operator[](unsigned i) const { return *(&first + i); }\n
+      operator std::pair<float, float>() const {return {first, second};}
       "
     ConstExtraCode:
       includes: "#include <cmath>"
       declaration: "
       float  operator[](unsigned i) const { return *(&first + i); }\n
+      operator std::pair<float, float>() const {return {first, second};}
       "
 
   eic::VectorXY:
@@ -94,6 +132,7 @@ components:
       float py() const {return y();}\n
       float px(float xx) {x = xx; return x;}\n
       float py(float yy) {y = yy; return y;}\n
+      operator std::pair<float, float>() const {return {first, second};}
       "
     ConstExtraCode:
       includes: "#include <cmath>"
@@ -102,19 +141,25 @@ components:
       float mag() const {return std::hypot(x, y);}\n
       float px() const {return x();}\n
       float py() const {return y();}\n
+      operator std::pair<float, float>() const {return {first, second};}
       "
   eic::Direction:
     Members:
       - float theta      // [rad]
       - float phi        // 
     ExtraCode:
-      includes: "#include <cmath>"
+      includes: "#include <cmath>\n#include <pair>"
       declaration: "
       Direction() : theta{0}, phi{0} {}\n
       Direction(float th, float ph) : theta{th}, phi{ph} {}\n
       Direction(float x, float y, float z) : theta{return acos(z/std::hypot(x,y,z))}, phi{atan2(y,x)} {}\n
       explicit Direction(const ConstDirection& cv) : theta{cv.theta()}, phi{cv.phi()}} {}\n
       Direction& operator=(const ConstDirection& cv) {theta = cv.theta(); phi = cv.phi(); return *this;}\n
+      operator std::pair<float, float>() const {return {first, second};}
+      "
+    ConstExtraCode:
+      declaration: "
+      operator std::pair<float, float>() const {return {first, second};}
       "
 
   eic::VectorXYZ:
@@ -123,7 +168,7 @@ components:
       - float y          //
       - float z          //
     ExtraCode:
-      includes: "#include <span>\n#include <cmath>\n"
+      includes: "#include <span>\n#include <cmath>\n#include<tuple>"
       declaration: "
       VectorXYZ() : x{0}, y{0}, z{0} {}\n
       VectorXYZ(float xx, float yy, float zz) : x{xx}, y{yy}, z{zz} {}\n
@@ -139,8 +184,10 @@ components:
       float px() const {return x();}\n
       float py() const {return y();}\n
       float pz() const {return z();}\n
+      operator std::tuple<float, float, float>() {return {x, y, z};}
       "
     ConstExtraCode:
+      includes: "#include <tuple>"
       declaration: "
       float operator[](unsigned i) const { return *(&x + i); }\n
       float mag() const {return std::hypot(x, y, z);}\n
@@ -150,6 +197,7 @@ components:
       float px() const {return x();}\n
       float py() const {return y();}\n
       float pz() const {return z();}\n
+      operator std::tuple<float, float, float>() {return {x, y, z};}
       "
   eic::VectorPolar:
     Members:
@@ -157,7 +205,7 @@ components:
       - float theta      // [rad]
       - float phi        //
     ExtraCode:
-      includes: "#include <span>\n#include <cmath>\n"
+      includes: "#include <span>\n#include <cmath>\n#include<tuple>"
       declaration: "
       VectorPolar() : x{0}, theta{0}, phi{0} {}\n
       VectorPolar(float rr, float th, float ph) : r{rr}, theta{th}, phi{ph} {}\n
@@ -170,9 +218,10 @@ components:
       float px() const {return x();}\n
       float py() const {return y();}\n
       float pz() const {return z();}\n
+      operator std::tuple<float, float, float>() {return {r, theta, phi};}
       "
     ConstExtraCode:
-      includes: "#include <span>\n#include <cmath>\n"
+      includes: "#include <span>\n#include <cmath>\n#include<tuple>"
       declaration: "
       float mag() const {return r;}\n
       float x() const {return r * cos(phi) * sin(theta);}\n
@@ -181,6 +230,7 @@ components:
       float px() const {return x();}\n
       float py() const {return y();}\n
       float pz() const {return z();}\n
+      operator std::tuple<float, float, float>() {return {r, theta, phi};}
       "
 
   eic::VectorXYZT:
@@ -190,7 +240,7 @@ components:
       - double z        //
       - double t        // [ns] or [GeV]
     ExtraCode:
-      includes: "#include <span>\n#include <cmath>\n"
+      includes: "#include <span>\n#include <cmath>\n#include <tuple>"
       declaration: "
       VectorXYZT() : x{0}, y{0}, z{0}, t{0] {}\n
       VectorXYZT(double xx, double yy, double zz, double tt) : x{xx}, y{yy}, z{zz}, t{tt} {}\n
@@ -212,9 +262,10 @@ components:
       double py(py) { y = py; return y;}\n
       double pz(pz) { z = pz; return z;}\n
       double energy(E) {t = E; return t;}\n
+      operator std::tuple<double, double, double>() {return {x, y, z, t};}
       "
     ConstExtraCode:
-      includes: "#include <cmath>\n"
+      includes: "#include <cmath>\n#include <tuple>"
       declaration: "
       double operator[](unsigned i) const { return *(&x + i); }\n
       double mag() const {return std::hypot(x, y, z);}\n
@@ -226,6 +277,7 @@ components:
       double py() const {return y;}\n
       double pz() const {return z;}\n
       double energy() const {return t;}\n
+      operator std::tuple<double, double, double, double>() {return {x, y, z, t};}
       "
   eic::VectorPxPyPzM:
     Members:
@@ -234,7 +286,7 @@ components:
       - double z            //
       - double m            //
     ExtraCode:
-      includes: "#include <span>\n#include <cmath>\n"
+      includes: "#include <span>\n#include <cmath>\n#include <tuple>"
       declaration: "
       VectorPxPyPzM() : x{0}, y{0}, z{0}, m{0] {}\n
       VectorPxPyPzM(double xx, double yy, double zz, double mm) : x{xx}, y{yy}, z{zz}, m{mm} {}\n
@@ -255,9 +307,10 @@ components:
       double px(px) { x = px;}\n
       double py(py) { y = py;}\n
       double pz(pz) { z = pz;}\n
+      operator std::tuple<double, double, double, double>() {return {x, y, z, m};}
       "
     ConstExtraCode:
-      includes: "#include <cmath>"
+      includes: "#include <cmath>\n#include <tuple>"
       declaration: "
       double operator[](unsigned i) const { return *(&x + i); }\n
       double mag() const {return std::hypot(x, y, z);}\n
@@ -269,6 +322,7 @@ components:
       double pz() const {return z;}\n
       double energy() const {return sqrt(x*x + y*y + z*z + m*m);}\n
       double mass() const {return m;}\n
+      operator std::tuple<double, double, double, double>() {return {x, y, z, m};}
       "
 
   eic::CovDiagXYZ:
@@ -363,14 +417,18 @@ datatypes:
     Description: "Basic Particle used for reconstructed and generated particles"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - eic::VectorPxPyPzM p       // Four momentum [GeV]
-      - eic::VectorXYZT    v       // vertex [mm, ns].
-      - int32_t            pid     // Particle type identification code
+      - eic::Index          ID              // Unique particle index
+      - int32_t             charge          // Particle charge (or sign)
+      - eic::VectorXYZ      p               // momentum [GeV]
+      - eic::VectorXYZ      v               // vertex [mm]
+      - float               time            // Time in [ns]
       - int32_t             status          // Status code
     ExtraCode:
       declaration: "
-        explicit Particle(const ConstParticle& cv) : p{cv.p()}, v{cv.v()}, pid{cv.pid()}, status{cv.status()} {}\n
-        Particle& operator=(const ConstParticle& cv) {p = cv.p(); v = cv.v(); pid = cv.pid(); status = cv.status();return *this;}\n
+        explicit Particle(const ConstParticle& cv) 
+          : ID{cv.ID()}, charge{cv.charge()}, p{cv.p()}, v{cv.v()}, time{cv.time()}, status{cv.status()} {}\n
+        Particle& operator=(const ConstParticle& cv) {
+          ID = cv.ID; charge = cv.charge(); p = cv.p(); v = cv.v(); time = cv.time(); status = cv.status(); return *this;}\n
       "
 
   ## NOTE: this class seems to be unused right now?
@@ -378,15 +436,15 @@ datatypes:
     Description: "EIC MC Particle"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - int32_t             ID              // Unique particle index
+      - eic::Index          ID              // Unique particle index
       - int32_t             pid             // The PDG code of the particle.
       - int32_t             status          // The status for particles as defined by the generator.
-      - float               charge          // The particle's charge.
+      - int32_t             charge          // The particle's charge.
       - eic::VectorPxPyPzM  p               // The particle's 4-momentum at the production vertex in [GeV]
       - eic::VectorXYZT     v               // The production vertex and time of the particle in [mm, ns].
       - eic::VectorXYZ      endpoint        // The endpoint of the particle in [mm]
-      - eic::IntegerPair    parentIDs       // IDs of the first and second parent, or -1
-      - eic::IntegerPair    childIDs        // IDs of the first and last children, or -1
+      - eic::IndexPair      parentIDs       // IDs of the first and second parent, or -1
+      - eic::IndexPair      childIDs        // IDs of the first and last children, or -1
       - bool                endpointSet     // Whether the endpoint has been set
     ExtraCode:
       declaration: "
@@ -409,53 +467,50 @@ datatypes:
     Description: "EIC Reconstructed Particle"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - int32_t           ID                // Unique particle index
+      - eic::Index        ID                // Unique particle index
+      - int32_t           charge            // Particle charge (or sign)
+      - eic::VectorXYZ    p                 // momentum [GeV]
+      - eic::VectorXYZ    v                 // vertex [mm]
+      - float             time              // Time in [ns]
+      - int32_t           status            // Status code
       - int32_t           pid               // PID of reconstructed particle.
-      - eic::VectorXYZ    p                 // three momentum [GeV], from tracking or calorimetry
-      - eic::VexterXYZ    v                 // vertex position of the reconstructed particle [mm]
       - float             energy            // Energy (from calorimetery) of the particle [GeV]
       - float             mass              // The mass of the particle in [GeV]
-      - float             time              // Vertex time [ns]
-      - float             charge            // The particle's charge [e]
-      - int32_t           parentID          // Parent particle reconstructed from this particle, -1 if none
-      - int32_t           vertexID          // Start vertex for this particle
+      - eic::Index        parentID          // Parent particle reconstructed from this particle, -1 if none
+      - eic::Index        vertexID          // Start vertex ID for this particle
     ExtraCode:
       declaration: "
         explicit ReconstructedParticle(const ConstReconstructedParticle& cv) 
-          : ID{cv.ID()}, pid{cv.pid()}, p{cv.p()}, v{cv.v()}, energy{cv.energy()}, mass{cv.mass()}, time{cv.time()}
-          , charge{cv.charge()}, parentID{cv.parentID()}, vertexID{cv.vertexID()} {}\n
+          : ID{cv.ID()}, charge{cv.charge()}, p{cv.p()}, v{cv.v()}, time{cv.time()}, status{cv.status()}
+          , pid{cv.pid()}, energy{cv.energy()}, mass{cv.mass()}, parentID{cv.parentID()}, vertexID{cv.vertexID()} {}\n
         ReconstructedParticle& operator=(const ConstReconstructedParticle& cv) {
-          ID = cv.ID(); pid = cv.pid(); p = cv.p(); v = cv.v(); energy = cv.energy(); mass = cv.mass(); time = cv.time();
-          charge = cv.charge(); parentID = cv.parentID(); vertexID = cv.vertexID(); return *this;}\n
-        bool has_parent() const {return parentID >= 0;}
-      "
-    ConstExtraCode:
-      declaration: "
-        bool has_parent() const {return parentID >= 0;}
+          ID = cv.ID; charge = cv.charge(); p = cv.p(); v = cv.v(); time = cv.time(); status = cv.status();
+          pid = cv.pid(); energy = cv.energy(); mass = cv.mass(); parentID = cv.parentID(); 
+          vertexID = cv.vertexID(); return *this;}\n
       "
 
   eic::RawCalorimeterHit:
     Description: "Raw (digitized) calorimeter hit"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - int64_t ID                // unique ID for this hit
       - int64_t           cellID            // The detector specific (geometrical) cell id.
       - int64_t           amplitude         // The amplitude of the hit in ADC counts.
+      - eic::Index        ID                // unique ID for this hit
     ExtraCode:
       declaration: "
-        explicit RawCalorimeterHit(const ConstRawCalorimeterHit& cv) : ID{cv.ID()}, cellID{cv.cellID()}, amplitude{cv.amplitude()} {}\n
-        RawCalorimeterHit& operator=(const ConstRawCalorimeterHit& cv) {ID = cv.ID(); cellID = cv.cellID(); amplitude = cv.amplitude();return *this;}\n
+        explicit RawCalorimeterHit(const ConstRawCalorimeterHit& cv) : cellID{cv.cellID()}, amplitude{cv.amplitude()}, ID{cv.ID()} {}\n
+        RawCalorimeterHit& operator=(const ConstRawCalorimeterHit& cv) {cellID = cv.cellID(); amplitude = cv.amplitude(); ID = cv.ID(); return *this;}\n
       "
 
   eic::CalorimeterHit:
     Description: "Calorimeter hit"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - int64_t             ID        // unique ID for this hit
       - int64_t           cellID            // The detector specific (geometrical) cell id.
-      - int32_t             layerID   // ID of the layer that has this hit (-1 if none)
-      - int32_t             sectorID  // ID of the sector that has this hit (-1 if none)
-      - int32_t             clusterID // ID of the cluster associated with this hit (-1 if none)
+      - eic::Index        ID                // unique ID for this hit
+      - eic::Index        layerID           // ID of the layer that has this hit (-1 if none)
+      - eic::Index        sectorID          // ID of the sector that has this hit (-1 if none)
+      - eic::Index        clusterID         // ID of the cluster associated with this hit (-1 if none)
       - int32_t           type              // The type of the hit.
       - float             energy            // The energy of the hit in [GeV].
       - float             time              // The time of the hit in [ns].
@@ -465,11 +520,11 @@ datatypes:
     ExtraCode:
       declaration: "
         explicit CalorimeterHit(const ConstCalorimeterHit& cv) 
-          : ID{cv.ID()}, cellID{cv.cellID()}, layerID{cv.layerID()}, sectorID{cv.sectorID()}, clusterID{cv.clusterID()}
+          : cellID{cv.cellID()}, ID{cv.ID()}, layerID{cv.layerID()}, sectorID{cv.sectorID()}, clusterID{cv.clusterID()}
           , type{cv.type()}, energy{cv.energy()}, time{cv.time()}, position{cv.position()}, local{cv.local()}
           , dimension{cv.dimension()} {}\n
         CalorimeterHit& operator=(const ConstCalorimeterHit& cv) {
-          ID = cv.ID(); cellID = cv.cellID(); layerID = cv.layerID(); sectorID = cv.sectorID(); clusterID = cv.clusterID();
+          cellID = cv.cellID(); ID = cv.ID(); layerID = cv.layerID(); sectorID = cv.sectorID(); clusterID = cv.clusterID();
           type = cv.type(); energy = cv.energy(); time = cv.time(); position = cv.position(); local = cv.local();
           dimension = cv.dimension();}\n
       "
@@ -478,94 +533,84 @@ datatypes:
     Description: "Raw (digitized) tracker hit"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - int64_t         ID       // unique ID for this hit
       - int64_t           cellID            // The detector specific (geometrical) cell id.
+      - eic::Index        ID                // unique ID for this hit
       - int32_t           time              // tdc value.
       - int32_t           charge            // adc value
     ExtraCode:
       declaration: "
-        explicit RawTrackerHit(const ConstRawTrackerHit& cv) : ID{cv.ID()}, cellID{cv.cellID()}, time{cv.time()}, charge{cv.charge()} {}\n
-        RawTrackerHit& operator=(const ConstRawTrackerHit& cv) {ID = cv.ID(); cellID = cv.cellID(); time = cv.time(); charge = cv.charge(); return *this;}\n
+        explicit RawTrackerHit(const ConstRawTrackerHit& cv) : cellID{cv.cellID()}, ID{cv.ID()}, time{cv.time()}, charge{cv.charge()} {}\n
+        RawTrackerHit& operator=(const ConstRawTrackerHit& cv) {cellID = cv.cellID(); ID = cv.ID(); time = cv.time(); charge = cv.charge(); return *this;}\n
       "
 
   eic::TrackerHit:
     Description: "Tracker hit (reconstructed from Raw)"
     Author: "W. Armstrong, S. Joosten"
     Members:
-      - int64_t         ID        // unique ID for this hit
       - int64_t           cellID            // The detector specific (geometrical) cell id.
-      - int32_t         clusterID // Associated cluster ID if applicable (-1 if not set)
+      - eic::Index        ID                // unique ID for this hit
+      - eic::Index        clusterID         // Associated cluster ID if applicable (-1 if not set)
       - float             time              // The time of the hit. [ns]
       - float             edep              // Energy deposit in this hit [GeV]
       - float             edepError         // Error on the energy deposit [GeV]
       - eic::VectorXYZ    position          // Hit (cell) position [mm]
       - eic::CovDiagXYZ   covMatrix         // Covariance Matrix
-      - int32_t         trackID   // ID of associated track (-1 if not set)
+      - eic::Index        trackID           // ID of associated track (-1 if not set)
     ExtraCode:
       declaration: "
         explicit TrackerHit(const ConstTrackerHit& cv) 
-          : ID{cv.ID()}, cellID{cv.cellID()}, clusterID{cv.clusterID()}
+          : cellID{cv.cellID()}, ID{cv.ID()}, clusterID{cv.clusterID()}
           , time{cv.time()}, EDep{cv.EDep()}, EDepError{cv.EDepError()}
           , position{cv.position()}, covMatrix{cv.covMatrix()} {} \n
         TrackerHit& operator=(const ConstTrackerHit& cv) {
-          ID = cv.ID(); cellID = cv.cellID(); 
+          cellID = cv.cellID(); ID = cv.ID(); 
           time = cv.time(); EDep = cv.EDep(); EDepError = cv.EDepError();
           position = cv.position(); covMatrix = cv.covMatrix(); return *this;}\n
-        bool has_track() const {return trackID >= 0;}
-      "
-    ConstExtraCode:
-      declaration: "
-        bool has_track() const {return trackID >= 0;}
       "
 
   eic::Cluster:
     Description: "EIC cluster"
     Author: "W. Armstrong, S. Joosten, C.Peng"
     Members:
-      - int32_t           ID              // unique ID for this cluster
+      - eic::Index        ID                // unique ID for this cluster
       - float             energy            // Reconstructed energy of the cluster [GeV].
       - float             edep              // Energy deposit of the cluster [GeV].
       - uint32_t          nhits             // Number of hits in the cluster.
       - eic::VectorXYZ    position          // Global position of the cluster [mm].
       - eic::CovXYZ       positionError     // Covariance matrix of the position (6 Parameters).
+      - eic::VectorPolar  polar             // Polar coordinates for global position.
       - eic::Direction    direction         // Intrinsic direction of the cluster at the central position [rad]
-      - int32_t           recID           // ID of the reconstructed particle associated with this cluster, or -1 if none
-      # TODO: determine if polar is really needed, as we also access the spherical
-      # coordinates through the position XYZ member functions
-      #- eic::VectorPolar polar          // Polar coordinates for global position.
+      - eic::Index        recID             // ID of the reconstructed particle associated with this cluster, or -1 if none
     ExtraCode:
       declaration: "
         explicit Cluster(const ConstCluster& cv) 
           : ID{cv.ID()}, energy{cv.energy()}, edep{cv.edep()}, nhits{cv.nhits()}
-          , position{cv.position()}, positionError{cv.positionError()}, direction{cv.direction()} {}\n
+          , position{cv.position()}, positionError{cv.positionError()}, polar{cv.polar()}, direction{cv.direction()} {}\n
         Cluster& operator=(const ConstCluster& cv) {
           ID = cv.ID(); energy = cv.energy(); edep = cv.edep(); nhits = cv.nhits(); 
-          position = cv.position(); positionError = cv.positionError(); direction = cv.direction(); return *this;}\n
-        bool has_reconstructedParticle() const {return recID >= 0;}
-      "
-    ConstExtraCode:
-      declaration: "
-        bool has_reconstructedParticle() const {return recID >= 0;}
+          position = cv.position(); positionError = cv.positionError(); polar = cv.polar(); direction = cv.direction(); return *this;}\n
       "
 
   eic::TrackParameters:
     Description: "ACTS Track parameters"
     Author: "W. Armstrong, S. Joosten"
     Members:
+      - eic::Index        ID              // unique ID for this track 
       - eic::FloatPair    loc             // tracking location
       - eic::FloatPair    locError        // error on the location
       - eic::Direction    direction       // track direction (theta, phi) [rad]
       - eic::Direction    directionError  // error on the direction [rad]
       - float             qOverP          // [e/GeV]
       - float             time            // track time [ns]      
+      - eic::Index        recID           // associated reconstructed particle, or -1 if not set
     ExtraCode:
       declaration: "
         explicit TrackParameters(const ConstTrackParameters& cv)
           : loc{cv.loc()}, locError{cv.locError()}, direction{cv.direction()}, directionError{cv.directionError}
-          , qOverP{cv.qOverP()}, time{cv.time()} {}\n
+          , qOverP{cv.qOverP()}, time{cv.time()}, recID{cv.recID()} {}\n
         TrackParameters& operator=(const ConstTrackParameters& cv) {
           loc = cv.loc(); locError = cv.locError(); direction = cv.direction(); directionError = cv.directionError
-          qOverP = cv.qOverP(); time = cv.time(); return *this'}\n
+          qOverP = cv.qOverP(); time = cv.time(); recID = cv.recID(); return *this'}\n
       "
 
 # TODO: needed? currently not used in Juggler
@@ -604,79 +649,135 @@ datatypes:
       Description: "EIC vertex"
       Author: "W. Armstrong, S. Joosten"
       Members:
-        - eic::VectorXYZT     position      // postion and time of vertex [mm, ns]
+        - eic::Index          ID            // unique vertex ID
+        - eic::VectorXYZ      position      // postion of vertex [mm]
+        - float               time          // time of vertex [ns]
         - float               chi2          // Chi squared of the vertex fit.
         - float               probability   // Probability of the vertex fit
         - bool                primary       // Whether it is the primary vertex of the event
-      OneToOneRelations:
-        - eic::ReconstructedParticle particle // Reconstructed Particle associated to the Vertex.
+        # no recID here, as a single vertex usually corresponds with multiple tracks
+    ExtraCode:
+      declaration: "
+        explicit Vertex(const ConstVertex& cv)
+          : ID{cv.ID}, position{cv.position()}, chi2{cv.chi2()}, probability{cv.probability()}, primary{cv.primary} {}\n
+        Vertex& operator=(const ConstVertex& cv) {
+          ID = cv.ID(); position = cv.position(); chi2 = cv.chi2(); probability = cv.probability(); primary = cv.primary();
+          return *this;}\n
+      "
 
   eic::RawPMTHit:
     Description: "EIC Raw PMT hit"
-    Author: "C. Peng"
+    Author: "S. Joosten, C. Peng"
     Members:
       - int64_t               cellID        // The detector specific (geometrical) cell id.
-      - unsigned  amplitude  // PMT signal amplitude
-      - unsigned  timeStamp  // PMT signal time
+      - eic::Index            ID            // unique hit ID
+      - uint32_t              amplitude     // PMT signal amplitude [ADC]
+      - uint32_t              time          // PMT signal time [TDC]
+    ExtraCode:
+      declaration: "
+      explicit RawPMTHit(const ConstRawPMTHit& cv)
+        : cellID{cv.cellID()}, ID{cv.ID()}, amplitude{cv.amplitude()}, time{cv.time()} {}\n
+      RawPMTHit& operator=(const ConstRawPMTHit& cv)
+        cellID = cv.cellID(); ID = cv.ID(); amplitude = cv.amplitude(); time = cv.time();
+        return *this;}\n
+      "
 
   eic::PMTHit:
     Description: "EIC PMT hit"
-    Author: "C. Peng"
+    Author: "S. Joosten, C. Peng"
     Members:
       - int64_t               cellID        // The detector specific (geometrical) cell id.
-      - float  npe                 // estimated number of photo-electrons
-      - float  time                // time
-      - eic::VectorXYZ position   // PMT hit position
-      - eic::VectorXYZLocal local // The local position of the hit in detector coordinates.
-
-  eic::RIChCluster:
-    Description: "EIC RICh Cluster"
-    Author: "C. Peng"
+      - eic::Index            ID            // Unique hit ID
+      - float                 npe           // estimated number of photo-electrons [#]
+      - float                 time          // time [ns]
+      - eic::VectorXYZ        position      // PMT hit position [mm]
+      - eic::VectorXYZ        local         // The local position of the hit in detector coordinates [mm]
+      - eic::Index            clusterID     // Associated cluster info (e.g. RICH cluster, -1 if none)
+    ExtraCode:
+      declaration: "
+      explicit PMTHit(const ConstPMTHit& cv)
+        : cellID{cv.cellID()}, ID{cv.ID()}, npe{cv.npe()}, time{cv.time()}, position{cv.position()}, local{cv.local()} {}\n
+      PMTHit& operator=(const ConstPMTHit& cv)
+        cellID = cv.cellID(); ID = cv.ID(); npe = cv.npe(); time = cv.time(); position = cv.position(); local = cv.local();
+        return *this;}\n
+      "
+
+  eic::RICHCluster:
+    Description: "EIC RICH Cluster"
+    Author: "S. Joosten, C. Peng"
     Members:
-      - eic::VectorXYZ position // Global position of the cluster.
-      - float  theta             // opening angle of the ring
-      - float  radius            // radius of the best fit ring
-      - float  radiusError       // estimated error from the fit
-      - float  npe               // number of photo-electrons
-    OneToManyRelations:
-      - eic::PMTHit hits        // The hits that have been included in this cluster
+      - eic::Index            ID            // Unique cluster ID
+      - eic::VectorXYZ        position      // Global position of the cluster [mm]
+      - float                 theta         // opening angle of the ring [rad]
+      - float                 radius        // radius of the best fit ring [mm]
+      - float                 radiusError   // estimated error from the fit [mm]
+      - float                 npe           // number of photo-electrons [#]
+      ## probably need to keep track of the associated PID info here with an index
+    ExtraCode:
+      declaration: "
+      explicit RICHCluster(const ConstRICHCluster& cv) 
+        : ID{cv.ID()}, position{cv.position()}, theta{cv.theta()}, radius{cv.radius()}, radiusError{cv.radiusError()}, npe{cv.npe()} {}\n
+      RICHCluster& operator=(const ConstRICHCluster& cv) {
+        ID = cv.ID(); position = cv.position(); theta = cv.theta(); radius = cv.radius(); radiusError = cv.radiusError(); npe = cv.npe();
+        return *this;}\n
+      "
 
   eic::ImagingPixel:
     Description: "Pixel for Imaging Calorimeter"
-    Author: "C. Peng"
+    Author: "S. Joosten, C. Peng"
     Members:
-      - int                 clusterID         // Cluster id
-      - int                 layerID           // Layer id
-      - int                 sectorID          // Sector id
-      - int                 hitID             // Hit id
-      - float               edep              // Energy deposition
-      - float               time              // Timestamp
+      - eic::Index            ID            // Unique pixel ID
+      - eic::Index            clusterID     // Cluster ID, -1 if none
+      - eic::Index            layerID       // Layer id, -1 if none
+      - eic::Index            sectorID      // Sector id, -1 if none
+      - float                 edep          // Energy deposition [GeV]
+      - float                 time          // Timestamp [ns]
       - float                 eta           // Pseudorapidity
-      - eic::VectorXYZLocal local             // Local position in its sector
-      - eic::VectorXYZ      position          // Global position
-      - eic::VectorPolar    polar             // Global position in polar coordinates
+      - eic::VectorXYZ        local         // Local position in its sector [mm]
+      - eic::VectorXYZ        position      // Global position [mm]
+      - eic::VectorPolar      polar         // Global position in polar coordinates [mm, rad]
+    ExtraCode:
+      declaration: "
+      explicit ImagingPixel(const ConstImagingPixel& cv)
+        : ID{cv.ID()}, clusterID{cv.clusterID()}, layerID{cv.layerID()}, sectorID{cv.sectorID()}
+        , edep{cv.edep()}, time{cv.time()}, eta{cv.eta()}, local{cv.local()}, position{cv.position()}, polar{cv.polar()} {}\n
+      ImagingPixel& operator=(const ConstImagingPixel& cv) {
+        ID = cv.ID(); clusterID = cv.clusterID(); layerID = cv.layerID(); sectorID = cv.sectorID();
+        edep = cv.edep(); time = cv.time(); eta = cv.eta(); local = cv.local(); position = cv.position(); polar = cv.polar();
+        return *this;}\n
+      "
 
   eic::ImagingLayer:
     Description: "Layer for Imaging Calorimeter"
-    Author: "C. Peng"
+    Author: "S. Joosten, C. Peng"
     Members:
-      - int                  clusterID        // Cluster id
-      - int                  layerID          // Layer id
+      - eic::Index            ID            // unique layer ID
+      - eic::Index            clusterID     // associated cluster ID, -1 if none
       - int                   nhits         // Number of hits
-      - float                edep             // Energy deposit
-      - float                radius           // Shower radius
+      - float                 edep          // Energy deposit [GeV]
+      - float                 radius        // Shower radius [mm]
       - float                 skewness      // Skewness of hits distribution
       - float                 eta           // Pseudorapidity
-      - eic::VectorXYZ       position         // Global center position.
-      - eic::VectorPolar     polar            // Global center position in polar coordinates
-    OneToManyRelations:
-      - eic::ImagingPixel   hits              // hits data
+      - eic::VectorXYZ        position      // Global center position. [mm]
+      - eic::VectorPolar      polar         // Global center position in polar coordinates [mm, rad]
+    ExtraCode:
+      declaration: "
+      explicit ImagingLayer(const ConstImagingLayer& cv)
+        : ID{cv.ID()}, clusterID{cv.clusterID()}, nhits{cv.nhits()}, edep{cv.edep()}, radius{cv.radius()}
+        , skewness{cv.skewness()}, eta{cv.eta()}, position{cv.position()}, polar{cv.polar()} {}\n
+      ImagingLayer& operator=(const ConstImagingLayer& cv) {
+        ID = cv.ID(); clusterID = cv.clusterID(); nhits = cv.nhits(); edep = cv.edep(); radius = cv.radius();
+        skewness = cv.skewness(); eta = cv.eta(); position = cv.position(); polar = cv.polar();
+        return *this;
+      }\n
+      "
 
+  ## FIXME: Not updating ImagingCluster as it's deprecated and will be superceded by Cluster
   eic::ImagingCluster:
     Description: "Cluster for Imaging Calorimeter"
     Author: "S. Joosten, C. Peng"
     Members:
-      - int                 clusterID         // Cluster id
+      - eic::Index            clusterID     // unique Cluster id
       - int                   nhits         // Number of hits in this cluster.
       - float                 energy         // Energy of the cluster.
       - float                 edep             // Energy deposit of the cluster.
@@ -688,8 +789,3 @@ datatypes:
       - eic::VectorPolar      polar            // Polar coordinates for global position.
       - float                 cl_theta         // Intrinsic direction of cluster at position - Theta.
       - float                 cl_phi           // Intrinsic direction of cluster at position - Phi.
-    OneToManyRelations:
-      # cluster <-> hit relation is deprecated
-      - eic::ImagingPixel    hits             // hits data
-      - eic::ImagingLayer    layers           // layer data
-