Changeset 11758 for trunk/FACT++/src/EventBuilderWrapper.h

Timestamp:

08/03/11 18:17:00 (13 years ago)

Author:

tbretz

Message:

Renamed EVENT_DATA to RAW_EVENT; added new EVENT_DATA

File:

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

trunk/FACT++/src/EventBuilderWrapper.h

@@ -93 +93 @@
     DimDescribedService fDimRuns;
     DimDescribedService fDimEvents;
+    DimDescribedService fDimRawData;
     DimDescribedService fDimEventData;
     DimDescribedService fDimFwVersion;
@@ -148 +149 @@
         fDimRuns        ("FAD_CONTROL/RUNS",               "I:5;C", ""),
         fDimEvents      ("FAD_CONTROL/EVENTS",             "I:4", ""),
-        fDimEventData   ("FAD_CONTROL/EVENT_DATA",         "S:1;I:1;S:1;I:1;I:2;I:40;S:1440;S:160;F", ""),
+        fDimRawData     ("FAD_CONTROL/RAW_DATA",           "S:1;I:1;S:1;I:1;I:2;I:40;S:1440;S:160;F", ""),
+        fDimEventData   ("FAD_CONTROL/EVENT_DATA",         "F:1440;F:1440;F:1440;F:1440", ""),
         fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION",   "F:42", ""),
         fDimRunNumber   ("FAD_CONTROL/RUN_NUMBER",         "I:42", ""),
@@ -747 +749 @@
         const size_t sz = sizeof(EVENT)+event->Roi*2*1440;
 
-        // Copy event header
         vector<char> data(sz+event->Roi*2*1440);
         memcpy(data.data(), event, sizeof(EVENT));
 
-        DataCalib::Apply(reinterpret_cast<float*>(data.data()+sizeof(EVENT)),
-                         event->Adc_Data, event->StartPix, event->Roi);
-
-        fDimEventData.Update(data);
+        float *vec = reinterpret_cast<float*>(data.data()+sizeof(EVENT));
+
+        DataCalib::Apply(vec, event->Adc_Data, event->StartPix, event->Roi);
+        fDimRawData.Update(data);
+
+        vector<float> data2(1440*4); // Mean, RMS, Max, Pos
+        CalibData::GetPixelStats(data2.data(), vec, event->Roi);
+
+        fDimEventData.Update(data2);
+
+
+
 
         return 0;
@@ -1225 +1234 @@
         return 100;
     }
+
 }