Changeset 8446 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

04/25/07 15:39:43 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

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

trunk/MagicSoft/Mars/mhcalib/MHCalibrationChargeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.56 2007-04-18 15:33:56 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationChargeCam.cc,v 1.57 2007-04-25 14:39:43 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -1274 +1274 @@
     xaxe->SetTitle(hist->GetXaxis()->GetTitle());
     yaxe->SetTitle(hist->GetYaxis()->GetTitle());
-    xaxe->SetRange(hist->GetMaximumBin()-30, hist->GetMaximumBin()+30);
+    xaxe->SetRange(hist->GetMaximumBin()-50, hist->GetMaximumBin()+50);
 
     gStyle->SetOptFit();

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.37 2007-04-23 19:06:28 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.38 2007-04-25 14:39:43 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -390 +390 @@
 
         // Get position of maximum
-        const Int_t   pos = evt->GetMax(idx/*, first, last*/);
+        const Int_t   pos = evt->GetMax(idx);
         const Float_t max = evt->GetSamples(idx)[pos];
 
@@ -413 +413 @@
     for (UInt_t j=0; j<nareas; j++)
     {
-        const Int_t npix = fAverageAreaNum[j];
-
-        if (npix > fNumPixelsRequired)
+        if (fAverageAreaNum[j] > fNumPixelsRequired)
         {
+            sumarea[j] /= fAverageAreaNum[j];
+
             if (IsOscillations())
-                GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]/npix);
+                GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]);
             else
-                GetAverageHiGainArea(j).FillHist(sumarea[j]/npix);
+                GetAverageHiGainArea(j).FillHist(sumarea[j]);
 
         }
@@ -427 +427 @@
     for (UInt_t j=0; j<nsectors; j++)
     {
-        const Int_t npix = fAverageSectorNum[j];
-
-        if (npix > 0)
+        if (fAverageSectorNum[j] > 0)
         {
+            sumsector[j] /= fAverageSectorNum[j];
+
             if (IsOscillations())
-                GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]/npix);
+                GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]);
             else
-                GetAverageHiGainSector(j).FillHist(sumsector[j]/npix);
+                GetAverageHiGainSector(j).FillHist(sumsector[j]);
         }
     }