Changeset 7013 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

05/11/05 19:06:48 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationChargeCam.cc (modified) (3 diffs)
• MHCalibrationHiLoCam.cc (modified) (5 diffs)
• MHCalibrationPix.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -171 +171 @@
 const TString MHCalibrationChargeCam::gsAbsHistXTitle     = "Time [FADC slices]";
 const TString MHCalibrationChargeCam::gsAbsHistYTitle     = "Nr. events";
-const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.05;
+const Float_t MHCalibrationChargeCam::fgNumHiGainSaturationLimit = 0.085;
 const Float_t MHCalibrationChargeCam::fgNumLoGainSaturationLimit = 0.005;
 const Float_t MHCalibrationChargeCam::fgTimeLowerLimit           = 1.;
 const Float_t MHCalibrationChargeCam::fgTimeUpperLimit           = 3.;
 const TString MHCalibrationChargeCam::fgReferenceFile = "mjobs/calibrationref.rc";
+
 // --------------------------------------------------------------------------
 //
@@ -883 +884 @@
       MCalibrationChargePix  &pix = (MCalibrationChargePix&)(*chargecam)[i] ;
 
-      if (histhi.GetSaturated() > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
+      const Int_t numsat = histhi.GetSaturated();
+
+      pix.SetNumSaturated(numsat);
+
+      if (numsat > fNumHiGainSaturationLimit*histhi.GetHGausHist()->GetEntries())
         {
           pix.SetHiGainSaturation();
@@ -1418 +1423 @@
     }
 
+  if (IsEnvDefined(env, prefix, "NumHiGainSaturationLimit", print))
+  {
+      SetNumHiGainSaturationLimit(GetEnvValue(env, prefix, "NumHiGainSaturationLimit", fNumHiGainSaturationLimit));
+      rc = kTRUE;
+  }
+
+  if (IsEnvDefined(env, prefix, "NumLoGainSaturationLimit", print))
+  {
+      SetNumLoGainSaturationLimit(GetEnvValue(env, prefix, "NumLoGainSaturationLimit", fNumLoGainSaturationLimit));
+      rc = kTRUE;
+  }
+
   TEnv refenv(fReferenceFile);
 

trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

@@ -342 +342 @@
       MHCalibrationPix &histhi = (*this)[i];
 
-      histhi.FillHistAndArray(ratio);
+      histhi.FillHist(ratio);
       fSumareahi  [aidx]   += ratio;
       fNumareahi  [aidx]   ++;
@@ -355 +355 @@
           const Float_t diff = tix.GetArrivalTimeLoGain() - tix.GetArrivalTimeHiGain();
 
-          histlo.FillHistAndArray(diff);
+          histlo.FillHist(diff);
           fSumarealo  [aidx]   += diff;
           fNumarealo  [aidx]   ++;
@@ -362 +362 @@
         }
     }
+
+  if (!IsAverageing())
+      return kTRUE;
   
   for (Int_t j=0; j<nareas; j++)
@@ -420 +423 @@
     }
 
-  for (Int_t j=0; j<nareas; j++)
-    {
-      
-      MHCalibrationPix    &hist = GetAverageHiGainArea(j);      
-      //
-      // Check histogram overflow
-      // 
-      CheckOverflow(hist);
-   }
-  
-  for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
-    {
-      
-      MHCalibrationPix &hist = GetAverageHiGainSector(j);      
-      //
-      // Check histogram overflow
-      // 
-      CheckOverflow(hist);
-    }
+  //
+  // Check histogram overflow
+  //
+  if (IsAverageing())
+  {
+      for (Int_t j=0; j<nareas; j++)
+          GetAverageHiGainArea(j).CheckOverflow(hist);
+
+      for (Int_t j=0; j<fAverageHiGainSectors->GetSize(); j++)
+          GetAverageHiGainSector(j).CheckOverflow(hist);
+  }
+
 
   FitHiGainArrays(*hilocam,*badcam,
@@ -458 +454 @@
     }
 
-  for (Int_t j=0; j<nareas; j++)
-    {
-      
-      MHCalibrationPix    &hist = GetAverageLoGainArea(j);      
-      CheckOverflow(hist);
-   }
-  
-  for (Int_t j=0; j<nsectors; j++)
-    {
-      
-      MHCalibrationPix &hist = GetAverageLoGainSector(j);      
-      CheckOverflow(hist);
-    }
+  if (IsAverageing())
+  {
+      for (Int_t j=0; j<nareas; j++)
+          GetAverageLoGainArea(j).CheckOverflow(hist);
+
+      for (Int_t j=0; j<nsectors; j++)
+          GetAverageLoGainSector(j).CheckOverflow(hist);
+  }
 
   FitLoGainArrays(*hilocam,*badcam,

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPix.h

@@ -27 +27 @@
   
   // Getters
-  const Double_t GetBlackout       () const;  
-  const Double_t GetPickup         () const;
-  const Float_t  GetSaturated      () const { return fSaturated;      }
+  const Double_t GetBlackout() const;
+  const Double_t GetPickup() const;
+  const Int_t    GetSaturated() const { return fSaturated;      }
 
   // Fits