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

ditto

parent faff9437
No related branches found
No related tags found
1 merge request!232Cleanup in context of Simulation, Computation; *Element now inherits from IElement
......@@ -127,7 +127,7 @@ void DepthProbeSimulation::setBeamParameters(double lambda, const IAxis& alpha_a
beam().setFootprintFactor(*beam_shape);
}
void DepthProbeSimulation::initDiffuseElementVector()
void DepthProbeSimulation::initElementVector()
{
m_eles = generateElements(beam());
......
......@@ -65,7 +65,7 @@ private:
const IFootprintFactor* beam_shape);
//! Initializes the vector of ISimulation elements
void initDiffuseElementVector() override;
void initElementVector() override;
//! Gets the number of elements this simulation needs to calculate
size_t numberOfElements() const override;
......
......@@ -81,7 +81,7 @@ ICoordSystem* GISASSimulation::createCoordSystem() const
}
#endif
void GISASSimulation::initDiffuseElementVector()
void GISASSimulation::initElementVector()
{
m_eles = generateElements(beam());
if (m_cache.empty())
......
......@@ -52,7 +52,7 @@ public:
private:
//! Initializes the vector of ISimulation elements
void initDiffuseElementVector() override;
void initElementVector() override;
void initialize();
};
......
......@@ -290,7 +290,7 @@ const std::vector<ParameterDistribution>& ISimulation::getDistributions() const
void ISimulation::runSingleSimulation(const ProcessedSample& re_sample, size_t batch_start,
size_t batch_size, double weight)
{
initDiffuseElementVector();
initElementVector();
const size_t n_threads = m_options.getNumberOfThreads();
ASSERT(n_threads > 0);
......
......@@ -107,7 +107,7 @@ protected:
virtual void transferResultsToIntensityMap() {}
//! Initializes the vector of ISimulation elements
virtual void initDiffuseElementVector() = 0;
virtual void initElementVector() = 0;
virtual void updateIntensityMap() {}
......
......@@ -180,7 +180,7 @@ std::vector<double> ISimulation2D::rawResults() const
void ISimulation2D::setRawResults(const std::vector<double>& raw_data)
{
initDiffuseElementVector();
initElementVector();
if (raw_data.size() != m_eles.size())
throw std::runtime_error("ISimulation2D::setRawResults: size of vector passed as "
"argument doesn't match number of elements in this simulation");
......
......@@ -100,7 +100,7 @@ size_t OffSpecularSimulation::intensityMapSize() const
return m_alpha_i_axis->size() * detector().axis(1).size();
}
void OffSpecularSimulation::initDiffuseElementVector()
void OffSpecularSimulation::initElementVector()
{
m_eles.clear();
Beam beam2 = beam();
......
......@@ -53,7 +53,7 @@ public:
private:
//! Initializes the vector of ISimulation elements
void initDiffuseElementVector() override;
void initElementVector() override;
//! Checks the distribution validity for simulation.
void validateParametrization(const ParameterDistribution& par_distr) const override;
......
......@@ -143,7 +143,7 @@ ICoordSystem* SpecularSimulation::createCoordSystem() const
}
#endif
void SpecularSimulation::initDiffuseElementVector()
void SpecularSimulation::initElementVector()
{
if (!m_scan)
throw std::runtime_error("Error in SpecularSimulation: beam parameters were not set.");
......@@ -237,7 +237,7 @@ std::vector<double> SpecularSimulation::rawResults() const
void SpecularSimulation::setRawResults(const std::vector<double>& raw_data)
{
initDiffuseElementVector();
initElementVector();
if (raw_data.size() != m_eles.size())
throw std::runtime_error("SpecularSimulation::setRawResults: size of vector passed as "
"argument doesn't match number of elements in this simulation");
......
......@@ -62,7 +62,7 @@ public:
private:
//! Initializes the vector of ISimulation elements
void initDiffuseElementVector() override;
void initElementVector() override;
//! Generate a single threaded computation for a given range of simulation elements
//! @param start Index of the first element to include into computation
......
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