Changeset 8552 for trunk

Timestamp:

06/12/07 21:50:30 (17 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationChargeCam.cc (modified) (4 diffs)
• MHCalibrationPulseTimeCam.cc (modified) (7 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.59 2007-05-16 13:56:17 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.60 2007-06-12 20:50:30 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -303 +303 @@
 
   for (int i=0; i<navhi; i++)
-    cam->fAverageHiGainAreas->AddAt(GetAverageHiGainArea(i).Clone(),i);
+      cam->fAverageHiGainAreas->AddAt(GetAverageHiGainArea(i).Clone(),i);
 
   if (IsLoGain())
@@ -1212 +1212 @@
   //  
   for (Int_t i=0; i<nareas;i++) 
-     {
-       
+  {
        pad->cd(i+1);
-       
+
        MHCalibrationChargePix &hipix = (MHCalibrationChargePix&)GetAverageHiGainArea(i);
+
        //
        // Ask for Hi-Gain saturation
        //
        if (hipix.GetSaturated() > fNumHiGainSaturationLimit*hipix.GetHGausHist()->GetEntries() && IsLoGain())
-         {
+       {
+           if (i>=fAverageLoGainAreas->GetSize())
+               continue;
+
            MHCalibrationChargePix &lopix = (MHCalibrationChargePix&)GetAverageLoGainArea(i);
            DrawDataCheckPixel(lopix,i ? fOuterRefCharge : fInnerRefCharge);
-         }
+       }
        else
-         DrawDataCheckPixel(hipix,i ? fOuterRefCharge : fInnerRefCharge);
-
-    }      
+           DrawDataCheckPixel(hipix,i ? fOuterRefCharge : fInnerRefCharge);
+  }
 }
 
@@ -1326 +1328 @@
         xaxe2->SetRangeUser(0, pix.GetEvents()->GetSize()/pix.GetEventFrequency());
     }
-
     pix.DrawEvents();
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.39 2007-05-16 13:56:17 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.40 2007-06-12 20:49:55 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -101 +101 @@
 // sigmas in the camera.
 //
+//
+// ClassVersion 2:
+// ---------------
+//   - Byte_t fSaturationLimit
+//   - Byte_t fLowerSignalLimit
+//   + UInt_t fSaturationLimit
+//   + UInt_t fLowerSignalLimit
+//
 /////////////////////////////////////////////////////////////////////////////
 #include "MHCalibrationPulseTimeCam.h"
@@ -133 +141 @@
 using namespace std;
 
-const Byte_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 245;
-const Byte_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  =  85;
+const UInt_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 245;
+const UInt_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  =  85;
 const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired = 2;
 const Int_t   MHCalibrationPulseTimeCam::fgHiGainNbins =  20;
@@ -172 +180 @@
   fName  = name  ? name  : "MHCalibrationPulseTimeCam";
   fTitle = title ? title : "Class to fill the extracted pulse times for cosmics ";
-  
+
   SetBinning(fgHiGainNbins, fgHiGainFirst, fgHiGainLast);
 
@@ -389 +397 @@
             continue;
 
-        // Get position of maximum
+        // Get position of maximum (FIXME: Extraction range?)
         Float_t max;
-        const Int_t pos = evt->GetMax(idx, max);
+        const Int_t pos = evt->GetMaxPos(idx, max);
 
         // check if maximum is high enough
@@ -634 +642 @@
   if (IsEnvDefined(env, prefix, "SaturationLimit", print))
     {
-      SetSaturationLimit(GetEnvValue(env, prefix, "SaturationLimit", fSaturationLimit));
+      SetSaturationLimit(GetEnvValue(env, prefix, "SaturationLimit", (Int_t)fSaturationLimit));
       rc = kTRUE;
     }
@@ -640 +648 @@
   if (IsEnvDefined(env, prefix, "LowerSignalLimit", print))
     {
-      SetLowerSignalLimit(GetEnvValue(env,prefix,"LowerSignalLimit",fLowerSignalLimit));
+      SetLowerSignalLimit(GetEnvValue(env, prefix, "LowerSignalLimit", (Int_t)fLowerSignalLimit));
       rc = kTRUE;
     }