From cad46184b7ec16512bae74e1c1c9684f45e7450d Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 23 May 2022 18:26:54 +0200
Subject: [PATCH] rename -> m_polAnalyzer
---
Device/Detector/IDetector.cpp | 6 +++---
Device/Detector/IDetector.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index f2f4893d7a4..2e2c1f9bdac 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -24,7 +24,7 @@ IDetector::IDetector(const IDetector& other)
: INode()
, m_explicitROI(other.m_explicitROI)
, m_axes(other.m_axes)
- , m_detection_properties(other.m_detection_properties)
+ , m_polAnalyzer(other.m_polAnalyzer)
{
if (other.m_detector_resolution)
setDetectorResolution(*other.m_detector_resolution);
@@ -141,7 +141,7 @@ size_t IDetector::detectorIndexToRegionOfInterestIndex(const size_t detectorInde
void IDetector::setAnalyzer(const R3 direction, double efficiency, double total_transmission)
{
if (direction.mag()>0)
- m_detection_properties.setDirEffTra(direction, efficiency, total_transmission);
+ m_polAnalyzer.setDirEffTra(direction, efficiency, total_transmission);
}
void IDetector::setDetectorResolution(const IDetectorResolution& p_detector_resolution)
@@ -243,7 +243,7 @@ std::pair<double, double> IDetector::regionOfInterestBounds(size_t iAxis) const
std::vector<const INode*> IDetector::nodeChildren() const
{
- return std::vector<const INode*>() << &m_detection_properties << m_detector_resolution;
+ return std::vector<const INode*>() << &m_polAnalyzer << m_detector_resolution;
}
void IDetector::iterateOverRegionOfInterest(std::function<void(const_iterator)> func) const
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index 066e8c30dcd..cdbd98ebc51 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -156,7 +156,7 @@ public:
std::unique_ptr<Powerfield<double>> createDetectorMap() const;
//! Returns detection properties
- const PolFilter& analyzer() const { return m_detection_properties; }
+ const PolFilter& analyzer() const { return m_polAnalyzer; }
#endif // SWIG
//! Returns new intensity map with resolution applied, and cropped to ROI if applicable.
@@ -216,7 +216,7 @@ private:
const std::vector<std::unique_ptr<DiffuseElement>>& elements) const;
OwningVector<IAxis> m_axes;
- PolFilter m_detection_properties;
+ PolFilter m_polAnalyzer;
std::unique_ptr<IDetectorResolution> m_detector_resolution;
#endif // SWIG
};
--
GitLab