undoing RF offset changes

Author: raffaelladevita

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

@@ -55,7 +55,8 @@ public double  getStartTime(DetectorParticle trigger,final DetectorType type,fin
         // to accommadate the modulus in the next step, as it was done in CLAS6.
         // Probably this should be "simplified" with Math.IEEERemainder.)
         final double tVertexRF = - tVertex - dzTargetVertex / PhysicsConstants.speedOfLight()
-                + this.rfTime + (EBConstants.RF_LARGE_INTEGER+0.5)*rfPeriod;
+                + this.rfTime + this.ccdb.getDouble(EBCCDBEnum.RF_OFFSET)
+                + (EBConstants.RF_LARGE_INTEGER+0.5)*rfPeriod;
 
         // The relative, RF-beam-bucket-centering correction, based only on the
         // trigger particle:
@@ -167,7 +168,7 @@ public boolean add(int tdc) {
             final double rfOffset = ccdb.getDouble(EBCCDBEnum.RF_OFFSET);
             final double rfBucketLength = ccdb.getDouble(EBCCDBEnum.RF_BUCKET_LENGTH); 
             boolean skip = false;
-            double time = (tdc*rfTdc2Time) % (rfCycles*rfBucketLength) - this.getJitter() + rfOffset;
+            double time = (tdc*rfTdc2Time) % (rfCycles*rfBucketLength) - this.getJitter();
             // check if new TDC value compared to previous one is consistent with 80*2.004 ns interval
             if(this._tdc.size()>0) {               
                 int deltaTDC = tdc - this._tdc.get(this._tdc.size()-1);

reconstruction/eb/src/main/java/org/jlab/service/eb/EBEngine.java

@@ -113,7 +113,7 @@ public boolean processDataEventUser(DataEvent de,EBScalers ebs) {
 
         // Process RF:
         EBRadioFrequency rf = new EBRadioFrequency(ccdb);
-        eb.getEvent().getEventHeader().setRfTime(rf.getTime(de));
+        eb.getEvent().getEventHeader().setRfTime(rf.getTime(de)+ccdb.getDouble(EBCCDBEnum.RF_OFFSET));
 
         List<DetectorResponse> responseECAL = CalorimeterResponse.readHipoEvent(de, "ECAL::clusters", DetectorType.ECAL,"ECAL::moments", "ECAL::calib");
         List<DetectorResponse> responseFTOF = ScintillatorResponse.readHipoEvent(de, ftofHitsType, DetectorType.FTOF);