Changeset 17682 for trunk/Mars/mbase

Timestamp:

04/23/14 13:53:35 (11 years ago)

Author:

ftemme

Message:

Added the clipping of the trigger signal

File:

• trunk/Mars/mbase/MArrayF.h (modified) (2 diffs)

trunk/Mars/mbase/MArrayF.h

@@ -170 +170 @@
 
     template<class T>
-        void Add(T *src, Int_t n, Int_t p=0)
+    void Add(T *src, Int_t n, Int_t p=0, Float_t m=1.)
+    {
+        // under these 3 conditions, we return immediately, because they either make no sense,
+        // or result in an invariant array.
+        if (p >= fN)
+        {
+            // maybe throw a warning, because p >= fN makes no sense at all
+            return;
+        }
+        if ( n <= 0)
+        {
+            return;
+        }
+        if (m == 0.)
+        {
+            return;
+        }
+        if (src == NULL)
+        {
+            return;
+        }
+
+        Float_t *dest = fArray + p;
+        Float_t *end  = dest;
+        if (n < fN-p)
+        {
+            end += n;
+        }
+        else
+        {
+            end += fN-p;
+        }
+
+        // we treat the case m==1. special, in order to speed up the code a bit
+        // since when m==1. the multiplication can be omitted and this should be a bit faster then.
+        if (m == 1.)
+        {
+            while (dest<end)
+                *dest++ += *src++;
+        }
+        else
+        {
+            while (dest<end)
+                *dest++ += (*src++) * m;
+        }
+    }
+
+    template<class T>
+        void AddClipped(Double_t th, T src, Int_t n, Int_t p=0)
     {
         Float_t *dest = fArray + p;
@@ -176 +224 @@
 
         while (dest<end)
-            *dest++ += *src++;
-    }
-
-    template<class T>
-        void AddClipped(Double_t th, T src, Int_t n, Int_t p=0)
-    {
-        Float_t *dest = fArray + p;
-        Float_t *end  = dest   + n;
-
-        while (dest<end)
             *dest++ += TMath::Min(*src++, th);
     }