Index: /trunk/FACT++/src/DrsCalib.h
===================================================================
--- /trunk/FACT++/src/DrsCalib.h	(revision 11686)
+++ /trunk/FACT++/src/DrsCalib.h	(revision 11687)
@@ -239,4 +239,5 @@
     }
 
+    /*
     static void Apply(float *vec, const int16_t *val, const int16_t *start, uint32_t roi)
     {
@@ -255,5 +256,5 @@
                 vec[pos+i] = float(val[pos+i])/2;
         }
-    }
+    }*/
 
     pair<vector<double>,vector<double> > GetSampleStats() const
Index: /trunk/FACT++/src/EventBuilderWrapper.h
===================================================================
--- /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11686)
+++ /trunk/FACT++/src/EventBuilderWrapper.h	(revision 11687)
@@ -136,5 +136,7 @@
 
 public:
-    DataFileCalib(uint32_t id, MessageImp &imp) : DataFileImp(id, imp) { }
+    DataFileCalib(uint32_t id, MessageImp &imp) : DataFileImp(id, imp)
+    {
+    }
 
     static void Restart() { fStep = 0; }
@@ -169,7 +171,9 @@
         if (fStep==0)
         {
-            fGain.assign(1440*1024, 1);
+            fOffset.assign(1440*1024, 0);
+            fGain.assign  (1440*1024, 2);
             fTrgOff.assign(1440*1024, 0);
 
+            fNumOffset = 1;
             fNumGain   = 1;
             fNumTrgOff = 1;
@@ -222,7 +226,4 @@
     static void Apply(int16_t *val, const int16_t *start, uint32_t roi)
     {
-        if (fStep==0)
-            return;
-
         CalibData::Apply(val, start, roi,
                          fOffset.data(), fNumOffset,
@@ -233,11 +234,8 @@
     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);
+        CalibData::Apply(vec, val, start, roi,
+                         fOffset.data(), fNumOffset,
+                         fGain.data(),   fNumGain,
+                         fTrgOff.data(), fNumTrgOff);
     }
 };
@@ -245,11 +243,11 @@
 int DataFileCalib::fStep = 0;
 
-vector<int32_t> DataFileCalib::fOffset;
-vector<int32_t> DataFileCalib::fGain;
-vector<int32_t> DataFileCalib::fTrgOff;
-
-uint32_t DataFileCalib::fNumOffset = 0;
-uint32_t DataFileCalib::fNumGain   = 0;
-uint32_t DataFileCalib::fNumTrgOff = 0;
+vector<int32_t> DataFileCalib::fOffset(1440*1024, 0);
+vector<int32_t> DataFileCalib::fGain  (1440*1024, 2);
+vector<int32_t> DataFileCalib::fTrgOff(1440*1024, 0);
+
+uint32_t DataFileCalib::fNumOffset = 1;
+uint32_t DataFileCalib::fNumGain   = 1;
+uint32_t DataFileCalib::fNumTrgOff = 1;