Changeset 7353 for trunk/MagicSoft/Mars/mcalib

Timestamp:

09/16/05 11:58:09 (19 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrateData.cc (modified) (2 diffs)
• MCalibrateRelTimes.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrateData.cc

@@ -542 +542 @@
               {
                 skip++;
-                calibConv = -1.;
-                continue;
+                continue; // calibConv will remain 0
              }
             
@@ -679 +678 @@
             calibConv    = -1.;
             calibFFactor = -1.;
-            *fLog << warn << "Conversion factor of Pixel " << pixidx << " out of range " << endl;
+            *fLog << warn << GetDescriptor()
+                << ": WARNING - Conversion factor of Pixel " << pixidx << " out of range... set to 0. " << endl;
           }
         cpix.SetCalibConst(calibConv);

trunk/MagicSoft/Mars/mcalib/MCalibrateRelTimes.cc

@@ -86 +86 @@
 Int_t MCalibrateRelTimes::PreProcess(MParList *pList)
 {
-
     fSignals = (MArrivalTimeCam*)pList->FindObject(AddSerialNumber("MArrivalTimeCam"));
 
     if (!fSignals)
     {
-      *fLog << err << AddSerialNumber("MArrivalTimeCam") << " not found ... aborting" << endl;
+        *fLog << err << AddSerialNumber("MArrivalTimeCam") << " not found ... aborting" << endl;
         return kFALSE;
     }
@@ -97 +96 @@
     fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
     if (!fBadPixels)
-      *fLog << warn << AddSerialNumber("MBadPixelsCam") << " not found ... no action" << endl;
-    
+        *fLog << warn << AddSerialNumber("MBadPixelsCam") << " not found ... ignoring." << endl;
 
     fCalibrations = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
@@ -106 +104 @@
         return kFALSE;
       }
-
 
     fArrivalTime = (MSignalCam*)pList->FindCreateObj(AddSerialNumber("MSignalCam"));
@@ -124 +121 @@
     const UInt_t npix = fSignals->GetSize();
 
-    for (UInt_t pixidx=0; pixidx<npix; pixidx++)
+    for (UInt_t idx=0; idx<npix; idx++)
     {
-        MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCalibrations)[pixidx];
-
-        if (fBadPixels && (*fBadPixels)[pixidx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+        if (fBadPixels && (*fBadPixels)[idx].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
             continue;
 
-        const Float_t offset    = pix.GetTimeOffset();
+        const MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCalibrations)[idx];
+        const MArrivalTimePix        &sig = (*fSignals)[idx];
 
-        MArrivalTimePix &sig = (*fSignals)[pixidx];
+        const Float_t signal = sig.GetArrivalTime();
+        const Float_t offset = pix.GetTimeOffset();
 
-        Float_t signal;
-
-        if (sig.IsLoGainUsed())
-          signal = sig.GetArrivalTimeLoGain();
-        else
-          signal = sig.GetArrivalTimeHiGain();
-
-        const Float_t time = signal - offset;
-
-        (*fArrivalTime)[pixidx].SetArrivalTime(time);
-
-    } /* for (UInt_t pixidx=0; pixidx<npix; pixidx++) */
+        (*fArrivalTime)[idx].SetArrivalTime(signal - offset);
+    }
 
     fArrivalTime->SetReadyToSave();