Changeset 8580 for trunk/MagicSoft

Timestamp:

06/18/07 15:37:24 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbadpixels/MBadPixelsCam.cc (modified) (3 diffs)
• mbadpixels/MBadPixelsPix.h (modified) (3 diffs)
• mcalib/MCalibrationChargeCalc.cc (modified) (6 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -32 +32 @@
      - changed old value for time difference to 3.0
      - use the default value (3.0) in all files
+
+   * mbadpixels/MBadPixelsPix.h, mbadpixels/MBadPixelsCam.cc,
+     mcalib/MCalibrationChargeCalc.cc:
+     - renamed kFluctuatingArrivalTimes to kDeviatingAbsTimeResolution
 
    * mbase/MMath.cc: 

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.50 2007-04-25 14:39:41 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MBadPixelsCam.cc,v 1.51 2007-06-18 14:35:39 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -455 +455 @@
   *fLog << endl;
 
+  // TO BE FIXED!!!
+
   PrintBadPixels(MBadPixelsPix::kPreviouslyExcluded,"Previously excluded");
   PrintBadPixels(MBadPixelsPix::kChargeIsPedestal,"Signal smaller 3 Pedestal RMS");
@@ -466 +468 @@
   PrintBadPixels(MBadPixelsPix::kLoGainOverFlow,"Low-Gain Histogram Overflow");
   PrintBadPixels(MBadPixelsPix::kDeadPedestalRms,"Presumably dead from Ped. Rms");
-  PrintBadPixels(MBadPixelsPix::kFluctuatingArrivalTimes,"Fluctuating Pulse Arrival Times");
+//  PrintBadPixels(MBadPixelsPix::kFluctuatingArrivalTimes,"Fluctuating Pulse Arrival Times");
 
   *fLog << endl;
   *fLog << all << "Unreliable pixels statistics:" << endl;
   *fLog << endl;
+
+  // TO BE FIXED!!!
 
   PrintBadPixels(MBadPixelsPix::kChargeSigmaNotValid,"Signal Sigma smaller Pedestal RMS");

trunk/MagicSoft/Mars/mbadpixels/MBadPixelsPix.h

@@ -48 +48 @@
       kDeviatingNumPhots        = BIT(15),
       kDeviatingFFactor         = BIT(16),
-      kDeviatingTimeResolution  = BIT(17),
+      kDeviatingRelTimeResolution  = BIT(17),
       kConversionHiLoNotValid   = BIT(18),
       kHiGainOverFlow           = BIT(19),
@@ -55 +55 @@
       kHiLoOscillating          = BIT(22),
       kDeadPedestalRms          = BIT(23),
-      kFluctuatingArrivalTimes  = BIT(24),
-      kLoGainBlackout           = BIT(25)
+      kDeviatingAbsTimeResolution  = BIT(24),
+      kLoGainBlackout           = BIT(25),
     };
     
@@ -107 +107 @@
       if (IsUncalibrated( kDeadPedestalRms     ))    return 5;
       if (IsUncalibrated( kDeviatingNumPhes    ))    return 6;
-      if (IsUncalibrated( kFluctuatingArrivalTimes)) return 7;
-      if (IsUncalibrated( kDeviatingTimeResolution)) return 8;
+      //if (IsUncalibrated( kFluctuatingArrivalTimes)) return 7;
+      if (IsUncalibrated( kDeviatingAbsTimeResolution)) return 7;
+      if (IsUncalibrated( kDeviatingRelTimeResolution)) return 8;
       if (IsUncalibrated( kLoGainBlackout      ))    return 9;
       if (IsUncalibrated( kPreviouslyExcluded  ))    return 10;

trunk/MagicSoft/Mars/mcalib/MCalibrationChargeCalc.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.181 2007-06-11 15:35:14 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MCalibrationChargeCalc.cc,v 1.182 2007-06-18 14:36:16 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -746 +746 @@
             {
                 *fLog << warn << "Pixel  " << setw(4) << i << ": Abs-time rms could not be calculated." << endl;
-                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingAbsTimeResolution);
                 continue;
             }
@@ -753 +753 @@
             {
                 *fLog << warn << "Pixel  " << setw(4) << i << ": Abs-time rms==0." << endl;
-                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingTimeResolution);
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingAbsTimeResolution);
                 continue;
             }
@@ -764 +764 @@
                     << Form("[%4.2f,%4.2f]", lolim, hilim) << endl;
 
-                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kFluctuatingArrivalTimes);
+                (*fBadPixels)[i].SetUncalibrated(MBadPixelsPix::kDeviatingAbsTimeResolution);
             }
         }
@@ -949 +949 @@
   PrintUncalibrated(MBadPixelsPix::kLoGainOverFlow,    
                     "Pixels with Low Gain Overflow :                   ");
-  PrintUncalibrated(MBadPixelsPix::kFluctuatingArrivalTimes,
-                    "Fluctuating Pulse Arrival Times:                  ");
+//  PrintUncalibrated(MBadPixelsPix::kFluctuatingArrivalTimes,
+//                    "Fluctuating Pulse Arrival Times:                  ");
+  PrintUncalibrated(MBadPixelsPix::kDeviatingAbsTimeResolution,
+                    Form("%s%2.1f%s ","Abs.time rms more than ", fArrTimeRmsLimit, " dev from median:      "));
   PrintUncalibrated(MBadPixelsPix::kDeadPedestalRms,
                     "Presumably dead from Pedestal Rms:                ");
@@ -1245 +1247 @@
       if (IsCheckArrivalTimes())
         {
-          if (bad.IsUncalibrated( MBadPixelsPix::kFluctuatingArrivalTimes ))
+          if (bad.IsUncalibrated( MBadPixelsPix::kDeviatingAbsTimeResolution ))
             bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
+          //if (bad.IsUncalibrated( MBadPixelsPix::kFluctuatingArrivalTimes ))
+          //  bad.SetUnsuitable(   MBadPixelsPix::kUnsuitableRun    );
         }