Changeset 17765 for trunk/Mars

Timestamp:

05/02/14 16:19:33 (11 years ago)

Author:

tbretz

Message:

If one function takes a pointer the other one should as well, offsets and sizes can by definition not be negtaive, so do not allow negative values -- the compiler warning could have told you already; simplified the logic.

File:

• trunk/Mars/mbase/MArrayF.h (modified) (1 diff)

trunk/Mars/mbase/MArrayF.h

@@ -170 +170 @@
 
     template<class T>
-    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;
-        }
+        void Add(const T *src, UInt_t n, UInt_t beg=0, Float_t scale=1)
+    {
+        if (!src || beg >= fN)
+            return;
+
+        Float_t *ptr = fArray+beg;
+        const Float_t *end  = beg+n>fN ? fArray+fN : ptr+n;
 
         // 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++;
+        if (scale==1)
+        {
+            while (ptr<end)
+                *ptr++ += *src++;
         }
         else
         {
-            while (dest<end)
-                *dest++ += (*src++) * m;
+            while (ptr<end)
+                *ptr++ += (*src++) * m;
         }
     }
 
     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);
+        void AddClipped(Double_t th, const T *src, UInt_t n, UInt_t beg=0)
+    {
+        if (!src || beg>=fN)
+            return;
+
+        Float_t *ptr = fArray + beg;
+        const Float_t *end  = beg+n>fN ? fArray+fN : ptr+n;
+
+        while (ptr<end)
+            *ptr++ += TMath::Min(*src++, th);
     }