Changeset 4001 for trunk/MagicSoft/Mars/mpedestal

Timestamp:

05/07/04 11:13:45 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/mpedestal

Files:

• MPedCalcPedRun.cc (modified) (2 diffs)
• MPedCalcPedRun.h (modified) (2 diffs)

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.cc

@@ -549 +549 @@
       const Float_t sum  = fSumx.At(pixid);
       const Float_t sum2 = fSumx2.At(pixid);
-      
       const Float_t higainped = sum/n;
       //
@@ -563 +562 @@
       higainVar /= (Float_t)(fWindowSizeHiGain+fWindowSizeLoGain);
       // 3. Calculate the RMS from the Variance:
-      const Float_t higainrms = TMath::Sqrt(higainVar);
-
-      (*fPedestals)[pixid].Set(higainped, higainrms);
+      (*fPedestals)[pixid].Set(higainped, higainVar < 0 ? 0. : TMath::Sqrt(higainVar));
 
     }

trunk/MagicSoft/Mars/mpedestal/MPedCalcPedRun.h

@@ -6 +6 @@
 #endif
 
-#ifndef ROOT_TArrayF
-#include <TArrayF.h>
+#ifndef ROOT_TArrayD
+#include <TArrayD.h>
 #endif
 
@@ -33 +33 @@
   MBadPixelsCam *fBad;       // Bad Pixels
   
-  TArrayF fSumx;         // sum of values
-  TArrayF fSumx2;        // sum of squared values
-  TArrayF fAreaSumx;     // averaged sum of values per area idx
-  TArrayF fAreaSumx2;    // averaged sum of squared values per area idx
+  TArrayD fSumx;         // sum of values
+  TArrayD fSumx2;        // sum of squared values
+  TArrayD fAreaSumx;     // averaged sum of values per area idx
+  TArrayD fAreaSumx2;    // averaged sum of squared values per area idx
   TArrayI fAreaValid;    // number of valid pixel with area idx  
-  TArrayF fSectorSumx;   // averaged sum of values per sector 
-  TArrayF fSectorSumx2;  // averaged sum of squared values per sector
+  TArrayD fSectorSumx;   // averaged sum of values per sector 
+  TArrayD fSectorSumx2;  // averaged sum of squared values per sector
   TArrayI fSectorValid;  // number of valid pixel with sector idx