Changeset 11745 for trunk

Timestamp:

08/02/11 20:23:11 (13 years ago)

Author:

tbretz

Message:

Changed some argument types to match the huge range needed by the gain and the secondary baseline.

File:

• trunk/FACT++/src/DrsCalib.h (modified) (4 diffs)

trunk/FACT++/src/DrsCalib.h

@@ -169 +169 @@
     static void Apply(int16_t *val, const int16_t *start, uint32_t roi,
                       const int32_t *offset, const uint32_t scaleabs,
-                      const int32_t *gain,   const uint32_t scalegain,
-                      const int32_t *trgoff, const uint32_t scalerel)
-    {
+                      const int64_t *gain,   const uint32_t scalegain,
+                      const int64_t *trgoff, const uint32_t scalerel)
+    {
+        return ;// "FIXME: scalegain exceeds valid range..."
         for (size_t ch=0; ch<1440; ch++)
         {
@@ -194 +195 @@
                     ;
 
+                // The gain value is multiplied by fNumOffset and fNumGain
                 const int64_t div = int64_t(gain[abs])*scaleabs*scalerel;
-
                 val[rel] = (v*scalegain)/div;
-            }
+             }
         }
     }
@@ -203 +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 int32_t *gain,   const uint32_t scalegain,
-                      const int32_t *trgoff, const uint32_t scalerel)
+                      const int64_t *gain,   const uint64_t scalegain,
+                      const int64_t *trgoff, const uint32_t scalerel)
     {
         for (size_t ch=0; ch<1440; ch++)
@@ -233 +234 @@
                 const int64_t div = int64_t(gain[abs])*scaleabs*scalerel;
 
-                vec[rel] = double(v*scalegain)/div;
+                vec[rel] = double(v)*scalegain/div;
             }
         }