Changeset 6919 for trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

Timestamp:

04/08/05 11:55:55 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationRelTimeCam.cc

@@ -351 +351 @@
 
           MHCalibrationPix &histlo = (*this)(i);
-          histlo.FillHistAndArray(time-reftime);
+          if (IsOscillations())
+              histlo.FillHistAndArray(time-reftime);
+          else
+              histlo.FillHist(time-reftime);
 
           fSumarealo  [aidx]   += time;
@@ -362 +365 @@
           const Float_t time = pix.GetArrivalTimeHiGain();
 
-          histhi.FillHistAndArray(time-reftime) ;
+          if (IsOscillations())
+              histhi.FillHistAndArray(time-reftime);
+          else
+              histhi.FillHist(time-reftime);
+
           fSumareahi  [aidx]   += time;
           fNumareahi  [aidx]   ++;
@@ -373 +380 @@
     {
       MHCalibrationPix &histhi = GetAverageHiGainArea(j);
-      histhi.FillHistAndArray(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
+      if (IsOscillations())
+          histhi.FillHistAndArray(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
+      else
+          histhi.FillHist(fNumareahi[j] == 0 ? 0. : fSumareahi[j]/fNumareahi[j]);
 
       if (IsLoGain())
         {
           MHCalibrationPix &histlo = GetAverageLoGainArea(j);
-          histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+          if (IsOscillations())
+              histlo.FillHistAndArray(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
+          else
+              histlo.FillHist(fNumarealo[j] == 0 ? 0. : fSumarealo[j]/fNumarealo[j]);
         }
     }
@@ -385 +398 @@
     {
       MHCalibrationPix &histhi = GetAverageHiGainSector(j);
-      histhi.FillHistAndArray(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
+      if (IsOscillations())
+          histhi.FillHistAndArray(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
+      else
+          histhi.FillHist(fNumsectorhi[j] == 0 ? 0. : fSumsectorhi[j]/fNumsectorhi[j]);
 
       if (IsLoGain())
         {
           MHCalibrationPix &histlo = GetAverageLoGainSector(j);
-          histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+          if (IsOscillations())
+              histlo.FillHistAndArray(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
+          else
+              histlo.FillHist(fNumsectorlo[j] == 0 ? 0. : fSumsectorlo[j]/fNumsectorlo[j]);
         }
     }