Changeset 3374 for trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc

Timestamp:

03/01/04 17:18:18 (21 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/manalysis/MPedPhotCalc.cc

@@ -109 +109 @@
   const MRawRunHeader *runheader = (MRawRunHeader*)pList->FindObject("MRawRunHeader");
   if (!runheader)
-    {
+  {
       *fLog << warn << dbginf;
       *fLog << "Warning - cannot check file type, MRawRunHeader not found." << endl;
-    }
+  }
   else
-    if (runheader->GetRunType() == kRTMonteCarlo)
-      return kTRUE;
+      if (runheader->IsMonteCarloRun())
+          return kTRUE;
   
 
   // Initialize arrays
   if(fSumx.GetSize()==0)
-    {
-        const UShort_t num = fPedestals->GetSize();
+  {
+      const UShort_t num = fPedestals->GetSize();
 
-        fSumx.Set(num);
-        fSumx2.Set(num);
+      fSumx.Set(num);
+      fSumx2.Set(num);
 
-        memset(fSumx.GetArray(),  0, sizeof(Float_t)*num);
-        memset(fSumx2.GetArray(), 0, sizeof(Float_t)*num);
-    }
+      memset(fSumx.GetArray(),  0, sizeof(Float_t)*num);
+      memset(fSumx2.GetArray(), 0, sizeof(Float_t)*num);
+  }
 
-    return kTRUE;
+  return kTRUE;
 }
 
@@ -140 +140 @@
 Int_t MPedPhotCalc::Process()
 {
-  for(UInt_t i=0;i<fCerPhot->GetNumPixels();i++)
+    for(UInt_t i=0;i<fCerPhot->GetNumPixels();i++)
     {
-      const MCerPhotPix &pix = (*fCerPhot)[i];
+        const MCerPhotPix &pix = (*fCerPhot)[i];
 
-      const Float_t nphot = pix.GetNumPhotons();
-      const Int_t idx     = pix.GetPixId();
-      
-      fSumx[idx]  += nphot;
-      fSumx2[idx] += nphot*nphot;
+        const Float_t nphot = pix.GetNumPhotons();
+        const Int_t idx     = pix.GetPixId();
+
+        fSumx[idx]  += nphot;
+        fSumx2[idx] += nphot*nphot;
     }
-  
-  fPedestals->SetReadyToSave();
-  
-  return kTRUE;
+
+    fPedestals->SetReadyToSave();
+
+    return kTRUE;
 }
 
@@ -161 +161 @@
 //
 Int_t MPedPhotCalc::PostProcess()
-  {
+{
     // Compute pedestals and rms from fSumx and fSumx2 arrays
     const Int_t n    = GetNumExecutions();
@@ -167 +167 @@
 
     for(Int_t i=0; i<npix; i++)
-      {
+    {
         const Float_t sum  = fSumx[i];
         const Float_t sum2 = fSumx2[i];
-        
+
         const Float_t photped = sum/n;
         const Float_t photrms = TMath::Sqrt((sum2-sum*sum/n)/(n-1.));
 
-        (*fPedestals)[i].Set(photped,photrms);  
-      }
-    
+        (*fPedestals)[i].Set(photped,photrms);
+    }
+
     return kTRUE;
 }