finalized FTOF:;calib

Author: raffaelladevita

etc/bankdefs/hipo4/tof.json

@@ -178,7 +178,11 @@
        {"name":"pindex",             "type":"S", "info":"particle positionin REC::Particle"},
        {"name":"pid",                "type":"I", "info":"particle id"},
        {"name":"charge",             "type":"B", "info":"particle charge"},
-       {"name":"p",                  "type":"F", "info":"particle momentum"},
+       {"name":"px",                 "type":"F", "info":"particle momentum x component"},
+       {"name":"py",                 "type":"F", "info":"particle momentum y component"},
+       {"name":"pz",                 "type":"F", "info":"particle momentum z component"},
+       {"name":"vx",                 "type":"F", "info":"particle vertex x coordinate"},
+       {"name":"vy",                 "type":"F", "info":"particle vertex y coordinate"},
        {"name":"vz",                 "type":"F", "info":"particle vertex z coordinate"},
        {"name":"chi2",               "type":"F", "info":"track chi2"},
        {"name":"NDF",                "type":"S", "info":"NDF"},

reconstruction/calib/pom.xml

@@ -13,21 +13,21 @@
     <groupId>org.jlab.clas</groupId>
     <artifactId>clas12rec</artifactId>
     <relativePath>../../parent/pom.xml</relativePath>
-    <version>11.1.1-SNAPSHOT</version>
+    <version>12.0.4t-SNAPSHOT</version>
   </parent>
 
   <dependencies>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-io</artifactId>
-      <version>11.1.1-SNAPSHOT</version>
+      <version>12.0.4t-SNAPSHOT</version>
     </dependency>
 
     <dependency>
       <groupId>org.jlab.clas</groupId>
       <artifactId>clas-reco</artifactId>
-      <version>11.1.1-SNAPSHOT</version>
+      <version>12.0.4t-SNAPSHOT</version>
     </dependency>
 
   </dependencies>

reconstruction/calib/src/main/java/org/jlab/calibration/detectors/FTOFCalibrator.java

@@ -80,9 +80,6 @@ public DataBank buildCalibBank(DataEvent event) {
                     double path = paths.containsKey(pindex) && 
                                   paths.get(pindex).containsKey(layer) ? 
                                   paths.get(pindex).get(layer) : 0;
-                    double px  = part.getFloat("px", pindex);
-                    double py  = part.getFloat("py", pindex);
-                    double pz  = part.getFloat("pz", pindex);
                     calib.setShort("id", row, hits.getShort("id", i));
                     calib.setShort("status", row, hits.getShort("status", i));
                     calib.setShort("trackid", row, hits.getShort("trackid", i));
@@ -100,7 +97,11 @@ public DataBank buildCalibBank(DataEvent event) {
                     calib.setFloat("tz", row, hits.getFloat("tz", i));
                     calib.setInt("pid", row, part.getInt("pid", pindex));
                     calib.setByte("charge", row, part.getByte("charge", pindex));
-                    calib.setFloat("p", row, (float) Math.sqrt(px*px+py*py+pz*pz));
+                    calib.setFloat("px", row, part.getFloat("px", pindex));
+                    calib.setFloat("py", row, part.getFloat("py", pindex));
+                    calib.setFloat("pz", row, part.getFloat("pz", pindex));
+                    calib.setFloat("vx", row, part.getFloat("vx", pindex));
+                    calib.setFloat("vy", row, part.getFloat("vy", pindex));
                     calib.setFloat("vz", row, part.getFloat("vz", pindex));
                     calib.setFloat("pathLength", row, (float) path);
                     calib.setFloat("pathLengthThruBar", row, hits.getFloat("pathLengthThruBar", i));