Changeset 8428 for trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

Timestamp:

04/20/07 14:59:58 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc (modified) (16 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationRelTimeCalc.cc

@@ -71 +71 @@
 #include "MGeomPix.h"
 
-#include "MCalibrationIntensityRelTimeCam.h"
 #include "MCalibrationRelTimeCam.h"
 #include "MCalibrationRelTimePix.h"
@@ -122 +121 @@
 void MCalibrationRelTimeCalc::Clear(const Option_t *o)
 {
-
-  fBadPixels  = NULL;
-  fCam        = NULL;
-  fIntensCam  = NULL;
-
+    fBadPixels  = NULL;
+    fCam        = NULL;
 }
 
@@ -133 +129 @@
 // Search for the following input containers and abort if not existing:
 //  - MGeomCam
-//  - MCalibrationIntensityRelTimeCam or MCalibrationRelTimeCam 
+//  - MCalibrationRelTimeCam
 //  - MBadPixelsCam
 // 
@@ -161 +157 @@
   }
 
-  fIntensCam = (MCalibrationIntensityRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationIntensityRelTimeCam"));
-  if (fIntensCam)
-    *fLog << inf << "Found MCalibrationIntensityRelTimeCam ... " << endl;
-  else
-    {
-      fCam = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
-      if (!fCam)
-        {
-          *fLog << err << "Cannot find MCalibrationRelTimeCam ... abort." << endl;
-          *fLog << err << "Maybe you forget to call an MFillH for the MHCalibrationRelTimeCam before..." << endl;
-          return kFALSE;
-        }
-    }
-  
-  UInt_t npixels     = fGeom->GetNumPixels();
-  
-  MCalibrationRelTimeCam *relcam = fIntensCam 
-    ? (MCalibrationRelTimeCam*)fIntensCam->GetCam()  : fCam;
-
+  fCam = (MCalibrationRelTimeCam*)pList->FindObject(AddSerialNumber("MCalibrationRelTimeCam"));
+  if (!fCam)
+  {
+      *fLog << err << "Cannot find MCalibrationRelTimeCam ... abort." << endl;
+      return kFALSE;
+  }
+
+  const UInt_t npixels = fGeom->GetNumPixels();
   for (UInt_t i=0; i<npixels; i++)
-    {
-      
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i];
+  {
+      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
 
       if ((*fBadPixels)[i].IsBad())
-        {
+      {
           pix.SetExcluded();
           continue;
-        }
+      }
 
       if (IsDebug())
-        pix.SetDebug();
-    }
+          pix.SetDebug();
+  }
 
   return kTRUE;
@@ -242 +226 @@
   FinalizeUnsuitablePixels();
 
-  if (fIntensCam)
-    fIntensCam->SetReadyToSave();
-  else
-    fCam      ->SetReadyToSave();
-
+  fCam->SetReadyToSave();
   fBadPixels->SetReadyToSave();
 
@@ -277 +257 @@
 {
 
-  MCalibrationRelTimeCam *relcam = fIntensCam 
-    ? (MCalibrationRelTimeCam*)fIntensCam->GetCam()  : fCam;
-
   const UInt_t npixels  = fGeom->GetNumPixels();
   const UInt_t nareas   = fGeom->GetNumAreas();
@@ -286 +263 @@
   TArrayF upplim       (nareas);
   TArrayF areasum      (nareas);
-  //  Float_t areasum2     [nareas];
   TArrayI numareavalid (nareas);
   TArrayI useunreliable(nareas);
@@ -306 +282 @@
       numareavalid[aidx] ++;
     }
-  
+
   for (UInt_t aidx=0; aidx<nareas; aidx++)
     if (numareavalid[aidx] < 100)
@@ -318 +294 @@
   for (UInt_t i=0; i<npixels; i++)
     {
-      
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i];
+
+      const MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
 
       if (pix.IsExcluded())
@@ -349 +325 @@
           continue;
         }
- 
+
       // Calculate the rms out of sum2:
       /*
@@ -358 +334 @@
       lowlim  [aidx]  = 0;
       upplim  [aidx]  = areasum [aidx] + fRelTimeResolutionLimit;
-      
+
     }
   *fLog << endl;  
@@ -365 +341 @@
   for (UInt_t i=0; i<npixels; i++)
     {
-      
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i];
-      
+
+      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
+
       if (pix.IsExcluded())
         continue;
-      
+
       MBadPixelsPix &bad = (*fBadPixels)[i];
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
         continue;
-      
+
       const Float_t res    = pix.GetTimePrecision();
       const Int_t   aidx   = (*fGeom)[i].GetAidx();
-      
+
       if ( res < lowlim[aidx] || res > upplim[aidx] )
         {
@@ -401 +377 @@
 void MCalibrationRelTimeCalc::FinalizeBadPixels()
 {
-  
-  MCalibrationRelTimeCam *relcam = fIntensCam 
-    ? (MCalibrationRelTimeCam*)fIntensCam->GetCam()  : fCam;
 
   for (Int_t i=0; i<fBadPixels->GetSize(); i++)
     {
-      
-      MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*relcam)[i];
 
       MBadPixelsPix &bad = (*fBadPixels)[i];
@@ -425 +396 @@
 
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+      {
+          MCalibrationRelTimePix &pix = (MCalibrationRelTimePix&)(*fCam)[i];
           pix.SetExcluded();
+      }
     }
 
@@ -442 +416 @@
     *fLog << dec;
 
-    MCalibrationRelTimeCam *relcam = fIntensCam ? (MCalibrationRelTimeCam*)fIntensCam->GetCam() : fCam;
-
     const Int_t nareas = fGeom->GetNumAreas();
 
@@ -453 +425 @@
         unsuit[aidx] += fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx);
         unrel[aidx]  += fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx);
-        relcam->SetNumUnsuitable(unsuit[aidx], aidx);
-        relcam->SetNumUnreliable(unrel[aidx],  aidx);
+        fCam->SetNumUnsuitable(unsuit[aidx], aidx);
+        fCam->SetNumUnreliable(unrel[aidx],  aidx);
     }