Changeset 3451 for trunk/MagicSoft/Mars

Timestamp:

03/09/04 19:59:31 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -440 +440 @@
       pix.CheckTimeValidity(&bad);
       
-      if (!bad.IsCalibrationSignalOK())
+      if (bad.IsUnsuitableRun())
         continue;
 
@@ -446 +446 @@
 
       if (!pix.CalcReducedSigma())
+        {
+          bad.SetUnsuitableRun();
           continue;
-
+        }
+      
       pix.CalcFFactorMethod();
-
     }
 
@@ -459 +461 @@
   if (nvalid == 0)
   {
-      *fLog << err << GetDescriptor() << ": Dear Michele! All pixels have non-valid calibration. " 
-            << "Did you forget to fill the histograms (filling MHCalibrationChargeCam from MExtractedSignalCam using MFillH) ? " << endl;
+      *fLog << err << GetDescriptor() << ": All pixels have non-valid calibration. " 
+            << "Did you forget to fill the histograms "
+            << "(filling MHCalibrationChargeCam from MExtractedSignalCam using MFillH) ? " << endl;
+      *fLog << err << GetDescriptor() << ": Or, maybe, you have used a pedestal run " 
+            << "instead of a calibration run " << endl;
     return kFALSE;
   }
@@ -519 +524 @@
   if (!fBlindPixel->CheckChargeFitValidity())
   {
-      *fLog << warn << "Could not calculate the flux of photons from the PIN Diode, charge fit not valid " << endl;
+      *fLog << warn << "Could not calculate the flux of photons from the Blind Pixel, "
+            << "charge fit not valid " << endl;
       fCam->SetBlindPixelMethodValid(kFALSE);
   }
@@ -526 +532 @@
       if (!fBlindPixel->CalcFluxInsidePlexiglass())
       {
-          *fLog << warn << "Could not calculate the flux of photons from the PIN Diode, will skip PIN Diode Calibration " << endl;
+          *fLog << warn << "Could not calculate the flux of photons from the Blind Pixel, "
+                << "will skip PIN Diode Calibration " << endl;
           fCam->SetBlindPixelMethodValid(kFALSE);
       }
@@ -538 +545 @@
   if (!fPINDiode->CheckChargeFitValidity() || !fPINDiode->CheckTimeFitValidity())
   {
-      *fLog << warn << "Could not calculate the flux of photons from the PIN Diode, charge fit not valid " << endl;
+      *fLog << warn << "Could not calculate the flux of photons from the PIN Diode, "
+            << "charge fit not valid " << endl;
       fCam->SetPINDiodeMethodValid(kFALSE);
   }
@@ -545 +553 @@
       if (!fPINDiode->CalcFluxOutsidePlexiglass())
       {
-          *fLog << warn << "Could not calculate the flux of photons from the PIN Diode, will skip PIN Diode Calibration " << endl;
+          *fLog << warn << "Could not calculate the flux of photons from the PIN Diode, "
+                << "will skip PIN Diode Calibration " << endl;
           fCam->SetPINDiodeMethodValid(kFALSE);
       }