use activeIndices throughout ScatteringSimulation

Device/Detector/IDetector.cpp

@@ -232,7 +232,7 @@ std::vector<size_t> IDetector::activeIndices() const
     std::vector<size_t> result;
     for (size_t i = 0; i < sizeOfRegionOfInterest(); ++i)
         if (!detectorMask() || !detectorMask()->isMasked(roiToFullIndex(i), frame()))
-            result.push_back(roiToFullIndex(i));
+            result.push_back(i);
 
     return result;
 }

Sim/Simulation/ScatteringSimulation.cpp

@@ -22,7 +22,6 @@
 #include "Device/Beam/IFootprint.h"
 #include "Device/Data/Datafield.h"
 #include "Device/Detector/IDetector.h"
-#include "Device/Detector/SimulationAreaIterator.h" // beginNonMaskedPoints
 #include "Param/Distrib/DistributionHandler.h"
 #include "Resample/Element/DiffuseElement.h"
 #include "Sample/Multilayer/MultiLayer.h"
@@ -76,7 +75,7 @@ void ScatteringSimulation::prepareSimulation()
     m_activeIndices = m_detector->activeIndices();
     m_pixels.reserve(m_activeIndices.size());
     for (size_t i : m_activeIndices)
-        m_pixels.emplace_back(m_detector->createPixel(i));
+        m_pixels.emplace_back(m_detector->createPixel(m_detector->roiToFullIndex(i)));
 }
 
 void ScatteringSimulation::runComputation(const ReSample& re_sample, size_t i, double weight)
@@ -122,15 +121,17 @@ size_t ScatteringSimulation::nElements() const
 Datafield ScatteringSimulation::packResult()
 {
     Datafield result(m_detector->createDetectorMap());
-    size_t elementIndex = 0;
-    m_detector->iterateOverNonMaskedPoints(
-        [&](const auto it) { result[it.roiIndex()] = m_cache[elementIndex++]; });
+    for (size_t i = 0; i < m_activeIndices.size(); ++i)
+        result.setAt(m_activeIndices[i], m_cache[i]);
+
     m_detector->applyDetectorResolution(&result);
 
-    if (background())
-        m_detector->iterateOverNonMaskedPoints([&](const auto it) {
-            result[it.roiIndex()] = background()->addBackground(result[it.roiIndex()]);
-        });
+    if (background()) {
+        for (size_t i : m_activeIndices) {
+            double& val = result[i];
+            val = background()->addBackground(val);
+        }
+    }
 
     return result;
 }