Changeset 4777 for trunk/MagicSoft/Mars

Timestamp:

08/27/04 20:14:56 (20 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (2 diffs)
• mpedestal/MPedestalCam.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -22 +22 @@
 
  2004/08/27: Hendrik Bartko
+
   * msignal/MExtractTime.cc
     - check that the pixel has a low gain before calculating the time 
@@ -29 +30 @@
 
    * mcalib/MCalibrationChargeCalc.cc
+   * mcalib/MCalibrationChargePix.[h,cc]
      - change treatment of pixels with kSigmaNotValid
+
+   * mpedestal/MPedestalCam.cc
+     - fixed a small bug in the calculation of the PedestalRms Error 
+       in GetPixelContent()
 
    * macros/bootcampstandardanalysis.C 

trunk/MagicSoft/Mars/mpedestal/MPedestalCam.cc

@@ -384 +384 @@
         return kFALSE;
 
+    const Float_t ped      = (*this)[idx].GetPedestal();
+    const Float_t rms      = (*this)[idx].GetPedestalRms();
+
     switch (type)
     {
     case 0:
-        val = (*this)[idx].GetPedestal();
+        val = ped;
         break;
     case 1:
         val = fTotalEntries > 0 ?
-            (*this)[idx].GetPedestalRms()/TMath::Sqrt((Float_t)fTotalEntries)
-            : (*this)[idx].GetPedestalError();
+            rms/TMath::Sqrt((Float_t)fTotalEntries)
+          : (*this)[idx].GetPedestalError();
         break;
     case 2:
-        val = (*this)[idx].GetPedestalRms();
+        val = rms;
         break;
     case 3:
         val = fTotalEntries > 0 ?
-            (*this)[idx].GetPedestalRms()/TMath::Sqrt((Float_t)fTotalEntries)/2.
-            : (*this)[idx].GetPedestalRmsError();
+          rms/TMath::Sqrt((Float_t)fTotalEntries*2.)
+          : (*this)[idx].GetPedestalRmsError();
         break;
     default: