Changeset 18278 for branches/MarsWobble/mdrs/MCalibrateDrsTimes.cc

Timestamp:

08/18/15 10:09:13 (9 years ago)

Author:

ftemme

Message:

Merging trunk into MarsWobble branch

File:

• branches/MarsWobble/mdrs/MCalibrateDrsTimes.cc (modified) (3 diffs)

branches/MarsWobble/mdrs/MCalibrateDrsTimes.cc

@@ -152 +152 @@
             continue;
 
-        const Float_t signal = (*fSignals)[sw].GetArrivalTime();
+        const Float_t signal = (*fSignals)[sw].GetArrivalTimeHiGain();
+        const Float_t slope  = (*fSignals)[sw].GetArrivalTimeHiGainError();
         const Float_t offset = fCalib ? fCalib->GetOffset(hw, start[hw], signal) : 0;
+        const Float_t offset2 = (fCalib && (signal-slope)>=0) ? fCalib->GetOffset(hw, start[hw], signal-slope) : 0;
         const Float_t delay  = fCalib ? fCalib->GetDelay(hw) : 0;
 
@@ -160 +162 @@
 
         // convert from slices to ns
-        const Float_t utime = 1000*(signal       )/fFreq-delay; // [ns]
-        const Float_t time  = 1000*(signal-offset)/fFreq-delay; // [ns]
+        const Float_t utime      = 1000*(signal       )/fFreq-delay;  // [ns]
+        const Float_t time       = 1000*(signal-offset)/fFreq-delay;  // [ns]
+        const Float_t slopecal   = (slope-offset+offset2)<0 ? -1 : 1000*(slope-offset+offset2)/fFreq; // [ns]
+        const Float_t uslope     = slope<0 ? -1 : 1000*(slope)/fFreq;                // [ns]
 
         /*
@@ -172 +176 @@
         {
             (*fArrivalTime)[idx[j]].SetArrivalTime(time);
+            (*fArrivalTime)[idx[j]].SetTimeSlope(slopecal);
             if (fArrivalTimeU)
+            {
                 (*fArrivalTimeU)[idx[j]].SetArrivalTime(utime);
+                (*fArrivalTimeU)[idx[j]].SetTimeSlope(uslope);
+            }
         }
     }