apply TDC jitter correction only if TI timestamp is >0, excluding MC events

Author: raffaelladevita

reconstruction/band/src/main/java/org/jlab/rec/band/banks/HitReader.java

@@ -154,7 +154,7 @@ private static double getTriggerPhase( DataEvent ev) {
 		if(ev.hasBank("RUN::config")) {
 			DataBank  bank = ev.getBank("RUN::config");                       
 			long timeStamp = bank.getLong("timestamp", 0);
-			if( CalibrationConstantsLoader.JITTER_CYCLES > 0 && timeStamp != -1 ) {
+			if( CalibrationConstantsLoader.JITTER_CYCLES > 0 && timeStamp > 0 ) {
 				tPh = CalibrationConstantsLoader.JITTER_PERIOD *
 					( ( timeStamp + CalibrationConstantsLoader.JITTER_PHASE ) % 
 					  CalibrationConstantsLoader.JITTER_CYCLES);

reconstruction/cnd/src/main/java/org/jlab/rec/cnd/banks/HitReader.java

@@ -22,7 +22,7 @@ public static  ArrayList<HalfHit> getCndHalfHits(DataEvent event, CalibrationCon
                 if(event.hasBank("RUN::config")) {
                     DataBank  bank = event.getBank("RUN::config");                       
                     long timeStamp = bank.getLong("timestamp", 0);
-                    if(ccdb.JITTER_CYCLES>0 && timeStamp!=-1) 
+                    if(ccdb.JITTER_CYCLES>0 && timeStamp>0) 
                         triggerPhase=ccdb.JITTER_PERIOD*((timeStamp+ccdb.JITTER_PHASE)%ccdb.JITTER_CYCLES);
                 }
 

reconstruction/dc/src/main/java/org/jlab/rec/dc/banks/HitReader.java

@@ -114,15 +114,14 @@ private int getTIJitter() {
            double period = timejitter.getDoubleValueByHash("period", hash);
            int    phase  = timejitter.getIntValueByHash("phase", hash);
            int    cycles = timejitter.getIntValueByHash("cycles", hash);
-
            if (cycles > 0) jitter = (int) (period * ((tiTimeStamp + phase) % cycles));
         }
         return jitter;
     }
 
     private void getDCRBJitters(boolean swapBits) {
 
-        if(tiTimeStamp>=0 && event.hasBank(bankNames.getTimeStampBank())) {
+        if(tiTimeStamp>0 && event.hasBank(bankNames.getTimeStampBank())) {
 
             dcrbjitters = new IndexedTable(2, "jitter:I");
 

reconstruction/eb/src/main/java/org/jlab/rec/eb/EBRadioFrequency.java

@@ -96,7 +96,7 @@ public void processEvent(DataEvent event) {
             int    phase  = ccdb.getInteger(EBCCDBEnum.RF_JITTER_PHASE);
             int    cycles = ccdb.getInteger(EBCCDBEnum.RF_JITTER_CYCLES);
             long   timeStamp = bank.getLong("timestamp", 0);
-            if(cycles>0 && timeStamp!=-1) triggerPhase=period*((timeStamp+phase)%cycles);
+            if(cycles>0 && timeStamp>0) triggerPhase=period*((timeStamp+phase)%cycles);
 
         }
         // if RF::tdc exists (data), calculate rfTime from scratch

reconstruction/ec/src/main/java/org/jlab/service/ec/ECCommon.java

@@ -327,7 +327,7 @@ public static List<ECStrip>  readStripsHipo(DataEvent event, int run, ConstantsM
         if(CYCLES>0&&event.hasBank("RUN::config")==true){
             DataBank bank = event.getBank("RUN::config");
             long timestamp = bank.getLong("timestamp", 0);
-            triggerPhase = (int) (PERIOD*((timestamp+PHASE)%CYCLES));
+            triggerPhase = timestamp>0 ? (int) (PERIOD*((timestamp+PHASE)%CYCLES)) : 0;
         }
 
         if(event.hasBank("ECAL::tdc")==true){

reconstruction/tof/src/main/java/org/jlab/rec/tof/banks/ctof/HitReader.java

@@ -524,7 +524,7 @@ private double getTriggerPhase(long timestamp, IndexedTable table) {
         int    phase  = table.getIntValue("phase", 0,0,0);
         int    cycles = table.getIntValue("cycles", 0,0,0);
         double triggerphase=0;
-        if(cycles > 0) triggerphase=period*((timestamp+phase)%cycles);
+        if(cycles>0 && timestamp>0) triggerphase=period*((timestamp+phase)%cycles);
 //        System.out.println(period + " " + phase + " " + cycles + " " + timestamp + " " + triggerphase);
         return triggerphase;
     }

reconstruction/tof/src/main/java/org/jlab/rec/tof/banks/ftof/HitReader.java

@@ -540,7 +540,7 @@ private double getTriggerPhase(long timestamp, IndexedTable table) {
         int    phase  = table.getIntValue("phase", 0,0,0);
         int    cycles = table.getIntValue("cycles", 0,0,0);
         double triggerphase=0;
-        if(cycles > 0) triggerphase=period*((timestamp+phase)%cycles);
+        if(cycles>0 && timestamp>0) triggerphase=period*((timestamp+phase)%cycles);
 //        System.out.println(period + " " + phase + " " + cycles + " " + timestamp + " " + triggerphase);
         return triggerphase;
     }