Changeset 12070 for trunk

Timestamp:

09/11/11 21:38:05 (13 years ago)

Author:

tbretz

Message:

Simplified SendFeedbackData

File:

• trunk/FACT++/src/EventBuilderWrapper.h (modified) (2 diffs)

trunk/FACT++/src/EventBuilderWrapper.h

@@ -849 +849 @@
         oldt = newt;
 
-        const size_t sz = sizeof(EVENT)+event->Roi*2*1440;
-
-        vector<char> data(sz+event->Roi*2*1440);
+        vector<char> data(sizeof(EVENT)+event->Roi*sizeof(float)*1440);
         memcpy(data.data(), event, sizeof(EVENT));
 
@@ -898 +896 @@
         // FIXME: Check event type here
 
-        const size_t sz = sizeof(EVENT)+event->Roi*2*1440;
-
-        vector<char> data(sz+event->Roi*2*1440);
-        memcpy(data.data(), event, sizeof(EVENT));
-
-        float *vec = reinterpret_cast<float*>(data.data()+sizeof(EVENT));
-
-        DataCalib::Apply(vec, event->Adc_Data, event->StartPix, event->Roi);
+        vector<float> data(event->Roi*1440);
+
+        DataCalib::Apply(data.data(), event->Adc_Data, event->StartPix, event->Roi);
 
         vector<float> data2(1440); // Mean, RMS, Max, Pos, first, last
-        CalibData::GetPixelMax(data2.data(), vec, event->Roi, 0, event->Roi-1);
+        CalibData::GetPixelMax(data2.data(), data.data(), event->Roi, 0, event->Roi-1);
 
 //        dim_lock();