diff --git a/eic_data.yaml b/eic_data.yaml
index defee344571d49dddb90f5f9d3c10468fa9c34df..abde12d41e239001986b6c5df728c6b73e44b40e 100644
--- a/eic_data.yaml
+++ b/eic_data.yaml
@@ -336,49 +336,49 @@ datatypes :
     Description: "Pixel for Imaging Calorimeter"
     Author: "C. Peng"
     Members:
-      - int                 clusterID       // Cluster id
-      - int                 layerID         // Layer id
-      - int                 sectorID        // Sector id
-      - int                 hitID           // Hit id
-      - double              edep            // Energy deposition
-      - double              time            // Timestamp
-      - double              eta             // Pseudorapidity
-      - eic::VectorXYZLocal local           // Local position in its sector
-      - eic::VectorXYZ      position        // Global position
-      - eic::VectorPolar    polar           // Global position in polar coordinates
+      - int                 clusterID         // Cluster id
+      - int                 layerID           // Layer id
+      - int                 sectorID          // Sector id
+      - int                 hitID             // Hit id
+      - double              edep              // Energy deposition
+      - double              time              // Timestamp
+      - double              eta               // Pseudorapidity
+      - eic::VectorXYZLocal local             // Local position in its sector
+      - eic::VectorXYZ      position          // Global position
+      - eic::VectorPolar    polar             // Global position in polar coordinates
 
   eic::ImagingLayer:
     Description: "Layer for Imaging Calorimeter"
     Author: "C. Peng"
     Members:
-      - int                  clusterID      // Cluster id
-      - int                  layerID        // Layer id
-      - int                  nhits          // Number of hits
-      - double               edep           // Energy deposit
-      - double               radius         // Shower radius
-      - double               skewness       // Skewness of hits distribution
-      - double               chi2           // Edep chi2
-      - double               x0cum          // Estimated radiation length before this layer
-      - double               eta            // Pseudorapidity
-      - eic::VectorXYZ       position       // Global center position.
-      - eic::VectorPolar     polar          // Global center position in polar coordinates
+      - int                  clusterID        // Cluster id
+      - int                  layerID          // Layer id
+      - int                  nhits            // Number of hits
+      - double               edep             // Energy deposit
+      - double               radius           // Shower radius
+      - double               skewness         // Skewness of hits distribution
+      - double               eta              // Pseudorapidity
+      - eic::VectorXYZ       position         // Global center position.
+      - eic::VectorPolar     polar            // Global center position in polar coordinates
     OneToManyRelations:
-      - eic::ImagingPixel   hits            // hits data
+      - eic::ImagingPixel   hits              // hits data
 
   eic::ImagingCluster:
     Description: "Cluster for Imaging Calorimeter"
     Author: "C. Peng"
     Members:
-      - int                  nhits           // Number of hits in this cluster.
-      - double               energy          // Energy of the cluster.
-      - double               edep            // Energy deposit of the cluster.
-      - double               leakcorr        // Leakage correction to the cluster
-      - double               eta             // Pseudorapidity
-      - eic::VectorXYZ       position        // Global position of the cluster.
-      - eic::VectorPolar     polar           // Polar coordinates for global position.
-      - double               cl_theta        // Intrinsic direction of cluster at position - Theta.
-      - double               cl_phi          // Intrinsic direction of cluster at position - Phi.
+      - int                  nhits            // Number of hits in this cluster.
+      - double               energy           // Energy of the cluster.
+      - double               edep             // Energy deposit of the cluster.
+      - double               radius           // Shower radius
+      - double               skewness         // Skewness of hits distribution
+      - double               leakcorr         // Leakage correction to the cluster
+      - double               eta              // Pseudorapidity
+      - eic::VectorXYZ       position         // Global position of the cluster.
+      - eic::VectorPolar     polar            // Polar coordinates for global position.
+      - double               cl_theta         // Intrinsic direction of cluster at position - Theta.
+      - double               cl_phi           // Intrinsic direction of cluster at position - Phi.
     OneToManyRelations:
-      - eic::ImagingPixel    hits            // hits data
-      - eic::ImagingLayer    layers          // layer data
+      - eic::ImagingPixel    hits             // hits data
+      - eic::ImagingLayer    layers           // layer data