Index: trunk/Mars/mdrs/MDrsCalibApply.cc
===================================================================
--- trunk/Mars/mdrs/MDrsCalibApply.cc	(revision 16891)
+++ trunk/Mars/mdrs/MDrsCalibApply.cc	(revision 17069)
@@ -205,18 +205,9 @@
         fResult->fData.resize(fPrevStart.size()*2);
 
-        list<vector<Short_t>>::const_iterator it = fPrevStart.begin();
-
-        for (size_t i=0; i<fPrevStart.size()*2; i++)
+        int i=0;
+        for (auto it=fPrevStart.begin(); it!=fPrevStart.end(); it++)
         {
-            fResult->fData[i] = DrsCalibrate::Step();
-
-            const int32_t off = i%2 ? 3 : roi+10;
-
-            fResult->fData[i] =
-                DrsCalibrate::CorrectStep(vec, fRawEvt->GetNumPixels(), roi,
-                                          it->data(), start, off, idx);
-
-            if (i%2==1)
-                it++;
+            fResult->fData[i++] = DrsCalibrate::CorrectStep(vec, fRawEvt->GetNumPixles(), roi, it->data(), start, roi+10, idx);
+            fResult->fData[i++] = DrsCalibrate::CorrectStep(vec, fRawEvt->GetNumPixles(), roi, it->data(), start, 3,      idx);
         }