cleanup while preparing for replacement of SimulationAreaDetector

GUI/Model/Job/JobItem.cpp

@@ -16,7 +16,6 @@
 #include "Base/Axis/Frame.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Detector/IDetector.h"
-#include "Device/Detector/SimulationAreaIterator.h" // roiIndex
 #include "GUI/Model/Axis/AmplitudeAxisItem.h"
 #include "GUI/Model/Data/Data1DItem.h"
 #include "GUI/Model/Data/Data2DItem.h"
@@ -392,10 +391,10 @@ void JobItem::cropRealData()
     // (re)create zero-valued Datafield.
     data2DItem->setDatafield({frame.clonedAxes()});
 
-    iiI->normalDetector()->iterateOverNonMaskedPoints([&](IDetector::const_iterator it) {
-        Datafield* cropped_data = data2DItem->p_field();
-        (*cropped_data)[it.roiIndex()] = (*origData)[it.detectorIndex()];
-    });
+    const IDetector& det = *iiI->normalDetector();
+    std::vector<size_t> ai = det.activeIndices();
+    for (size_t i = 0; i < ai.size(); ++i)
+        (*data2DItem->p_field())[ai[i]] = (*origData)[det.roiToFullIndex(ai[i])];
 
     data2DItem->updateDataRange();
 }