Changeset 5415

Timestamp:

11/17/04 09:38:19 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mcalib/MCalibColorSet.cc (modified) (3 diffs)
• mhcalib/MHCalibrationChargeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/Changelog

@@ -35 +35 @@
        Next will follow an interleaved pedestal event and finally an 
        interleaved data event.
+
+   * mhcalib/MHCalibrationChargeCam.cc
+     - adapt the histogram ranges slightly because I have found high 
+       intensity calibration events creating non desired overflows.
 
 

trunk/MagicSoft/Mars/mcalib/MCalibColorSet.cc

@@ -123 +123 @@
     }
   
+  //
+  // Consider the case that a pedestal run is interleaved in the calibration run sequence ... prepare
+  // to skip this run.
+  //
+  const UShort_t runtype = header->GetRunType();
+
+  if (runtype == 1)
+    {
+      *fLog << warn << "New run is a pedestal run... need intensity calibration to treat this case!" << endl;
+      fPattern = 0;
+      fIsValid = kTRUE;      
+      return kTRUE;
+    }
+
   enum { kNONE, kGREEN, kBLUE, kUV, kCT1 };
   
@@ -192 +206 @@
     case 22246:
     case 22253:
+    case 25792:
+    case 35415:
+      //    case 31756:
       color = kBLUE;
       break;
@@ -387 +404 @@
 
   if (fIsValid)
-    fHeader->SetCalibrationPattern(fPattern);
+    {
+      if (fPattern == 0)
+        {
+          *fLog << err << "CONTINUE " << endl;
+          return kCONTINUE;
+        }
+      fHeader->SetCalibrationPattern(fPattern);
+    }
+  
   return kTRUE;
 }

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -155 +155 @@
 using namespace std;
 
-const Int_t   MHCalibrationChargeCam::fgChargeHiGainNbins =  550;
+const Int_t   MHCalibrationChargeCam::fgChargeHiGainNbins =  500;
 const Axis_t  MHCalibrationChargeCam::fgChargeHiGainFirst = -100.5;
-const Axis_t  MHCalibrationChargeCam::fgChargeHiGainLast  =  999.5;
-const Int_t   MHCalibrationChargeCam::fgChargeLoGainNbins =  525;
-const Axis_t  MHCalibrationChargeCam::fgChargeLoGainFirst = -150.5;
-const Axis_t  MHCalibrationChargeCam::fgChargeLoGainLast  =  899.5;
+const Axis_t  MHCalibrationChargeCam::fgChargeHiGainLast  =  1899.5;
+const Int_t   MHCalibrationChargeCam::fgChargeLoGainNbins =  620;
+const Axis_t  MHCalibrationChargeCam::fgChargeLoGainFirst = -350.5;
+const Axis_t  MHCalibrationChargeCam::fgChargeLoGainLast  =  2049.5;
 const TString MHCalibrationChargeCam::gsHistName          = "Charge";
 const TString MHCalibrationChargeCam::gsHistTitle         = "Signals";
@@ -1082 +1082 @@
                     MBadPixelsPix::kLoGainOscillating);
 
+
   return kTRUE;
 }
@@ -1109 +1110 @@
     {
       *fLog << warn
-            << Form("%s%3.1f%s%2.1f%s%s","Mean ArrivalTime=",mean," < ",fTimeLowerLimit,
-                    " slices from lower edge in pixel ",hist.GetName()) << endl;
+            << Form("%s%3.1f%s%2.1f%s%2.0f%s%s","Mean ArrivalTime: ",mean," < ",fTimeLowerLimit,
+                    " slices from lower edge: ",lowerlimit," in pixel ",hist.GetName()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInFirstBin );
     }
@@ -1117 +1118 @@
     {
       *fLog << warn
-            << Form("%s%3.1f%s%2.1f%s%s","Mean ArrivalTime=",mean," > ",fTimeUpperLimit,
-                    " slices from upper edge in pixel ",hist.GetName()) << endl;
+            << Form("%s%3.1f%s%2.1f%s%2.0f%s%s","Mean ArrivalTime: ",mean," > ",fTimeUpperLimit,
+                    " slices from upper edge: ",upperlimit," in pixel ",hist.GetName()) << endl;
       bad.SetUncalibrated( MBadPixelsPix::kMeanTimeInLast2Bins );
     }