Changeset 8417 for trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

Timestamp:

04/18/07 16:34:51 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc (modified) (28 diffs)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.172 2007-04-12 11:47:19 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.173 2007-04-18 15:33:56 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -239 +239 @@
 #include "MExtractedSignalPINDiode.h"
 
-#include "MBadPixelsIntensityCam.h"
 #include "MBadPixelsCam.h"
 
@@ -364 +363 @@
     fNumProcessed              = 0;
 
-    fIntensBad   = NULL;
     fBadPixels   = NULL;
     fIntensCam   = NULL;
@@ -447 +445 @@
 // -  MCalibrationIntensityChargeCam or MCalibrationChargeCam
 //  - MCalibrationIntensityQECam or MCalibrationQECam 
-//  - MBadPixelsIntensityCam or MBadPixelsCam
+//  - MBadPixelsCam
 // 
 // Search for the following input containers and give a warning if not existing:
@@ -535 +533 @@
     *fLog << inf << "No MHCalibrationChargeBlindCam found... no Blind Pixel method!" << endl;
 
-  fIntensBad = (MBadPixelsIntensityCam*)pList->FindObject(AddSerialNumber("MBadPixelsIntensityCam"));
-  if (fIntensBad)
-    *fLog << inf << "Found MBadPixelsIntensityCam... " << flush;
-  else
-    {
-      fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
-      if (!fBadPixels)
-        {
-          *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl;
-          return kFALSE;
-        }
-    }
+  fBadPixels = (MBadPixelsCam*)pList->FindObject(AddSerialNumber("MBadPixelsCam"));
+  if (!fBadPixels)
+  {
+      *fLog << err << "Cannot find MBadPixelsCam ... abort." << endl;
+      return kFALSE;
+  }
   
   // 
@@ -559 +551 @@
   MCalibrationChargeCam *chargecam = fIntensCam 
     ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
 
   UInt_t npixels     = fGeom->GetNumPixels();
@@ -569 +559 @@
       MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
       MCalibrationQEPix     &pqe = (MCalibrationQEPix&)    (*qecam)    [i];
-      MBadPixelsPix         &bad = (*badcam)   [i];
+      MBadPixelsPix         &bad = (*fBadPixels)[i];
       
       if (bad.IsBad())
@@ -750 +740 @@
   MCalibrationQECam     *qecam     = fIntensQE    ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
   MCalibrationChargeCam *chargecam = fIntensCam   ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-  MBadPixelsCam         *badcam    = fIntensBad   ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
 
   //
@@ -768 +757 @@
 
       MPedestalPix  &ped = (*fPedestals)[pixid];
-      MBadPixelsPix &bad = (*badcam)    [pixid];
+      MBadPixelsPix &bad = (*fBadPixels)[pixid];
 
       const Int_t aidx    = (*fGeom)[pixid].GetAidx();
@@ -919 +908 @@
   chargecam->SetReadyToSave();
   qecam    ->SetReadyToSave();
-  badcam   ->SetReadyToSave();
+  fBadPixels->SetReadyToSave();
 
   if (blindcam)
