Changeset 4752 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

08/27/04 11:36:24 (20 years ago)

Author:

tbretz

Message:

*** empty log message ***

File:

• trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc (modified) (4 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedPhotCam.cc

@@ -39 +39 @@
 #include "MPedPhotCam.h"
 
-#include <TArrayI.h>
-#include <TArrayD.h>
 #include <TClonesArray.h>
+
+#include "MArrayI.h"
+#include "MArrayD.h"
 
 #include "MLog.h"
@@ -233 +234 @@
     const Int_t na = GetNumAreas();
 
-    TArrayI acnt(na);
-    TArrayI scnt(ns);
-    TArrayD asumx(na);
-    TArrayD ssumx(ns);
-    TArrayD asumr(na);
-    TArrayD ssumr(ns);
+    // Using MArray instead of TArray because they don't do range checks
+    MArrayI acnt(na);
+    MArrayI scnt(ns);
+    MArrayD asumx(na);
+    MArrayD ssumx(ns);
+    MArrayD asumr(na);
+    MArrayD ssumr(ns);
 
     for (int i=0; i<np; i++)
@@ -246 +248 @@
 
         // Create sums for areas and sectors
+        const MPedPhotPix &pix = (*this)[i];
+
+        const UInt_t  ne   = pix.GetNumEvents();
+        const Float_t mean = ne*pix.GetMean();
+        const Float_t rms  = ne*pix.GetRms();
+
         const UInt_t aidx = geom[i].GetAidx();
+        asumx[aidx] += mean;
+        asumr[aidx] += rms;
+        acnt[aidx]  += ne;
+
         const UInt_t sect = geom[i].GetSector();
-
-        const MPedPhotPix &pix = (*this)[i];
-
-        const UInt_t  ne   = pix.GetNumEvents();
-        const Float_t mean = pix.GetMean();
-        const Float_t rms  = pix.GetRms();
-
-        asumx[aidx] += ne*mean;
-        asumr[aidx] += ne*rms;
-        acnt[aidx]  += ne;
-
-        ssumx[sect] += ne*mean;
-        ssumr[sect] += ne*rms;
+        ssumx[sect] += mean;
+        ssumr[sect] += rms;
         scnt[sect]  += ne;
     }
@@ -306 +307 @@
 Bool_t MPedPhotCam::GetPixelContent(Double_t &val, Int_t idx, const MGeomCam &cam, Int_t type) const
 {
-
-    const Float_t ped      = (*this)[idx].GetMean();
-    const Float_t rms      = (*this)[idx].GetRms();
-    const UInt_t  nevt     = (*this)[idx].GetNumEvents();
-
-
-    Float_t pederr;
-    Float_t rmserr; 
-
-    if (nevt>0)
-    {
-        pederr = rms/TMath::Sqrt((Float_t)nevt);
-        rmserr = rms/TMath::Sqrt((Float_t)nevt)/2.;
-    }
-    else
-    {
-        pederr = -1;
-        rmserr = -1;
-    }
-
     switch (type)
     {
     case 0:
-        val = ped;// (*this)[idx].GetMean();
+        val = (*this)[idx].GetMean();
         break;
     case 1:
-        val = rms; // (*this)[idx].GetRms();
+        val = (*this)[idx].GetRms();
         break;
     case 2:
-        val = pederr; // new
+        val = (*this)[idx].GetNumEvents()>0 ? (*this)[idx].GetRms()/TMath::Sqrt((Float_t)(*this)[idx].GetNumEvents()) : -1;
         break;
     case 3:
-      val = rmserr; // new
+        val = (*this)[idx].GetNumEvents()>0 ? (*this)[idx].GetRms()/TMath::Sqrt((Float_t)(*this)[idx].GetNumEvents())/2. : -1;
         break;
     default: