Changeset 2832 for trunk/MagicSoft/Mars

Timestamp:

01/16/04 14:59:52 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibrationCalc.cc (modified) (4 diffs)
• mcalib/MCalibrationCam.cc (modified) (6 diffs)
• mcalib/MCalibrationPix.cc (modified) (8 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -18 +18 @@
 
    * mcalib/MCalibrationCalc.cc
+   * mcalib/MCalibrationPix.cc
+   * mcalib/MCalibrationCam.cc
      - fixed the warns and errs in fLog's
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCalc.cc

@@ -424 +424 @@
 
 
-  *fLog << GetDescriptor() << ": Cut Histogram Edges" << endl;
+  *fLog << inf << GetDescriptor() << ": Cut Histogram Edges" << endl;
 
   //
@@ -436 +436 @@
   MCalibrationBlindPix &blindpixel = *(fCalibrations->GetBlindPixel());
 
-  *fLog << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
+  *fLog << inf << GetDescriptor() << ": Fitting the Blind Pixel" << endl;
 
   // 
@@ -454 +454 @@
     }
   
-  *fLog << GetDescriptor() << ": Fitting the Normal Pixels" << endl;
+  *fLog << inf << GetDescriptor() << ": Fitting the Normal Pixels" << endl;
 
   //
@@ -500 +500 @@
     return kTRUE;
   
-  *fLog << endl;
+  *fLog << inf << endl;
   *fLog << dec << setfill(' ') << fCosmics << " Events presumably cosmics" << endl;
 

trunk/MagicSoft/Mars/mcalib/MCalibrationCam.cc

@@ -248 +248 @@
   int id = 0;
   
-  *fLog << "Succesfully calibrated pixels:" << endl;
-  *fLog << endl;
+  *fLog << all << "Succesfully calibrated pixels:" << endl;
+  *fLog << all << endl;
 
   TIter Next(fPixels);
@@ -263 +263 @@
             rsigma = TMath::Sqrt(rsigma);
 
-          *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 
-                << " Reduced Charge: " << pix->GetCharge() << " +- " 
+          *fLog << all << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " 
+                << pix->GetPedRms() << " Reduced Charge: " << pix->GetCharge() << " +- " 
                 << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma 
                 << " Nr Phe's: " << pix->GetPheFFactorMethod() << endl;
@@ -271 +271 @@
     }
   
-  *fLog << id << " succesful pixels :-))" << endl;
+  *fLog << all << id << " succesful pixels :-))" << endl;
   id = 0;
   
-  *fLog << endl;
-  *fLog << "Pixels with errors:" << endl;
-  *fLog << endl;
+  *fLog << all << endl;
+  *fLog << all << "Pixels with errors:" << endl;
+  *fLog << all << endl;
   
   TIter Next2(fPixels);
@@ -289 +289 @@
               rsigma = TMath::Sqrt(rsigma);
             
-            *fLog << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " << pix->GetPedRms() 
-                  << " Reduced Charge: " << pix->GetCharge() << " +- " 
-                << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma << endl;
+            *fLog << all << pix->GetPixId() << " Pedestals: " << pix->GetPed() << " +- " 
+                  << pix->GetPedRms() << " Reduced Charge: " << pix->GetCharge() << " +- " 
+                  << pix->GetSigmaCharge() << " Reduced Sigma: " << rsigma << endl;
             id++;
           }
       }
-    *fLog << id << " pixels with errors :-((" << endl;
+    *fLog << all << id << " pixels with errors :-((" << endl;
     
 }
@@ -455 +455 @@
   fNumPhotInsidePlexiglassAvailable = kTRUE;
 
-  *fLog << endl;
-  *fLog << mean << " Mean number of Photons for an Inner Pixel: " << fMeanPhotInsidePlexiglass << endl;
-  *fLog << endl;
+  *fLog << inf << endl;
+  *fLog << inf << mean << " Mean number of Photons for an Inner Pixel (inside Plexiglass): " 
+        << fMeanPhotInsidePlexiglass << endl;
+  *fLog << inf << endl;
 
   TIter Next(fPixels);
@@ -510 +511 @@
 
   fNumPhotOutsidePlexiglassAvailable = kTRUE;
+
+  *fLog << inf << endl;
+  *fLog << inf << mean << " Mean number of Photons for an Inner Pixel (outside Plexiglass): " 
+        << fMeanPhotOutsidePlexiglass << endl;
+  *fLog << inf << endl;
 
   TIter Next(fPixels);

trunk/MagicSoft/Mars/mcalib/MCalibrationPix.cc

@@ -178 +178 @@
     fHist->SetLowerFitRange(1.5*fPedRms);
   else
-    *fLog << warn << "Cannot set lower fit range: Pedestals not available" << endl;
+    *fLog << warn << "WARNING: Cannot set lower fit range: Pedestals not available" << endl;
 
   //
@@ -193 +193 @@
       if(!fHist->FitChargeLoGain())
         {
-          *fLog << warn << "Could not fit Lo Gain charges of pixel " << fPixId << endl;
+          *fLog << warn << "WARNING: Could not fit Lo Gain charges of pixel " << fPixId << endl;
           //          
           // 5) In case of failure print out the fit results
@@ -207 +207 @@
       if(!fHist->FitChargeHiGain())
         {
-          *fLog << warn << "Could not fit Hi Gain charges of pixel " << fPixId << endl;
+          *fLog << warn << "WARNING: Could not fit Hi Gain charges of pixel " << fPixId << endl;
           //          
           // 5) In case of failure print out the fit results
@@ -227 +227 @@
   if (fCharge <= 0.)
     {
-      *fLog << warn << "Cannot apply calibration: Mean Fitted Charges are smaller than 0 in pixel " 
+      *fLog << warn << "WARNING: Cannot apply calibration: Mean Fitted Charges are smaller than 0 in pixel " 
             << fPixId << endl;
       return kFALSE;
@@ -308 +308 @@
       if (fRSigmaSquare <= 0.)
         {
-          *fLog << warn << "Cannot apply F-Factor calibration: Reduced Sigma smaller than 0 in pixel " 
+          *fLog << warn 
+                << "WARNING: Cannot apply F-Factor calibration: Reduced Sigma smaller than 0 in pixel " 
                 << fPixId << endl;
           if (fHiGainSaturation)
@@ -439 +440 @@
 
 
+//
+// The check returns kTRUE if:
+//
+// 
+//
+Bool_t MCalibrationPix::CheckOscillations()
+{
+
+
+  return kTRUE;
+}
+
+
 
 void MCalibrationPix::ApplyLoGainConversion()
@@ -492 +506 @@
       if(!fHist->FitTimeLoGain())
         {
-          *fLog << warn << "Could not fit Lo Gain times of pixel " << fPixId << endl;
+          *fLog << warn << "WARNING: Could not fit Lo Gain times of pixel " << fPixId << endl;
           fHist->PrintTimeFitResult();
           return kFALSE;
@@ -505 +519 @@
       if(!fHist->FitTimeHiGain())
         {
-          *fLog << warn << "Could not fit Hi Gain times of pixel " << fPixId << endl;
+          *fLog << warn << "WARNING: Could not fit Hi Gain times of pixel " << fPixId << endl;
           fHist->PrintTimeFitResult();
           return kFALSE;