Changeset 13940 for trunk/Mars

Timestamp:

05/27/12 16:39:51 (12 years ago)

Author:

tbretz

Message:

Return the maximum found in GetPixelStats

File:

• trunk/Mars/mcore/DrsCalib.h (modified) (3 diffs)

trunk/Mars/mcore/DrsCalib.h

@@ -343 +343 @@
     }
 
-    static void GetPixelStats(float *ptr, const float *data, uint16_t roi)
+    static double GetPixelStats(float *ptr, const float *data, uint16_t roi)
     {
         if (roi==0)
-            return;
-
+            return -1;
+
+        const int beg = roi>10 ? 10 : 0;
+
+        double max = 0;
         for (int i=0; i<1440; i++)
         {
             const float *vec = data+i*roi;
 
-            int    pos  = 0;
-            double sum  = vec[0];
-            double sum2 = vec[0]*vec[0];
-            for (int j=1; j<roi; j++)
+            int    pos  = beg;
+            double sum  = vec[beg];
+            double sum2 = vec[beg]*vec[beg];
+            for (int j=beg; j<roi; j++)
             {
                 sum  += vec[j];
@@ -363 +366 @@
                     pos = j;
             }
-            sum  /= roi;
-            sum2 /= roi;
+            sum  /= roi-beg;
+            sum2 /= roi-beg;
+
+            if (vec[pos]>0)
+                max = vec[pos];
 
             *(ptr+0*1440+i) = sum;
@@ -371 +377 @@
             *(ptr+3*1440+i) = pos;
         }
+
+        return max;
     }