Changeset 2646 for trunk/MagicSoft/Mars

Timestamp:

12/11/03 14:36:04 (21 years ago)

Author:

gaug

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars/manalysis

Files:

• MExtractSignal.cc (modified) (3 diffs)
• MPedCalcPedRun.cc (modified) (2 diffs)

trunk/MagicSoft/Mars/manalysis/MExtractSignal.cc

@@ -57 +57 @@
 //
 MExtractSignal::MExtractSignal(const char *name, const char *title)
-  : fBefore(2), fAfter(4), fSaturationLimit(254), fConversionHiLo(10.)
+  : fNumHiGainSamples(0), fNumLoGainSamples(0),
+    fSqrtHiGainSamples(0), fSqrtLoGainSamples(0),
+    fBefore(2), fAfter(4), 
+    fSaturationLimit(254), fConversionHiLo(10.)
 {
 
@@ -174 +177 @@
         const Float_t pedes   = ped.GetPedestal();
         const Float_t pedrms  = ped.GetPedestalRms();
+
 
         if (max-3 < ptr)
@@ -245 +249 @@
       } /* while (pixel.Next()) */
 
-
     fSignals->SetNumUsedFADCSlices(fNumHiGainSamples,fNumLoGainSamples);
     fSignals->SetReadyToSave();

trunk/MagicSoft/Mars/manalysis/MPedCalcPedRun.cc

@@ -208 +208 @@
 Float_t MPedCalcPedRun::CalcHiGainRms(Byte_t *ptr, const Byte_t *end, Float_t higainped) const
 {
+    Float_t val=0;
+    Float_t val2=0;
     Float_t rms = 0;
     Byte_t EvenNumSamples=(fNumHiGainSamples/2*2==fNumHiGainSamples) ? fNumHiGainSamples:fNumHiGainSamples-1;
@@ -218 +220 @@
     } while (++ptr != end);
 
-    return sqrt(rms/EvenNumSamples);
+    return sqrt(rms/(EvenNumSamples-1));
 }