Changeset 8129 for trunk/MagicSoft/Mars

Timestamp:

10/19/06 12:49:49 (18 years ago)

Author:

tbretz

Message:

*** empty log message ***

Location:

trunk/MagicSoft/Mars

Files:

• Changelog (modified) (1 diff)
• mbase/MArrayD.h (modified) (1 diff)
• mbase/MArrayF.h (modified) (1 diff)
• msignal/MExtractTimeAndChargeDigitalFilter.cc (modified) (1 diff)

trunk/MagicSoft/Mars/Changelog

@@ -23 +23 @@
    * mpedestal/MHPedestalCam.[h,cc]:
      - removed (due to inheritance it belongs to mhcalib)
+
+   * mbase/MArrayD.h, marrayF.h:
+     - added GetSum() member function
 
 

trunk/MagicSoft/Mars/mbase/MArrayD.h

@@ -157 +157 @@
     }
 
+    Double_t GetSum() const
+    {
+        const Double_t *end = fArray+fN;
+
+        Double_t sum = 0;
+        for (Double_t *ptr = fArray; ptr<end; ptr++)
+            sum += *ptr;
+        return sum;
+    }
+
     static void  StripZeros(TArrayD &arr);
     void  StripZeros();

trunk/MagicSoft/Mars/mbase/MArrayF.h

@@ -163 +163 @@
     }
 
+    Double_t GetSum() const
+    {
+        const Float_t *end = fArray+fN;
+
+        Double_t sum = 0;
+        for (Float_t *ptr=fArray; ptr<end; ptr++)
+            sum += *ptr;
+
+        return sum;
+    }
+
     static void  StripZeros(TArrayF &arr);
     void  StripZeros();

trunk/MagicSoft/Mars/msignal/MExtractTimeAndChargeDigitalFilter.cc

@@ -184 +184 @@
   // size of 6. The exact numbers have to be found still.
   //
-  fNumHiGainSamples = (Float_t)fWindowSizeHiGain/2.4;
-  fNumLoGainSamples = (Float_t)fWindowSizeLoGain/2.4;
+  fNumHiGainSamples = fAmpWeightsHiGain.GetSum()/fBinningResolutionHiGain;
+  fNumLoGainSamples = fAmpWeightsLoGain.GetSum()/fBinningResolutionLoGain;
   fSqrtHiGainSamples = TMath::Sqrt(fNumHiGainSamples);
   fSqrtLoGainSamples = TMath::Sqrt(fNumLoGainSamples);