Changeset 3435 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/07/04 20:48:16 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (2 diffs)
• MCalibrationChargePix.cc (modified) (8 diffs)
• MCalibrationChargePix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -439 +439 @@
       pix.CheckTimeValidity(&bad);
       
-      if (!bad.IsCalibrationResultOK())
+      if (!bad.IsCalibrationSignalOK())
         continue;
 
@@ -497 +497 @@
                               avouterprms/avouternum * TMath::Sqrt((Float_t)fNumHiGainSamples/avouternum));
   }
+
+  MBadPixelsPix *bad = fCam->GetAverageInnerBadPix();
   
-  if (!avinnerpix->CheckChargeValidity() || !avinnerpix->CheckTimeValidity())
-      if (!avinnerpix->CalcReducedSigma())
-          avinnerpix->CalcFFactorMethod();
-
-  if (!avouterpix->CheckChargeValidity() || !avouterpix->CheckTimeValidity())
-      if (!avouterpix->CalcReducedSigma())
-          avouterpix->CalcFFactorMethod();
-
+  avinnerpix->CheckChargeValidity(bad);
+  avinnerpix->CheckTimeValidity(bad);
+
+  if (bad->IsCalibrationSignalOK())
+    if (!avinnerpix->CalcReducedSigma())
+      avinnerpix->CalcFFactorMethod();
+
+  bad = fCam->GetAverageInnerBadPix();
+
+  avouterpix->CheckChargeValidity(bad);
+  avouterpix->CheckTimeValidity(bad);
+
+  if (bad->IsCalibrationSignalOK())  
+    if (!avouterpix->CalcReducedSigma())
+      avouterpix->CalcFFactorMethod();
 
   if (!fBlindPixel->CheckChargeFitValidity())

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.cc

@@ -504 +504 @@
 // 4) Pixel has a charge sigma bigger than its Pedestal RMS
 // 
-Bool_t MCalibrationChargePix::CheckChargeValidity(MBadPixelsPix *bad)
+void MCalibrationChargePix::CheckChargeValidity(MBadPixelsPix *bad)
 {
  
@@ -511 +511 @@
       *fLog << warn << "WARNING: Fitted Charge is smaller than "
             << fChargeLimit << " Pedestal RMS in Pixel  " << fPixId << endl;
-      if (bad)
-        bad->SetChargeIsPedestal();
-      else 
-        return kFALSE;
+      bad->SetChargeIsPedestal();
     }
   
@@ -521 +518 @@
       *fLog << warn << "WARNING: Error of Fitted Charge is smaller than "
             << fChargeErrLimit << " in Pixel  " << fPixId << endl;
-      if (bad)
-        bad->SetChargeErrNotValid();
-      else 
-        return kFALSE;
+      bad->SetChargeErrNotValid();
     }
       
@@ -531 +525 @@
       *fLog << warn << "WARNING: Fitted Charge is smaller than "
             << fChargeRelErrLimit << "* its error in Pixel  " << fPixId << endl;
-      if (bad)
-        bad->SetChargeRelErrNotValid();
-      else 
-        return kFALSE;
+      bad->SetChargeRelErrNotValid();
     }
 
@@ -541 +532 @@
         *fLog << warn << "WARNING: Sigma of Fitted Charge smaller than Pedestal RMS in Pixel  " 
               << fPixId << endl;
-        if (bad)
-          {
-            *fLog << err << "HERERERERE" << endl;            
-            bad->SetChargeSigmaNotValid();
-          }
-        else 
-          return kFALSE;
+        bad->SetChargeSigmaNotValid();
     }
 
-  if (bad->IsChargeSigmaNotValid())
-    *fLog << err << " HERE " << endl;
-
-  return kTRUE;
 }
 
@@ -561 +542 @@
 // The mean arrival time is at least 1.0 slices from the used edge slices 
 //
-Bool_t MCalibrationChargePix::CheckTimeValidity(MBadPixelsPix *bad)
+void MCalibrationChargePix::CheckTimeValidity(MBadPixelsPix *bad)
 {
   
@@ -570 +551 @@
     {
       *fLog << warn << "WARNING: Mean ArrivalTime in first extraction bin of the Pixel " << fPixId << endl;
-      if (bad)
-        bad->SetMeanTimeInFirstBin();
-      else 
-        return kFALSE;
+      bad->SetMeanTimeInFirstBin();
     }
   
@@ -579 +557 @@
     {
       *fLog << warn << "WARNING: Mean ArrivalTime in last extraction bin of the Pixel " << fPixId << endl;
-      if (bad)
-        bad->SetMeanTimeInLastBin();
-      else 
-        return kFALSE;
+      bad->SetMeanTimeInLastBin();
     }
   
-  return kTRUE;
 }
 

trunk/MagicSoft/Mars/mcalib/MCalibrationChargePix.h

@@ -283 +283 @@
   void  ApplyLoGainConversion();
 
-  Bool_t CheckChargeValidity ( MBadPixelsPix *bad=NULL );
-  Bool_t CheckTimeValidity   ( MBadPixelsPix *bad=NULL );
+  void CheckChargeValidity ( MBadPixelsPix *bad );
+  void CheckTimeValidity   ( MBadPixelsPix *bad );
   Bool_t CalcReducedSigma();
   Bool_t CalcFFactorMethod();