merge in private fct

Device/Detector/IDetector.cpp

@@ -194,7 +194,9 @@ Powerfield<double>* IDetector::createDetectorIntensity(
 {
     std::unique_ptr<Powerfield<double>> detectorMap(createDetectorMap());
     ASSERT(detectorMap);
-    setDataToDetectorMap(*detectorMap, elements);
+    size_t elementIndex = 0;
+    for (auto it = beginNonMaskedPoints(); it != endNonMaskedPoints(); ++it)
+        (*detectorMap)[it.roiIndex()] = elements[elementIndex++]->intensity();
     if (m_detector_resolution)
         applyDetectorResolution(detectorMap.get());
 
@@ -216,18 +218,6 @@ std::unique_ptr<Powerfield<double>> IDetector::createDetectorMap() const
     return std::make_unique<Powerfield<double>>(axes);
 }
 
-void IDetector::setDataToDetectorMap(
-    Powerfield<double>& detectorMap,
-    const std::vector<std::unique_ptr<DiffuseElement>>& elements) const
-{
-    if (elements.empty())
-        return;
-
-    size_t elementIndex = 0;
-    for (auto it = beginNonMaskedPoints(); it != endNonMaskedPoints(); ++it)
-        detectorMap[it.roiIndex()] = elements[elementIndex++]->intensity();
-}
-
 size_t IDetector::numberOfElements() const
 {
     size_t result(0);

Device/Detector/IDetector.h

@@ -250,9 +250,6 @@ protected:
 
 
 private:
-    void setDataToDetectorMap(Powerfield<double>& detectorMap,
-                              const std::vector<std::unique_ptr<DiffuseElement>>& elements) const;
-
     OwningVector<IAxis> m_axes;
     PolFilter m_polAnalyzer;
     std::unique_ptr<IDetectorResolution> m_detector_resolution;