Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11683)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11684)
@@ -207,7 +207,5 @@
         {
             fGain.assign(fSum.begin(), fSum.end());
-            fNumGain = fNumEntries*32768;
-            for (int i=0; i<1024*1440; i++)
-                fOffset[i] -= 16384;
+            fNumGain = fNumEntries;
             // Now we have a scale from -16384 to 16384
         }
@@ -231,4 +229,15 @@
                          fGain.data(),   fNumGain,
                          fTrgOff.data(), fNumTrgOff);
+    }
+
+    static void Apply(float *vec, int16_t *val, const int16_t *start, uint32_t roi)
+    {
+        if (fStep==0)
+            CalibData::Apply(vec, val, start, roi);
+        else
+            CalibData::Apply(vec, val, start, roi,
+                             fOffset.data(), fNumOffset,
+                             fGain.data(),   fNumGain,
+                             fTrgOff.data(), fNumTrgOff);
     }
 };
@@ -970,5 +979,5 @@
         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;S", ""),
+        fDimEventData   ("FAD_CONTROL/EVENT_DATA",         "S:1;I:1;S:1;I:1;I:2;I:40;S:1440;S:160;F", ""),
         fDimFwVersion   ("FAD_CONTROL/FIRMWARE_VERSION",   "F:42", ""),
         fDimRunNumber   ("FAD_CONTROL/RUN_NUMBER",         "I:42", ""),
@@ -1561,10 +1570,13 @@
         oldt = newt;
 
-        DataFileCalib::Apply(event->Adc_Data, event->StartPix, event->Roi);
-
 	const size_t sz = sizeof(EVENT)+event->Roi*2*1440;
 
-        fDimEventData.setData(event, sz);
-	fDimEventData.updateService();
+        vector<char> data(sz+event->Roi*2*1440);
+        memcpy(data.data(), event, sizeof(EVENT));
+
+        DataFileCalib::Apply(reinterpret_cast<float*>(data.data()+sizeof(EVENT)),
+                             event->Adc_Data, event->StartPix, event->Roi);
+
+        fDimEventData.Update(data);
 
 	return 0;