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

merge fct into c'tor

parent ff9e6efb
No related branches found
No related tags found
1 merge request!1142simplify ISimulation2D and IDetector, improve comments
...@@ -18,7 +18,11 @@ ...@@ -18,7 +18,11 @@
DetectorContext::DetectorContext(const IDetector* detector) DetectorContext::DetectorContext(const IDetector* detector)
{ {
setup_context(detector); m_active_indices = detector->active_indices();
m_analyzer_operator = detector->analyzer().matrix();
m_pixels.reserve(m_active_indices.size());
for (auto detector_index : m_active_indices)
m_pixels.emplace_back(detector->createPixel(detector_index));
} }
size_t DetectorContext::numberOfElements() const size_t DetectorContext::numberOfElements() const
...@@ -39,12 +43,3 @@ size_t DetectorContext::detectorIndex(size_t element_index) const ...@@ -39,12 +43,3 @@ size_t DetectorContext::detectorIndex(size_t element_index) const
{ {
return m_active_indices[element_index]; return m_active_indices[element_index];
} }
void DetectorContext::setup_context(const IDetector* detector)
{
m_active_indices = detector->active_indices();
m_analyzer_operator = detector->analyzer().matrix();
m_pixels.reserve(m_active_indices.size());
for (auto detector_index : m_active_indices)
m_pixels.emplace_back(detector->createPixel(detector_index));
}
...@@ -40,8 +40,6 @@ public: ...@@ -40,8 +40,6 @@ public:
size_t detectorIndex(size_t element_index) const; size_t detectorIndex(size_t element_index) const;
private: private:
void setup_context(const IDetector* detector);
SpinMatrix m_analyzer_operator; SpinMatrix m_analyzer_operator;
OwningVector<const IPixel> m_pixels; //! All unmasked pixels inside ROI. OwningVector<const IPixel> m_pixels; //! All unmasked pixels inside ROI.
std::vector<size_t> m_active_indices; //! The sequence of bin indices (unmasked, in ROI) std::vector<size_t> m_active_indices; //! The sequence of bin indices (unmasked, in ROI)
......
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