Skip to content
Snippets Groups Projects
Commit cad46184 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

rename -> m_polAnalyzer

parent 1b942296
No related branches found
No related tags found
2 merge requests!907Core cleanup,!905mv class Instrument out of core
......@@ -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
......
......@@ -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
};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment