diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp index f2f4893d7a4690a2f332a8ac333a019a709de071..2e2c1f9bdac896200fb2bdb4eb104ee0d151324a 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 066e8c30dcd5cd60c0bc0ebf2d0d074e4ce8e667..cdbd98ebc51608f36093a810a1d97a0e2aacd5bf 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 };