Changeset 3189 for trunk/MagicSoft/Mars

Timestamp:

02/16/04 13:47:10 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (3 diffs)
• mcalib/MHCalibrationBlindPixel.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -74 +74 @@
    * mcalib/MHCalibrationPixel.cc:
      - after deletion of instances in Clear() initialize pointer to NULL
+
+   * mcalib/MCalibrationCalc.cc, mcalib/MHCalibrationBlindPixel.cc:
+     - fixed usage of logging stream output levels
 
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -682 +682 @@
 
   if (TESTBIT(fFlags,kUseBlindPixelFit) && fCalibrations->IsBlindPixelMethodValid())
-    {
+  {
       if (!fCalibrations->CalcFluxInsidePlexiglass())
-        {
-          *fLog << err 
-                << "Could not calculate the number of photons from the blind pixel " << endl;
-          *fLog << err 
-                << "You can try to calibrate using the MCalibrationCalc::SkipBlindPixelFit()" << endl;
+      {
+          *fLog << warn << "Could not calculate the number of photons from the blind pixel " << endl;
+          *fLog << "You can try to calibrate using the MCalibrationCalc::SkipBlindPixelFit()" << endl;
         fCalibrations->SetBlindPixelMethodValid(kFALSE);          
-        }
-    }
+      }
+  }
   else
     *fLog << inf << GetDescriptor() << ": Skipping Blind Pixel Calibration! " << endl;
@@ -697 +695 @@
 
   if (fCalibrations->IsPINDiodeMethodValid())
-    {
+  {
       if (!fCalibrations->CalcFluxOutsidePlexiglass())
-        {
-          *fLog << err 
-                << "Could not calculate the number of photons from the PIN Diode " << endl;
+      {
+          *fLog << warn << "Could not calculate the number of photons from the PIN Diode " << endl;
           fCalibrations->SetPINDiodeMethodValid(kFALSE);
-        }
-    }
+      }
+  }
   else
-    *fLog << inf << GetDescriptor() << ": Skipping PIN Diode Calibration! " << endl;
+      *fLog << inf << GetDescriptor() << ": Skipping PIN Diode Calibration! " << endl;
 
   fCalibrations->SetReadyToSave();
@@ -734 +731 @@
 
   if (sat)
-    {
+  {
       *fLog << err << "HI Gain Saturation occurred in the blind pixel! " 
             << " Do not know yet how to treat this ... aborting " << endl;
-      *fLog << err << "If you need absolutely any other kind of calibration, " 
+      *fLog << "If you need absolutely any other kind of calibration, "
             << " use SkipBlindPixelFit() " << endl;
       return kFALSE;
-    }
+  }
 
   signal = (Float_t)sum;

trunk/MagicSoft/Mars/mcalib/MHCalibrationBlindPixel.cc

@@ -687 +687 @@
 {
   
-  *fLog << err << "min: " << min << endl;
-  *fLog << err << "max: " << max << endl;  
+  *fLog << inf << "min: " << min << endl;
+  *fLog << "max: " << max << endl;
 
   //
@@ -743 +743 @@
   const Double_t electronicAmp_limit  = fgBlindPixelElectronicAmpError;
 
-  *fLog << err << "pedestal: " << fMeanPedestal << endl;
-  *fLog << err << "sigma: "    << fSigmaPedestal << endl;  
+  *fLog << inf << "pedestal: " << fMeanPedestal << endl;
+  *fLog << "sigma: "    << fSigmaPedestal << endl;
 
   //
@@ -923 +923 @@
 
   *fLog << inf << "Results of the Blind Pixel Fit: " << endl;
-  *fLog << inf << "Chisquare: " << fChisquare << endl;
-  *fLog << inf << "DoF: " << fNdf << endl;
-  *fLog << inf << "Probability: " << fProb << endl;
+  *fLog << "Chisquare: " << fChisquare << endl;
+  *fLog << "DoF: " << fNdf << endl;
+  *fLog << "Probability: " << fProb << endl;
 
   //
@@ -1001 +1001 @@
 
   *fLog << inf << "Results of the Times Fit: " << endl;
-  *fLog << inf << "Chisquare: "   << fTimeGausFit->GetChisquare() << endl;
-  *fLog << inf << "Ndf: "         << fTimeGausFit->GetNDF() << endl;
+  *fLog << "Chisquare: "   << fTimeGausFit->GetChisquare() << endl;
+  *fLog << "Ndf: "         << fTimeGausFit->GetNDF() << endl;
 
   return kTRUE;