From 87733acb65a15f668d7ee9bffd99b95c6408d221 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de> Date: Mon, 30 Jan 2023 14:35:04 +0100 Subject: [PATCH] inline vars in OffspecSimulation::generateElements --- Sim/Simulation/OffspecSimulation.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Sim/Simulation/OffspecSimulation.cpp b/Sim/Simulation/OffspecSimulation.cpp index b329bd568d8..16d98384f9a 100644 --- a/Sim/Simulation/OffspecSimulation.cpp +++ b/Sim/Simulation/OffspecSimulation.cpp @@ -225,21 +225,17 @@ SimulationResult OffspecSimulation::packResult() //... Local functions: -std::vector<DiffuseElement> OffspecSimulation::generateElements(const Beam& beam) -{ - const double wavelength = beam.wavelength(); - const double alpha_i = beam.alpha_i(); - const double phi_i = beam.phi_i(); - const SpinMatrix beam_polMatrices = beam.polMatrix(); - const SpinMatrix analyzer_operator = m_detector->analyzer().matrix(); - const size_t i_specular = m_detector->indexOfSpecular(beam); +std::vector<DiffuseElement> OffspecSimulation::generateElements(const Beam& beam2) +{ const size_t N = m_active_indices.size(); std::vector<DiffuseElement> result; result.reserve(N); for (size_t i = 0; i < N; ++i) - result.emplace_back(DiffuseElement( - wavelength, alpha_i, phi_i, std::unique_ptr<IPixel>(m_pixels[i]->clone()), - beam_polMatrices, analyzer_operator, m_active_indices[i] == i_specular)); + result.emplace_back( + DiffuseElement(beam2.wavelength(), beam2.alpha_i(), beam2.phi_i(), + std::unique_ptr<IPixel>(m_pixels[i]->clone()), beam2.polMatrix(), + m_detector->analyzer().matrix(), + m_active_indices[i] == m_detector->indexOfSpecular(beam2))); return result; } -- GitLab