Changeset 2834 for trunk/MagicSoft/Mars

Timestamp:

01/16/04 15:17:09 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationBlindPixel.cc (modified) (4 diffs)
• mcalib/MHCalibrationPixel.cc (modified) (10 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
    * mcalib/MCalibrationPINDiode.cc
    * mcalib/MCalibrationCam.cc
+   * mcalib/MHCalibrationBlindPixel.cc
+   * mcalib/MHCalibrationPixel.cc
      - fixed the warns and errs in fLog's
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc

@@ -398 +398 @@
                      + fSinglePhePedFit->GetParError(2)/fSinglePhePedFit->GetParameter(2);
 
-  *fLog << "Results of the Blind Pixel Fit: " << endl;
-  *fLog << "Chisquare: " << fChisquare << endl;
-  *fLog << "DoF: " << fNdf << endl;
-  *fLog << "Probability: " << fProb << endl;
+  *fLog << inf << "Results of the Blind Pixel Fit: " << endl;
+  *fLog << inf << "Chisquare: " << fChisquare << endl;
+  *fLog << inf << "DoF: " << fNdf << endl;
+  *fLog << inf << "Probability: " << fProb << endl;
 
   //
@@ -410 +410 @@
   if (fProb < gkProbLimit) 
     {
-      *fLog << err << "Prob: " << fProb << " is smaller than the allowed value: " << gkProbLimit << endl;
+      *fLog << err << "ERROR: Fit Probability " << fProb 
+            << " is smaller than the allowed value: " << gkProbLimit << endl;
       fFitOK = kFALSE;
       return kFALSE;
     }
 
+  if (fProb < 0.01) 
+    *fLog << warn << "WARNING: Fit Probability " << fProb << " is smaller than 1% " << endl;
+
   Float_t contSinglePhe = TMath::Exp(-1.0*fLambda)*fLambda*entries;
   
   if (contSinglePhe < 100.) 
     {
-      *fLog << err << "Statistics is too low: Only " << contSinglePhe 
-            << " in the first electron peak " << endl;
+      *fLog << err << "ERROR: Statistics is too low: Only " << contSinglePhe 
+            << " in the Single Photo-Electron peak " << endl;
       fFitOK = kFALSE;
       return kFALSE;
     } 
   else
-    *fLog << GetDescriptor() << ": " << contSinglePhe 
-          << " in first electron peak " << endl;
+    *fLog << inf << GetDescriptor() << ": " << contSinglePhe 
+          << " in Single Photo-Electron peak " << endl;
   
   fFitOK = kTRUE;
@@ -478 +482 @@
   fHBlindPixelTime->Fit(fTimeGausFit,opt);
 
-
   fMeanTime     = fTimeGausFit->GetParameter(2);
   fSigmaTime    = fTimeGausFit->GetParameter(3);
@@ -484 +487 @@
   fSigmaTimeErr = fTimeGausFit->GetParError(3);
 
-  Float_t prob = fTimeGausFit->GetProb();
-
-  *fLog << "Results of the Times Fit: " << endl;
-  *fLog << "Chisquare: "   << fTimeGausFit->GetChisquare() << endl;
-  *fLog << "Ndf: "         << fTimeGausFit->GetNDF() << endl;
-  *fLog << "Probability: " << prob << endl;
-
-  if (prob < gkProbLimit) 
-    {
-      *fLog << warn << "Fit of the Arrival times failed ! " << endl;
-      return kFALSE;
-    }
-  
+  *fLog << inf << "Results of the Times Fit: " << endl;
+  *fLog << inf << "Chisquare: "   << fTimeGausFit->GetChisquare() << endl;
+  *fLog << inf << "Ndf: "         << fTimeGausFit->GetNDF() << endl;
+
   return kTRUE;
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationPixel.cc

@@ -600 +600 @@
   if (!fTimeGausFit) 
     {
-    *fLog << err << dbginf << "Could not create fit function for Gauss fit" << endl;
+    *fLog << warn << dbginf << "WARNING: Could not create fit function for Time fit" << endl;
     return kFALSE;
     }
@@ -626 +626 @@
   fTimeSigma     = fTimeGausFit->GetParameter(2);
 
-  if (fTimeChisquare > 30.)  // Cannot use Probability because Ndf is sometimes < 1
-    {
-      *fLog << warn << "Fit of the Arrival times failed ! " << endl;
+  if (fTimeChisquare > 20.)  // Cannot use Probability because Ndf is sometimes < 1
+    {
+      *fLog << warn << "WARNING: Fit of the Arrival times failed ! " << endl;
       return kFALSE;
     }
@@ -656 +656 @@
   if (!fTimeGausFit) 
     {
-    *fLog << err << dbginf << "Could not create fit function for Gauss fit" << endl;
+    *fLog << warn << dbginf << "WARNING: Could not create fit function for Time fit" << endl;
     return kFALSE;
     }
@@ -682 +682 @@
   fTimeSigma     = fTimeGausFit->GetParameter(2);
 
-  if (fTimeChisquare > 30.)  // Cannot use Probability because Ndf is sometimes < 1
-    {
-      *fLog << warn << "Fit of the Arrival times failed ! " << endl;
+  if (fTimeChisquare > 20.)  // Cannot use Probability because Ndf is sometimes < 1
+    {
+      *fLog << warn << "WARNING: Fit of the Arrival times failed ! " << endl;
       return kFALSE;
     }
@@ -720 +720 @@
   if (!fChargeGausFit) 
     {
-    *fLog << err << dbginf << "Could not create fit function for Gauss fit" << endl;
+    *fLog << warn << dbginf << "WARNING: Could not create fit function for Gauss fit" << endl;
     return kFALSE;
     }
@@ -755 +755 @@
   if (fChargeProb < gkProbLimit) 
     {
-      *fLog << warn << "Prob: " << fChargeProb 
+      *fLog << warn << "WARNING: Fit Probability " << fChargeProb 
             << " is smaller than the allowed value: " << gkProbLimit << endl;
       fFitOK = kFALSE;
@@ -794 +794 @@
   if (!fChargeGausFit) 
     {
-    *fLog << err << dbginf << "Could not create fit function for Gauss fit" << endl;
+    *fLog << warn << dbginf << "WARNING: Could not create fit function for Charges fit" << endl;
     return kFALSE;
     }
@@ -835 +835 @@
   if (fChargeProb < gkProbLimit) 
     {
-      *fLog << warn << "Prob: " << fChargeProb << " is smaller than the allowed value: " << gkProbLimit << endl;
+      *fLog << warn << "WARNING: Fit Probability " << fChargeProb 
+            << " is smaller than the allowed value: " << gkProbLimit << endl;
       fFitOK = kFALSE;
       return kFALSE;
@@ -874 +875 @@
 {
   
-  *fLog << "Results of the Summed Charges Fit: "                      << endl;
-  *fLog << "Chisquare: "        << fChargeChisquare                   << endl;
-  *fLog << "DoF: "              << fChargeNdf                         << endl;
-  *fLog << "Probability: "      << fChargeProb                        << endl;
-  *fLog                                                               << endl;
+  *fLog << all << "Results of the Summed Charges Fit: "                      << endl;
+  *fLog << all << "Chisquare: "        << fChargeChisquare                   << endl;
+  *fLog << all << "DoF: "              << fChargeNdf                         << endl;
+  *fLog << all << "Probability: "      << fChargeProb                        << endl;
+  *fLog << all                                                               << endl;
   
 }
@@ -885 +886 @@
 {
 
-  *fLog << "Results of the Time Slices Fit: "                        << endl;
-  *fLog << "Chisquare: "   << fTimeChisquare                         << endl;
-  *fLog << "Ndf: "         << fTimeNdf                               << endl;
-  *fLog << "Probability: " << fTimeProb                              << endl;
-  *fLog                                                              << endl;
-
-}
+  *fLog << all << "Results of the Time Slices Fit: "                        << endl;
+  *fLog << all << "Chisquare: "   << fTimeChisquare                         << endl;
+  *fLog << all << "Ndf: "         << fTimeNdf                               << endl;
+  *fLog << all << "Probability: " << fTimeProb                              << endl;
+  *fLog << all                                                              << endl;
+
+}