@@ -1158 +1147 @@
 {
   
-  MBadPixelsCam *badcam = fIntensBad ? (MBadPixelsCam*)fIntensBad->GetCam() : fBadPixels;
-
-  for (Int_t i=0; i<badcam->GetSize(); i++)
-    {
-      
-      MBadPixelsPix &bad = (*badcam)[i];
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (IsCheckDeadPixels())
@@ -1238 +1225 @@
 Bool_t MCalibrationChargeCalc::FinalizeFFactorMethod()
 {
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
   MCalibrationChargeCam *chargecam = fIntensCam 
     ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
@@ -1266 +1251 @@
     {
       MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
-      MBadPixelsPix         &bad =                         (*badcam)[i];
+
+      MBadPixelsPix &bad = (*fBadPixels)[i];
       
       if (!pix.IsFFactorMethodValid())
@@ -1391 +1377 @@
         continue;
 
-      MBadPixelsPix         &bad =           (*badcam)[i];
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUncalibrated(MBadPixelsPix::kChargeSigmaNotValid))
@@ -1526 +1512 @@
       
       MCalibrationChargePix &pix = (MCalibrationChargePix&)(*chargecam)[i];
-      MBadPixelsPix         &bad =                         (*badcam)[i];
+
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
@@ -1734 +1721 @@
   MCalibrationChargeCam *chargecam = fIntensCam 
     ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
 
   MCalibrationChargePix &avpix = (MCalibrationChargePix&)chargecam->GetAverageArea(0);
@@ -1785 +1770 @@
       MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
       MCalibrationQEPix     &qpix  = (MCalibrationQEPix&)    (*qecam)    [i];
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
+
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
@@ -1903 +1889 @@
       
       MCalibrationChargePix &pix   = (MCalibrationChargePix&)(*chargecam)[i];
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
+
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
@@ -1928 +1915 @@
       MCalibrationChargePix &pix  = (MCalibrationChargePix&)(*chargecam)[i];
       MCalibrationQEPix     &qpix = (MCalibrationQEPix&)    (*qecam)    [i];
-      MBadPixelsPix         &bad  =                         (*badcam)   [i];
-
-      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
+
+      if ((*fBadPixels)[i].IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
         {
           qpix.SetFFactorMethodValid(kFALSE,fPulserColor);
@@ -1964 +1950 @@
   MCalibrationBlindCam  *blindcam  = fIntensBlind
     ? (MCalibrationBlindCam*) fIntensBlind->GetCam(): fBlindCam;
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
   MCalibrationQECam     *qecam     = fIntensQE      
     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
@@ -2007 +1991 @@
         }
 
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
@@ -2063 +2047 @@
   MCalibrationChargeCam *chargecam = fIntensCam 
     ? (MCalibrationChargeCam*)fIntensCam->GetCam()  : fCam;
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
 
   if (!fPINDiode)
@@ -2090 +2072 @@
         }
 
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
+      MBadPixelsPix &bad = (*fBadPixels)[i];
 
       if (!bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
@@ -2130 +2112 @@
   MCalibrationQECam     *qecam     = fIntensQE      
     ? (MCalibrationQECam*)    fIntensQE->GetCam()   : fQECam;
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)        fIntensBad->GetCam()  : fBadPixels;
 
   for (UInt_t i=0; i<npixels; i++)
@@ -2137 +2117 @@
       
       MCalibrationQEPix     &qepix = (MCalibrationQEPix&)    (*qecam)    [i];
-      MBadPixelsPix         &bad   =                         (*badcam)   [i];
-
-      if (!bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
+
+      if (!(*fBadPixels)[i].IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
         {
           qepix.SetPINDiodeMethodValid(kFALSE, fPulserColor);
@@ -2167 +2146 @@
   TArrayI unrel(nareas);
 
-  const MBadPixelsCam *badcam = fIntensBad ? (MBadPixelsCam*)fIntensBad->GetCam() : fBadPixels;
   MCalibrationChargeCam *chargecam = fIntensCam ? (MCalibrationChargeCam*)fIntensCam->GetCam() : fCam;
 
@@ -2176 +2154 @@
   for (Int_t aidx=0; aidx<nareas; aidx++)
   {
-      suit[aidx]   = badcam->GetNumSuitable(MBadPixelsPix::kUnsuitableRun,   fGeom, aidx);
-      unsuit[aidx] = badcam->GetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx);
-      unrel[aidx]  = badcam->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx);
+      suit[aidx]   = fBadPixels->GetNumSuitable(MBadPixelsPix::kUnsuitableRun,   fGeom, aidx);
+      unsuit[aidx] = fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnsuitableRun, fGeom, aidx);
+      unrel[aidx]  = fBadPixels->GetNumUnsuitable(MBadPixelsPix::kUnreliableRun, fGeom, aidx);
 
       unsuitcnt   += unsuit[aidx];
@@ -2237 +2215 @@
   UInt_t countouter = 0;
 
-  MBadPixelsCam         *badcam    = fIntensBad 
-    ? (MBadPixelsCam*)fIntensBad->GetCam()  : fBadPixels;
-
-  for (Int_t i=0; i<badcam->GetSize(); i++)
-    {
-      MBadPixelsPix &bad = (*badcam)[i];
-
-      if (bad.IsUncalibrated(typ))
+  for (Int_t i=0; i<fBadPixels->GetSize(); i++)
+    {
+      if ((*fBadPixels)[i].IsUncalibrated(typ))
         {
           if (fGeom->GetPixRatio(i) == 1.)