Changeset 1180 for trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

Timestamp:

01/15/02 11:48:08 (23 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MCerPhotCalc.cc

@@ -124 +124 @@
     while (pixel.Next())
     {
-
-        UInt_t pixid = pixel.GetPixelId();
+        const UInt_t pixid = pixel.GetPixelId();
 
         const MPedestalPix &ped = (*fPedestals)[pixid];
 
         //
-        // sanity check
+        // sanity check (old MC files sometimes have pixids>577)
         //
-        if (!fPedestals->CheckBounds(pixid)){
-            *fLog<<inf<<"Pixel ID larger than camera ... Skip the event"<<endl;
+        if (!fPedestals->CheckBounds(pixid))
+        {
+            *fLog << inf << "Pixel ID larger than camera... skipping event." << endl;
             return kCONTINUE;
         }
@@ -139 +139 @@
         Float_t nphot = (Float_t)pixel.GetSumHiGainSamples();
 
+        //
         // We check that the pixel is not empty, if it is empty
         // we won't substract the pedestal. Empty means that it has
         // 0 signal in all the slices.
-
-        if(nphot!=0) nphot -= fRunHeader->GetNumSamplesHiGain()*ped.GetMean();
+        //
+        if (nphot!=0)
+            nphot -= fRunHeader->GetNumSamplesHiGain()*ped.GetMean();
 
         fCerPhotEvt->AddPixel(pixid, nphot, sqrt(fRunHeader->GetNumSamplesHiGain())*ped.GetSigma());