Changeset 2942

Timestamp:

01/28/04 13:43:54 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• manalysis/MCerPhotAnal.cc (modified) (1 diff)
• manalysis/MCerPhotCalc.cc (modified) (1 diff)
• manalysis/MPedestalCam.cc (modified) (1 diff)
• manalysis/MPedestalCam.h (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -21 +21 @@
    * mcalib/MHCalibrationPixel.h:
      - removed obsolete include of MFFT 
+
+   * manalysis/MCerPhotAnal.cc, manalysis/MCerPhotCalc.cc,
+     manalysis/MPedestalCam.[h,cc]:
+     - removed use of obsolete MPedestalCam::CheckBounds. This was
+       a workaround for a 'bug' in very old camera files, which is not
+       necessary anymore.
 
 

trunk/MagicSoft/Mars/manalysis/MCerPhotAnal.cc

@@ -191 +191 @@
         const UInt_t pixid = pixel.GetPixelId();
 
-        //
-        // sanity check (old MC files sometimes have pixids>577)
-        //
-        if (fPedestals && !fPedestals->CheckBounds(pixid))
-        {
-            *fLog << inf << "Pixel ID larger than camera... skipping event." << endl;
-            return kCONTINUE;
-        }
-
         fCerPhotEvt->AddPixel(pixid, nphot, sigmaped/2.236);
 

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -216 +216 @@
     {
         const UInt_t idx = pixel.GetPixelId();
-        //
-        // sanity check (old MC files sometimes have pixids>577)
-        //
-        if (!fPedestals->CheckBounds(idx))
-        {
-            *fLog << inf << "Pixel Index out of MPedestalCam bounds... skipping event." << endl;
-            return kCONTINUE;
-        }
 
         MPedestalPix &ped = (*fPedestals)[idx];

trunk/MagicSoft/Mars/manalysis/MPedestalCam.cc

@@ -74 +74 @@
     fArray->ExpandCreate(i);
 }
-
-// --------------------------------------------------------------------------
-//
-// Check if position i is inside bounds
-//
-Bool_t MPedestalCam::CheckBounds(Int_t i) const
-{
-  return i < GetSize();
-} 
 
 // --------------------------------------------------------------------------

trunk/MagicSoft/Mars/manalysis/MPedestalCam.h

@@ -31 +31 @@
     Float_t GetPedestalMax(const MGeomCam *cam) const;
 
-    Bool_t CheckBounds(Int_t i) const;
-
     void Print(Option_t *o="") const;