Changeset 3849 for trunk/MagicSoft/Mars/mcalib

Timestamp:

04/27/04 16:53:14 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mcalib

Files:

• MCalibrationChargeCalc.cc (modified) (5 diffs)
• MHCalibrationTestCam.cc (modified) (1 diff)
• MHCalibrationTestPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -228 +228 @@
 const Float_t MCalibrationChargeCalc::fgLambdaErrLimit         = 0.2;
 const Float_t MCalibrationChargeCalc::fgLambdaCheckLimit       = 0.2;
-const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 5.;
+const Float_t MCalibrationChargeCalc::fgPheErrLimit            = 4.;
 // --------------------------------------------------------------------------
 //
@@ -814 +814 @@
 // - MBadPixelsPix::kMeanTimeInFirstBin 
 // - MBadPixelsPix::kMeanTimeInLast2Bins 
-//
-// Sets pixel to MBadPixelsPix::kUnreliableRun, if one of the following flags is set:
 // - MBadPixelsPix::kDeviatingNumPhes
 //
+// - Call MCalibrationPix::SetExcluded() for the bad pixels
+//
 void MCalibrationChargeCalc::FinalizeBadPixels()
 {
@@ -825 +825 @@
       
       MBadPixelsPix    &bad    = (*fBadPixels)[i];
+      MCalibrationPix  &pix    = (*fCam)[i];
 
       if (bad.IsUncalibrated( MBadPixelsPix::kChargeIsPedestal))
@@ -845 +846 @@
 
       if (bad.IsUncalibrated( MBadPixelsPix::kDeviatingNumPhes ))
-        bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
+        bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
+      //        bad.SetUnsuitable(   MBadPixelsPix::kUnreliableRun    );
+
+      if (bad.IsUnsuitable(   MBadPixelsPix::kUnsuitableRun    ))
+        pix.SetExcluded();
+
     }
 }
@@ -981 +987 @@
                 << Form("%4.2f%s%4.2f",lowlim[aidx],",",upplim[aidx]) << "] in pixel " << i << endl;
           bad.SetUncalibrated( MBadPixelsPix::kDeviatingNumPhes );
-          bad.SetUnsuitable  ( MBadPixelsPix::kUnreliableRun    );
+          bad.SetUnsuitable  ( MBadPixelsPix::kUnsuitableRun    );
+          pix.SetExcluded();
+          //          bad.SetUnsuitable  ( MBadPixelsPix::kUnreliableRun    );
           continue;
         }

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestCam.cc

@@ -461 +461 @@
   const MHGausEvents &pix = (*this)[idx];
 
+  if (pix.IsExcluded())
+    return kFALSE;
+
   switch (type)
     {

trunk/MagicSoft/Mars/mcalib/MHCalibrationTestPix.cc

@@ -52 +52 @@
 const Int_t   MHCalibrationTestPix::fgChargeNbins     = 2000;
 const Axis_t  MHCalibrationTestPix::fgChargeFirst     = -0.5;
-const Axis_t  MHCalibrationTestPix::fgChargeLast      = 1999.5;
+const Axis_t  MHCalibrationTestPix::fgChargeLast      = 3999.5;
 // --------------------------------------------------------------------------
 //