Changeset 12069 for trunk/Mars

Timestamp:

09/11/11 21:37:36 (13 years ago)

Author:

tbretz

Message:

Another improvement to the GetPixelMax loop; added more sanity checks

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (1 diff)

trunk/Mars/mcore/DrsCalib.h

@@ -378 +378 @@
     }
 
-    static void GetPixelMax(float *ptr, const float *data, uint16_t roi, int32_t first, int32_t last)
-    {
-        if (roi==0 || first>=roi || last>=roi || last<first)
+    static void GetPixelMax(float *max, const float *data, uint16_t roi, int32_t first, int32_t last)
+    {
+        if (roi==0 || first<0 || last<0 || first>=roi || last>=roi || last<first)
             return;
 
         for (int i=0; i<1440; i++)
         {
-            const float *vec = data+i*roi;
-
-            float &max = ptr[i];
-
-            max = vec[first];
-            for (int j=first+1; j<=last; j++)
-                if (vec[j]>max)
-                    max = vec[j];
-        }
+            const float *beg = data+i*roi+first;
+            const float *end = data+i*roi+last;
+
+            const float *pmax = beg;
+
+            for (const float *ptr=beg+1; ptr<=end; ptr++)
+                if (*ptr>*pmax)
+                    pmax = ptr;
+
+            max[i] = *pmax;
+        }
+
     }