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

Timestamp:

03/11/04 18:27:42 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -331 +331 @@
     }
 
-  fCam->SetGeomCam(fGeom);
-  fCam->SetBadPixelsCam(fBadPixels);
-
   fNumHiGainSamples  =  fSignals->GetNumUsedHiGainFADCSlices();
   fNumLoGainSamples  =  fSignals->GetNumUsedLoGainFADCSlices();
@@ -437 +434 @@
       }
 
-      pix.CheckChargeValidity(&bad);
-      pix.CheckTimeValidity(&bad);
+      pix.CheckChargeValidity (&bad);
+      pix.CheckTimeValidity   (&bad);
       
-      if (bad.IsUnsuitableRun())
+      if (bad.IsUnsuitable(MBadPixelsPix::kUnsuitableRun))
         continue;
-
+      
       nvalid++;
 
       if (!pix.CalcReducedSigma())
         {
-          bad.SetUnsuitableRun();
+          bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
           continue;
         }
       
-      pix.CalcFFactorMethod();
-    }
-
+      if (!pix.CalcFFactorMethod())
+        bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+
+    }
+  
 
 
@@ -525 +524 @@
   // F-Factor calibration
   //
-  if (fCam->CalcMeanFluxPhotonsFFactorMethod())
-  {
-    fCam->ApplyFFactorCalibration();
+  if (fCam->CalcMeanFluxPhotonsFFactorMethod(*fGeom, *fBadPixels))
+  {
+    fCam->ApplyFFactorCalibration(*fGeom,*fBadPixels);
     fCam->SetFFactorMethodValid(kTRUE);
   }
@@ -536 +535 @@
     }
   
-
-
   // 
   // Blind Pixel calibration
@@ -558 +555 @@
       {
           fCam->SetBlindPixelMethodValid(kTRUE);
-          fCam->ApplyBlindPixelCalibration();
+          fCam->ApplyBlindPixelCalibration(*fGeom,*fBadPixels);
       }
   }
@@ -582 +579 @@
       {
           fCam->SetPINDiodeMethodValid(kTRUE);
-          fCam->ApplyPINDiodeCalibration();
+          fCam->ApplyPINDiodeCalibration(*fGeom,*fBadPixels);
       }
   }