Changeset 3601 for trunk/MagicSoft/Mars/mcalib

Timestamp:

03/29/04 18:55:40 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc (modified) (9 diffs)

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -113 +113 @@
     fLoGainArray->SetOwner();
 
-    fAverageHiGainInnerPix = new MHCalibrationChargeHiGainPix("AverageHiGainInnerPix","Average HiGain FADC sums of inner pixels");
-    fAverageLoGainInnerPix = new MHCalibrationChargeLoGainPix("AverageLoGainInnerPix","Average LoGain FADC sums of inner pixels");
-    fAverageHiGainOuterPix = new MHCalibrationChargeHiGainPix("AverageHiGainOuterPix","Average HiGain FADC sums of outer pixels");
-    fAverageLoGainOuterPix = new MHCalibrationChargeLoGainPix("AverageLoGainOuterPix","Average LoGain FADC sums of outer pixels");
-
-/*
-    fAverageHiGainInnerPix->GetHGausHist()->SetName("HCalibrationChargeAverageInnerHiGainPix");
-    fAverageHiGainOuterPix->GetHGausHist()->SetName("HCalibrationChargeAverageOuterHiGainPix");
-    fAverageLoGainInnerPix->GetHGausHist()->SetName("HCalibrationChargeAverageInnerLoGainPix");
-    fAverageLoGainOuterPix->GetHGausHist()->SetName("HCalibrationChargeAverageOuterLoGainPix");
-*/
+    fAverageHiGainInnerPix = new MHCalibrationChargeHiGainPix("AverageHiGainInnerPix",
+                                                              "Average HiGain FADC sums of inner pixels");
+    fAverageLoGainInnerPix = new MHCalibrationChargeLoGainPix("AverageLoGainInnerPix",
+                                                              "Average LoGain FADC sums of inner pixels");
+    fAverageHiGainOuterPix = new MHCalibrationChargeHiGainPix("AverageHiGainOuterPix",
+                                                              "Average HiGain FADC sums of outer pixels");
+    fAverageLoGainOuterPix = new MHCalibrationChargeLoGainPix("AverageLoGainOuterPix",
+                                                              "Average LoGain FADC sums of outer pixels");
+
     fAverageHiGainInnerPix->GetHGausHist()->SetTitle("Summed FADC slices average Inner pixels HiGain");
     fAverageLoGainInnerPix->GetHGausHist()->SetTitle("Summed FADC slices average Inner pixels LoGain");
@@ -348 +346 @@
           if ((*fBadPixels)[i].IsBad())
           {
-              fNumExcluded++;
-              (*this)[i].SetExcluded();
+            *fLog << warn << "Excluded pixel: " << i << " from calibration " << endl;
+            fNumExcluded++;
+            (*this)[i].SetExcluded();
           }
           (*this)[i].Init();
@@ -576 +575 @@
     if (hist.IsEmpty())
       {
+        *fLog << warn << "Empty Hi Gain histogram in pixel: " << pix.GetPixId() << endl;
         bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);        
         return;
@@ -583 +583 @@
     {
         pix.SetHiGainSaturation();
-        bad.SetHiGainSaturation();
         return;
     }
@@ -597 +596 @@
         {
           hist.BypassFit();
-          bad.SetHiGainNotFitted();
-          bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
+          *fLog << warn << "Hi Gain could not be fitted in pixel: " << pix.GetPixId() << endl;
+          bad.SetUncalibrated( MBadPixelsPix::kHiGainNotFitted );
+          bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun   );
         }
 
@@ -627 +627 @@
     if (!hist.IsFourierSpectrumOK())
       {
-        bad.SetHiGainOscillating();
-        bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
+        *fLog << warn << "Oscillating Hi Gain in pixel: " << pix.GetPixId() << endl;
+        bad.SetUncalibrated( MBadPixelsPix::kHiGainOscillating );
+        bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun     );
       }
 }
@@ -648 +649 @@
     {
         pix.SetLoGainSaturation();
-        bad.SetLoGainSaturation();
-        bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+        bad.SetUncalibrated( MBadPixelsPix::kLoGainSaturation ); 
+        bad.SetUnsuitable(    MBadPixelsPix::kUnsuitableRun    );
         return;
     }
@@ -663 +664 @@
         {
           hist.BypassFit();
-          bad.SetLoGainNotFitted();
+          bad.SetUncalibrated( MBadPixelsPix::kLoGainNotFitted );
           if (pix.IsHiGainSaturation())
             bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
@@ -697 +698 @@
     if (!hist.IsFourierSpectrumOK())
       {
-        bad.SetLoGainOscillating();
+        bad.SetUncalibrated( MBadPixelsPix::kLoGainOscillating );
         if (pix.IsHiGainSaturation())
           bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);