Changeset 18612 for trunk/FACT++/src

Timestamp:

09/17/16 22:22:32 (8 years ago)

Author:

tbretz

Message:

God knows why the constructur fails to work with gcc 5, I don't...

File:

• trunk/FACT++/src/fscctrl.cc (modified) (2 diffs)

trunk/FACT++/src/fscctrl.cc

@@ -139 +139 @@
         // This is historical and keeps the following code consistent with the
         // previous code which was reading ascii data from the fsc
-        vector<float> volt(  fMsg.adc_values,    fMsg.adc_values    + kNumVoltageChannels);
-        vector<float> resist(fMsg.ad7719_values, fMsg.ad7719_values + kNumResistanceChannels);
+        vector<float> volt(kNumVoltageChannels);
+        vector<float> resist(kNumResistanceChannels);
 
         const float time = fMsg.time_sec + fMsg.time_ms/1000.;
@@ -147 +147 @@
         // So we do:
         for (unsigned int i=0; i<volt.size(); i++)
-            volt[i] /= 10;
+            volt[i] = fMsg.adc_values[i]*0.1;
 
         for (unsigned int i=0; i<resist.size(); i++)
-            resist[i] *= (6.25 * 1024) / (1 << 25);
+            resist[i] = fMsg.ad7719_values[i] * (6.25 * 1024) / (1 << 25);
 
         int mapv[] =