Changeset 11831 for trunk/Mars/mcore

Timestamp:

08/07/11 16:42:21 (13 years ago)

Author:

tbretz

Message:

Changed the Apply function to avoid too high numbers; little improvements to GetPixelStats

File:

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

trunk/Mars/mcore/DrsCalib.h

@@ -204 +204 @@
     static void Apply(float *vec, const int16_t *val, const int16_t *start, uint32_t roi,
                       const int32_t *offset, const uint32_t scaleabs,
-                      const int64_t *gain,   const uint64_t scalegain,
-                      const int64_t *trgoff, const uint64_t scalerel)
-    {
+                      const int64_t *gain,   /*const*/ uint64_t scalegain,
+                      const int64_t *trgoff, /*const*/ uint64_t scalerel)
+    {
+
+        /*
+        scalegain *= scaleabs;
+        scalerel  *= scaleabs;
+
         for (size_t ch=0; ch<1440; ch++)
         {
             const size_t pos = ch*roi;
-
             const int16_t spos = start[ch];
             if (spos<0)
@@ -236 +240 @@
                 vec[rel] = double(v)*scalegain/div;
             }
+        }*/
+
+        for (size_t ch=0; ch<1440; ch++)
+        {
+            const size_t pos = ch*roi;
+
+            const int16_t spos = start[ch];
+            if (spos<0)
+            {
+                memset(vec+pos, 0, roi);
+                continue;
+            }
+
+            for (size_t i=0; i<roi; i++)
+            {
+                // Value is relative to trigger
+                // Offset is relative to DRS pipeline
+                // Abs is corresponding index relative to DRS pipeline
+                const size_t rel = pos +  i;
+                const size_t abs = pos + (spos+i)%1024;
+
+                const int64_t v =
+                    + (int64_t(val[rel])*scaleabs-offset[abs])*scalerel
+                    - trgoff[rel]
+                    ;
+
+                const int64_t div = gain[abs]*scalerel;
+                vec[rel] = double(v)*scalegain/div;
+            }
         }
     }
@@ -317 +350 @@
     static void GetPixelStats(float *ptr, const float *data, uint16_t roi)
     {
+        if (roi==0)
+            return;
+
         for (int i=0; i<1440; i++)
         {
             const float *vec = data+i*roi;
 
-            double max = vec[0];
-            int    pos = 0;
+            int    pos  = 0;
             double sum  = vec[0];
             double sum2 = vec[0]*vec[0];
@@ -330 +365 @@
                 sum2 += vec[j]*vec[j];
 
-                if (vec[j]>max)
-                {
-                    max = vec[j];
+                if (vec[j]>vec[pos])
                     pos = j;
-                }
             }
             sum  /= roi;
@@ -341 +373 @@
             *(ptr+0*1440+i) = sum;
             *(ptr+1*1440+i) = sqrt(sum2 - sum * sum);
-            *(ptr+2*1440+i) = max;
+            *(ptr+2*1440+i) = vec[pos];
             *(ptr+3*1440+i) = pos;
         }