Changeset 8618 for trunk/MagicSoft/Mars/mcalib

Timestamp:

06/28/07 21:30:25 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrateRelTimes.cc (modified) (5 diffs)
• MCalibrateRelTimes.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc

@@ -60 +60 @@
 #include "MSignalPix.h"
 
+#include "MRawRunHeader.h"
+
 ClassImp(MCalibrateRelTimes);
 
@@ -86 +88 @@
 {
     fSignals = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
-
     if (!fSignals)
     {
@@ -99 +100 @@
     fCalibrations = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
     if (!fCalibrations)
-      {
+    {
         *fLog << err << AddSerialNumber("MCalibrationRelTimeCam") << " not found ... aborting." << endl;
         return kFALSE;
-      }
+    }
 
     fArrivalTime = (MSignalCam*)pList->FindCreateObj(AddSerialNumber("MSignalCam"));
@@ -108 +109 @@
         return kFALSE;
     
+    return kTRUE;
+}
+
+Bool_t MCalibrateRelTimes::ReInit(MParList *pList)
+{
+    MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject(AddSerialNumber("MRawRunHeader"));
+    if (!runheader)
+    {
+        *fLog << err << AddSerialNumber("MRawRunHeader") << " not found ... aborting." << endl;
+        return kFALSE;
+    }
+
+    fFreq = runheader->GetFreqSampling();
+
     return kTRUE;
 }
@@ -131 +146 @@
         const Float_t offset = pix.GetTimeOffset();
 
-        (*fArrivalTime)[idx].SetArrivalTime(signal-offset);
+        // convert from slices to ns
+        const Float_t time = 1000*(signal-offset)/fFreq; // [ns]
+
+        (*fArrivalTime)[idx].SetArrivalTime(time);
 
         // FIXME: Is this necessary or explicitly done by the signal-

trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.h

@@ -10 +10 @@
 class MCalibrationRelTimeCam;
 class MArrivalTimeCam;
+class MRawRunHeader;
 class MSignalCam;
 
@@ -21 +22 @@
     MSignalCam             *fArrivalTime;  // Calibrated arrival times
 
-    Int_t PreProcess(MParList *pList);
-    Int_t Process();
+    UShort_t fFreq;                        //! [MHz] Sampling Frequency
+
+    Int_t  PreProcess(MParList *pList);
+    Bool_t ReInit(MParList *pList);
+    Int_t  Process();
 
 public: