Changeset 3481 for trunk/MagicSoft/Mars

Timestamp:

03/11/04 20:57:01 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MHCalibrationChargeCam.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -67 +67 @@
    * mcalib/MCalibrate.cc
      - added case that no MBadPixelsCam is available.
+
+   * mcalib/MHCalibrationChargeCam.cc
+     - adapted to new MBadPixelsPix::SetUnsuitable function
 
 

trunk/MagicSoft/Mars/mcalib/MHCalibrationChargeCam.cc

@@ -559 +559 @@
 
     if (hist.IsEmpty())
+      {
+        bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);        
         return;
-
+      }
+    
     if (hist.GetSaturated() > fNumHiGainSaturationLimit*hist.GetHGausHist()->GetEntries())
     {
@@ -571 +574 @@
     // 2) Fit the Hi Gain histograms with a Gaussian
     //
+    pix.SetHiGainFitted();
     if (!hist.FitGaus())
     //
@@ -578 +582 @@
       {
         hist.BypassFit();
+        pix.SetHiGainFitted(kFALSE);
         bad.SetHiGainNotFitted();
         bad.SetUnsuitable(MBadPixelsPix::kUnreliableRun);
       }
+      else
+        pix.SetHiGainFitted();
 
     //
@@ -621 +628 @@
 
     if (hist.IsEmpty())
-            return;
+      {
+        if (pix.IsHiGainSaturation())
+          bad.SetUnsuitable(MBadPixelsPix::kUnsuitableRun);
+        return;
+      }
+    
 
     if (hist.GetSaturated() > fNumLoGainSaturationLimit*hist.GetHGausHist()->GetEntries())
@@ -630 +642 @@
         return;
     }
+
     //
     // 2) Fit the Lo Gain histograms with a Gaussian
     //
+    pix.SetLoGainFitted();
     if (!hist.FitGaus())
     //
@@ -640 +654 @@
         {
           hist.BypassFit();
+          pix.SetLoGainFitted(kFALSE);
           bad.SetLoGainNotFitted();
           if (pix.IsHiGainSaturation())