Changeset 8497 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

05/11/07 14:35:35 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedestalCam.cc (modified) (3 diffs)
• MPedestalPix.cc (modified) (1 diff)

trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc

@@ -548 +548 @@
     const Float_t ped = (*this)[idx].GetPedestal();
     const Float_t rms = (*this)[idx].GetPedestalRms();
+    const UInt_t  num = (*this)[idx].GetNumEvents()*fNumSlices;
 
     switch (type)
@@ -555 +556 @@
         break;
     case 1:
-        val = fNumSlices>0 ?
-            rms/TMath::Sqrt((Float_t)fNumSlices*(*this)[idx].GetNumEvents())
+        val = fNumSlices>0 ? rms/TMath::Sqrt((Float_t)num)
             : (*this)[idx].GetPedestalError();
         break;
@@ -563 +563 @@
         break;
     case 3:
-        val = fNumSlices>0 ?
-          rms/TMath::Sqrt((Float_t)fNumSlices*(*this)[idx].GetNumEvents()*2.)
-          : (*this)[idx].GetPedestalRmsError();
+        val = fNumSlices>0 ? rms/TMath::Sqrt((Float_t)num*2.)
+            : (*this)[idx].GetPedestalRmsError();
         break;
     default:

trunk/MagicSoft/Mars/mpedestal/MPedestalPix.cc

@@ -99 +99 @@
   pix.fPedestalRms      = fPedestalRms      ;
   pix.fPedestalABoffset = fPedestalABoffset ;
+  pix.fNumEvents        = fNumEvents;
 }