Renamed data structure and moved some fields around

eic_data.yaml

@@ -517,16 +517,18 @@ datatypes:
       - bool              primary           // Whether it is the primary vertex of the event
 
   ## ==========================================================================
-  ## Vertexing
+  ## Kinematic reconstruction
   ## ==========================================================================
 
-  eic::Kinematics:
+  eic::ScatteringKinematics:
     Description: "Kinematic variables for DIS events"
     Author: "S. Joosten, W. Deconinck"
     Members:
-      - float             x                 // Bjorken x
-      - float             y                 // Inelasticity
+      - float             x                 // Bjorken x (Q2/2P.q)
       - float             Q2                // Four-momentum transfer squared [GeV^2]
       - float             W                 // Invariant mass of final state [GeV]
-      - float             nu                // Energy transfer [GeV]
-      - float             M                 // Hadron mass [GeV]
+      - float             y                 // Inelasticity (P.q/P.k)
+      - float             nu                // Energy transfer P.q/M [GeV]
+      ## Spin state?
+      ## phi_S?
+      - eic::Index        scatID            // Associated scattered electron (if identified)