Changeset 2878 for trunk/MagicSoft/Mars/manalysis

Timestamp:

01/21/04 22:43:20 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MExtractSignal.cc (modified) (2 diffs)
• MPedCalcPedRun.cc (modified) (3 diffs)
• MPedCalcPedRun.h (modified) (1 diff)

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -106 +106 @@
         return kFALSE;
 
+    fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
+                                fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
+
     fPedestals = (MPedestalCam*)pList->FindObject("MPedestalCam");
     if (!fPedestals)
@@ -135 +138 @@
     //        (Have to think about the mean size of both solutions)
     fSignals->InitSize(cam->GetNumPixels());    
-
-    fSignals->SetUsedFADCSlices(fHiGainFirst, fHiGainFirst+fNumHiGainSamples-1,
-                                fLoGainFirst, fLoGainFirst+fNumLoGainSamples-1);
 
     return kTRUE;

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -179 +179 @@
         
         fSumx[idx]  += msum;
-        fSumx2[idx] += sqr;
+        //
+        // The old version:
+        //
+        //      fSumx2[idx] += msqr;
+        //
+        // The new version:
+        //
+        fSumx2[idx] += msum*msum;
     }
     
     fPedestals->SetReadyToSave();
-    fNumSamplesTot+=fNumHiGainSamples;
+    fNumSamplesTot += fNumHiGainSamples;
     
     return kTRUE;
@@ -195 +202 @@
 {
   // Compute pedestals and rms from the whole run
-  const Int_t n  = fNumSamplesTot;
-  
+  const ULong_t n     = fNumSamplesTot;
+  const ULong_t nevts = GetNumExecutions();
+
   MRawEvtPixelIter pixel(fRawEvt);
   
@@ -207 +215 @@
       
       const Float_t higainped = sum/n;
-      const Float_t higainrms = TMath::Sqrt((sum2-sum*sum/n)/(n-1.));
+      //
+      // The old version:
+      //
+      //      const Float_t higainrms = TMath::Sqrt((sum2-sum*sum/n)/(n-1.));
+      //
+      // The new version:
+      //
+      const Float_t higainrms = TMath::Sqrt((sum2-sum*sum/nevts)/(nevts-1.)/(Float_t)fNumHiGainSamples);
       
       (*fPedestals)[pixid].Set(higainped, higainrms);

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.h

@@ -23 +23 @@
     Byte_t   fNumHiGainSamples;
     UShort_t fNumPixels;
-    ULong_t   fNumSamplesTot;
+    ULong_t  fNumSamplesTot;
 
     MRawEvtData  *fRawEvt;     // raw event data (time slices)