Merge branch 'imaging_cluster' into 'master'

Change array of layers to OneToManyRelation between ImagingCluster and ImagingLayer

See merge request !26

eic_data.yaml

@@ -343,6 +343,8 @@ datatypes :
     Description: "Layer for Imaging Calorimeter"
     Author: "C. Peng"
     Members:
+      - int                  clusterID      // cluster id
+      - int                  layerID        // layer id
       - int                  nhits          // Number of hits
       - float                edep           // Energy deposit
       - float                radius         // Shower radius
@@ -351,7 +353,7 @@ datatypes :
       - float                x0cum          // estimated radiation length before this layer
       - eic::VectorXYZ       position       // Global center position.
       - eic::VectorPolar     polar          // Global center position in polar coordinates
-      - std::array<eic::BaseHit, 100> hits  // hits x data
+      - std::array<eic::BaseHit, 100> hits  // hits data
 
   eic::ImagingCluster:
     Description: "Cluster for Imaging Calorimeter"
@@ -365,5 +367,6 @@ 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.
-      - std::array<eic::ImagingLayer, 20> layers  // layer data
+    OneToManyRelations:
+      - eic::ImagingLayer    layers          // layer data