Changeset 7013 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc

Timestamp:

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

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationHiLoCam.cc (modified) (5 diffs)

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,