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

Timestamp:

05/26/04 18:24:22 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

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

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -227 +227 @@
 const Float_t MCalibrationChargeCalc::fgChargeRelErrLimit      = 1.;
 const Float_t MCalibrationChargeCalc::fgLambdaErrLimit         = 0.2;
-const Float_t MCalibrationChargeCalc::fgLambdaCheckLimit       = 0.2;
+const Float_t MCalibrationChargeCalc::fgLambdaCheckLimit       = 0.5;
 const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 3.5;
 const Float_t MCalibrationChargeCalc::fgFFactorErrLimit        = 3.;
@@ -600 +600 @@
       *fLog << err << GetDescriptor() << ": Or, maybe, you have used a pedestal run " 
             << "instead of a calibration run " << endl;
-    return kFALSE;
+      return kFALSE;
   }
 
@@ -1117 +1117 @@
   const Float_t lambdacheck = fBlindPixel->GetLambdaCheck();
 
-  if (2.*(lambdacheck-lambda)/(lambdacheck+lambda) < fLambdaCheckLimit)
-    {
-      *fLog << warn << GetDescriptor() << ": Lambda and Lambda-Check differ by more than "
-            << fLambdaCheckLimit << " in the Blind Pixel " << endl;
-      return kFALSE;
-    }
-  
-  if (lambdaerr < fLambdaErrLimit) 
-    {
-      *fLog << warn << GetDescriptor() << ": Error of Fitted Lambda is greater than "
-            << fLambdaErrLimit << " in Blind Pixel " << endl;
+  if (2.*(lambdacheck-lambda)/(lambdacheck+lambda) > fLambdaCheckLimit)
+    {
+      *fLog << warn << GetDescriptor() 
+            << Form("%s%4.2f%s%4.2f%s%4.2f%s",": Lambda: ",lambda," and Lambda-Check: ",
+                    lambdacheck," differ by more than ",fLambdaCheckLimit," in the Blind Pixel ")
+            << endl;
+      return kFALSE;
+    }
+  
+  if (lambdaerr > fLambdaErrLimit) 
+    {
+      *fLog << warn << GetDescriptor() 
+            << Form("%s%4.2f%s%4.2f%s",": Error of Fitted Lambda: ",lambdaerr," is greater than ",
+                    fLambdaErrLimit," in Blind Pixel ") << endl;
       return kFALSE;
     }
@@ -1376 +1379 @@
           continue;
         }
-      
+
       if (!fBlindPixel->IsFluxInsidePlexiglassAvailable())
         {
@@ -1385 +1388 @@
       MBadPixelsPix       &bad   =                   (*fBadPixels)[i];
 
-      if (!bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
+      if (bad.IsUnsuitable (MBadPixelsPix::kUnsuitableRun))
         {
           qepix.SetBlindPixelMethodValid(kFALSE, fPulserColor);
@@ -1397 +1400 @@
                              / fBlindPixel->GetFluxInsidePlexiglass() 
                              / geo.GetA() 
-                            * fQECam->GetPlexiglassQE();
+                             * fQECam->GetPlexiglassQE();
 
       const Float_t qerelvar = fBlindPixel->GetFluxInsidePlexiglassRelVar() 
@@ -1405 +1408 @@
       qepix.SetQEBlindPixel    ( qe            , fPulserColor );
       qepix.SetQEBlindPixelVar ( qerelvar*qe*qe, fPulserColor );      
-      qepix.UpdateBlindPixelMethod();
+      qepix.SetBlindPixelMethodValid(  kTRUE   , fPulserColor );
+
+      if (!qepix.UpdateBlindPixelMethod())
+        *fLog << warn << GetDescriptor() 
+              << ": Cannot update Quantum efficiencies with the Blind Pixel Method" << endl;
     }
 }
@@ -1471 +1478 @@
       qepix.SetQEPINDiode    ( qe            , fPulserColor );
       qepix.SetQEPINDiodeVar ( qerelvar*qe*qe, fPulserColor );      
-      qepix.UpdateBlindPixelMethod();
+      qepix.SetPINDiodeMethodValid(  kTRUE   , fPulserColor );
+
+      if (!qepix.UpdatePINDiodeMethod())
+        *fLog << warn << GetDescriptor() 
+              << ": Cannot update Quantum efficiencies with the PIN Diode Method" << endl;
     }
 }