Changeset 15031

Timestamp:

03/11/13 22:34:41 (12 years ago)

Author:

tbretz

Message:

I cannot get the the size of the dim_data correctly eventhough it is packed... so I use an int32 instead so that everything is properly aligned.

File:

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

trunk/FACT++/src/feedback.cc

@@ -736 +736 @@
             float Imed;
             float Idev;
-            uint16_t N;
+            uint32_t N;
             float Tdiff;
 
-            dim_data() : Iavg(0), Irms(0), Imed(0), Idev(0), N(0), Tdiff(0) { memset(I, 0, sizeof(float)*416); }
-        } __attribute__((__packed__));;
+            dim_data() { memset(this, 0, sizeof(dim_data)); }
+        } __attribute__((__packed__));
 
         const int16_t *I = evt.Ptr<int16_t>();
@@ -1299 +1299 @@
                      "|I_med[uA]:Median calibrated current (320 channels)"
                      "|I_dev[uA]:Deviation of calibrated current (320 channels)"
-                     "|N:Number of valid values"
+                     "|N[uint16]:Number of valid values"
                      "|T_diff[s]:Time difference to calibration"),
         fSP(BIAS::kNumChannels),