From f36179bd6ba73ddc1030cd482ba57d2173edbe89 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Sat, 28 May 2022 10:10:41 +0200
Subject: [PATCH] merge in private fct
---
Device/Detector/IDetector.cpp | 16 +++-------------
Device/Detector/IDetector.h | 3 ---
2 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index 187abbcf845..81007289f58 100644
--- a/Device/Detector/IDetector.cpp
+++ b/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);
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index 05dbdf954d2..f743a3c5e5e 100644
--- a/Device/Detector/IDetector.h
+++ b/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;
--
GitLab