Changeset 9157 for trunk/MagicSoft/Mars/mhcalib

Timestamp:

11/12/08 16:16:11 (16 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mhcalib

Files:

• MHCalibrationPulseTimeCam.cc (modified) (6 diffs)
• MHCalibrationPulseTimeCam.h (modified) (1 diff)
• MHGausEvents.h (modified) (1 diff)

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.cc

@@ -1 +1 @@
 /* ======================================================================== *\
-! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.42 2008-05-15 18:37:26 tbretz Exp $
+! $Name: not supported by cvs2svn $:$Id: MHCalibrationPulseTimeCam.cc,v 1.43 2008-11-12 15:55:32 tbretz Exp $
 ! --------------------------------------------------------------------------
 !
@@ -143 +143 @@
 const UInt_t  MHCalibrationPulseTimeCam::fgSaturationLimit   = 245;
 const UInt_t  MHCalibrationPulseTimeCam::fgLowerSignalLimit  =  85;
-const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired = 2;
+const Int_t   MHCalibrationPulseTimeCam::fgNumPixelsRequired =   3;
 const Int_t   MHCalibrationPulseTimeCam::fgHiGainNbins =  20;
 const Axis_t  MHCalibrationPulseTimeCam::fgHiGainFirst =  -0.5;
@@ -201 +201 @@
   fOuterRefTime = 5.;
 }
+
 // --------------------------------------------------------------------------
 //
@@ -400 +401 @@
                                       fSignalCam->GetLastUsedSliceHiGain(), max);
 
-        // check if maximum is high enough
         if (max<fLowerSignalLimit)
             continue;
@@ -420 +420 @@
     for (UInt_t j=0; j<nareas; j++)
     {
-        if (fAverageAreaNum[j] > fNumPixelsRequired)
-        {
-            sumarea[j] /= fAverageAreaNum[j];
-
-            if (IsOscillations())
-                GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]);
-            else
-                GetAverageHiGainArea(j).FillHist(sumarea[j]);
-
-        }
+        if (fAverageAreaNum[j]<fNumPixelsRequired)
+            continue;
+
+        sumarea[j] /= fAverageAreaNum[j];
+
+        if (IsOscillations())
+            GetAverageHiGainArea(j).FillHistAndArray(sumarea[j]);
+        else
+            GetAverageHiGainArea(j).FillHist(sumarea[j]);
     }
 
     for (UInt_t j=0; j<nsectors; j++)
     {
-        if (fAverageSectorNum[j] > 0)
-        {
-            sumsector[j] /= fAverageSectorNum[j];
-
-            if (IsOscillations())
-                GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]);
-            else
-                GetAverageHiGainSector(j).FillHist(sumsector[j]);
-        }
+        if (fAverageSectorNum[j]<fNumPixelsRequired)
+            continue;
+
+        sumsector[j] /= fAverageSectorNum[j];
+
+        if (IsOscillations())
+            GetAverageHiGainSector(j).FillHistAndArray(sumsector[j]);
+        else
+            GetAverageHiGainSector(j).FillHist(sumsector[j]);
     }
 
@@ -535 +534 @@
 }
 
+Double_t MHCalibrationPulseTimeCam::GetNumEvents() const
+{
+    return GetAverageAreas()>0 ? GetAverageHiGainArea(0).GetEntries() : 0;
+}
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/mhcalib/MHCalibrationPulseTimeCam.h

@@ -73 +73 @@
   void SetNumPixelsRequired( const Byte_t  lim=fgNumPixelsRequired ) { fNumPixelsRequired = lim; }
 
+  Double_t GetNumEvents() const;
+
+
   Bool_t GetPixelContent ( Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type=0) const { return kTRUE; }
   void   DrawPixelContent( Int_t num )  const;    

trunk/MagicSoft/Mars/mhcalib/MHGausEvents.h

@@ -104 +104 @@
   
   // Getters
+  const Double_t GetEntries()            const { return fHGausHist.GetEntries(); }
   const Double_t GetChiSquare()          const { return ( fFGausFit ? fFGausFit->GetChisquare() : 0.); }
   const Double_t GetExpChiSquare()       const { return ( fFExpFit  ? fFExpFit->GetChisquare()  : 0.); }