Changeset 11741 for trunk/FACT++

Timestamp:

08/02/11 20:19:52 (13 years ago)

Author:

tbretz

Message:

Fixed scale for gain and secondaroy offset; increase fStep after Close(); changed some variable types to match the big range needed for the gain and secondary baseline.

File:

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

trunk/FACT++/src/DataCalib.cc

@@ -11 +11 @@
 
 vector<int32_t> DataCalib::fOffset(1440*1024, 0);
-vector<int32_t> DataCalib::fGain  (1440*1024, 2);
-vector<int32_t> DataCalib::fTrgOff(1440*1024, 0);
+vector<int64_t> DataCalib::fGain  (1440*1024, 2);
+vector<int64_t> DataCalib::fTrgOff(1440*1024, 0);
 vector<float>   DataCalib::fStats (1440*1024*6+3);
 
@@ -172 +172 @@
         fNumOffset = fNumEntries;
 
+        cout << "NUM_OFF=" << fNumOffset << endl;
+
         // 0.5: Scale from ADC to Millivolt
         GetSampleStats(fStats.data()+3, 0.5);
@@ -179 +181 @@
     {
         fGain.assign(fSum.begin(), fSum.end());
-        //fNumGain = fNumEntries*1000;
+        fNumGain = fNumEntries*fNumOffset;
 
         // DAC:  0..2.5V == 0..65535
         // V-mV: 1000
+        //fNumGain *= 2500*50000;
+        //for (int i=0; i<1024*1440; i++)
+        //    fGain[i] *= 65536;
+        fNumGain *= 1953125;
         for (int i=0; i<1024*1440; i++)
-            fGain[i] *= 125;
-        fNumGain = fNumEntries * 65535;
+            fGain[i] *= 1024;
 
         // 0.5: Scale from ADC to Millivolt
-        GetSampleStats(fStats.data()+1024*1440*2+3, 0.5);
+        GetSampleStats(fStats.data()+1024*1440*2+3, 1./fNumOffset);//0.5);
         reinterpret_cast<uint32_t*>(fStats.data())[1] = GetRunId();;
     }
@@ -194 +199 @@
     {
         fTrgOff.assign(fSum.begin(), fSum.end());
-        fNumTrgOff = fNumEntries;
+        fNumTrgOff = fNumEntries*fNumOffset;
 
         // 0.5: Scale from ADC to Millivolt
-        GetSampleStats(fStats.data()+1024*1440*4+3, 0.5);
+        GetSampleStats(fStats.data()+1024*1440*4+3, 1./fNumOffset);//0.5);
         reinterpret_cast<uint32_t*>(fStats.data())[2] = GetRunId();;
     }
@@ -207 +212 @@
 
     fDim.Update(fStats);
+
+    fStep++;
 
     return true;