Changeset 11864

Timestamp:

08/09/11 16:58:59 (13 years ago)

Author:

tbretz

Message:

Fixed some scaling issues which came up with the scale removed in Apply

File:

• trunk/FACT++/src/DataCalib.cc (modified) (3 diffs)

trunk/FACT++/src/DataCalib.cc

@@ -175 +175 @@
         for (int i=0; i<1024*1440; i++)
         {
-
             fOffset[i] = fNumOffset           *256*fStats[i+1024*1440*0+3]/125;
             fGain[i]   = fNumOffset*fNumGain  *256*fStats[i+1024*1440*2+3]/125;
@@ -186 +185 @@
         //for (int i=0; i<1024*1440; i++)
         //    fGain[i] *= 65536;
-        fNumGain *= 1953125;
-        for (int i=0; i<1024*1440; i++)
-            fGain[i] *= 1024;
+        if (fStep==0)
+        {
+            for (int i=0; i<1024*1440; i++)
+                fGain[i] = fNumOffset*4096;
+        }
+        else
+        {
+            fNumGain *= 1953125;
+            for (int i=0; i<1024*1440; i++)
+                fGain[i] *= 1024;
+        }
 
         return true;
@@ -270 +277 @@
         fNumOffset = fNumEntries;
 
+        for (int i=0; i<1024*1440; i++)
+            fGain[i] = 4096*fNumOffset;
+
         // Scale ADC data from 12bit to 2000mV
         GetSampleStats(fStats.data()+3, 2000./4096);