From c9141174ed2732570deadbb70147798ae4759954 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 28 Jul 2021 16:57:21 +0200
Subject: [PATCH] ditto
---
Core/Simulation/DepthProbeSimulation.cpp | 2 +-
Core/Simulation/DepthProbeSimulation.h | 2 +-
Core/Simulation/GISASSimulation.cpp | 2 +-
Core/Simulation/GISASSimulation.h | 2 +-
Core/Simulation/ISimulation.cpp | 2 +-
Core/Simulation/ISimulation.h | 2 +-
Core/Simulation/ISimulation2D.cpp | 2 +-
Core/Simulation/OffSpecularSimulation.cpp | 2 +-
Core/Simulation/OffSpecularSimulation.h | 2 +-
Core/Simulation/SpecularSimulation.cpp | 4 ++--
Core/Simulation/SpecularSimulation.h | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index af1fdcd10c6..22d65417157 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -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());
diff --git a/Core/Simulation/DepthProbeSimulation.h b/Core/Simulation/DepthProbeSimulation.h
index 58f90053b08..1980dfbd8fb 100644
--- a/Core/Simulation/DepthProbeSimulation.h
+++ b/Core/Simulation/DepthProbeSimulation.h
@@ -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;
diff --git a/Core/Simulation/GISASSimulation.cpp b/Core/Simulation/GISASSimulation.cpp
index 553377c63cf..1872093244a 100644
--- a/Core/Simulation/GISASSimulation.cpp
+++ b/Core/Simulation/GISASSimulation.cpp
@@ -81,7 +81,7 @@ ICoordSystem* GISASSimulation::createCoordSystem() const
}
#endif
-void GISASSimulation::initDiffuseElementVector()
+void GISASSimulation::initElementVector()
{
m_eles = generateElements(beam());
if (m_cache.empty())
diff --git a/Core/Simulation/GISASSimulation.h b/Core/Simulation/GISASSimulation.h
index ea48f927039..6414f35a91a 100644
--- a/Core/Simulation/GISASSimulation.h
+++ b/Core/Simulation/GISASSimulation.h
@@ -52,7 +52,7 @@ public:
private:
//! Initializes the vector of ISimulation elements
- void initDiffuseElementVector() override;
+ void initElementVector() override;
void initialize();
};
diff --git a/Core/Simulation/ISimulation.cpp b/Core/Simulation/ISimulation.cpp
index 55d4de98fe3..912885aa03b 100644
--- a/Core/Simulation/ISimulation.cpp
+++ b/Core/Simulation/ISimulation.cpp
@@ -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);
diff --git a/Core/Simulation/ISimulation.h b/Core/Simulation/ISimulation.h
index 69eb6616c87..04e6a447248 100644
--- a/Core/Simulation/ISimulation.h
+++ b/Core/Simulation/ISimulation.h
@@ -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() {}
diff --git a/Core/Simulation/ISimulation2D.cpp b/Core/Simulation/ISimulation2D.cpp
index 73e7a84eb42..c58bce6ac88 100644
--- a/Core/Simulation/ISimulation2D.cpp
+++ b/Core/Simulation/ISimulation2D.cpp
@@ -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");
diff --git a/Core/Simulation/OffSpecularSimulation.cpp b/Core/Simulation/OffSpecularSimulation.cpp
index f265b58755f..82cdda2d149 100644
--- a/Core/Simulation/OffSpecularSimulation.cpp
+++ b/Core/Simulation/OffSpecularSimulation.cpp
@@ -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();
diff --git a/Core/Simulation/OffSpecularSimulation.h b/Core/Simulation/OffSpecularSimulation.h
index cf96d76f633..1990c6ad925 100644
--- a/Core/Simulation/OffSpecularSimulation.h
+++ b/Core/Simulation/OffSpecularSimulation.h
@@ -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;
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index 51ce6723b61..2f087640c33 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -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");
diff --git a/Core/Simulation/SpecularSimulation.h b/Core/Simulation/SpecularSimulation.h
index 5d57d850cf3..9d131ad27d2 100644
--- a/Core/Simulation/SpecularSimulation.h
+++ b/Core/Simulation/SpecularSimulation.h
@@ -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
--
GitLab