From ba9cc7f39ec6e7be3f29ecc2f1b709be2a3c7847 Mon Sep 17 00:00:00 2001
From: Matthias Puchner <github@mpuchner.de>
Date: Thu, 29 Apr 2021 17:01:55 +0200
Subject: [PATCH] simplify
---
Core/Export/SimulationToPython.cpp | 13 ++++++-------
Core/Simulation/DepthProbeSimulation.cpp | 5 +----
Core/Simulation/OffSpecularSimulation.cpp | 5 +----
Core/Simulation/SpecularSimulation.cpp | 5 +----
4 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index f4585f4d70d..f14d4980eac 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -331,19 +331,18 @@ std::string defineParameterDistributions(const ISimulation* simulation)
if (distributions.empty())
return "";
for (size_t i = 0; i < distributions.size(); ++i) {
- std::string main_par_name = distributions[i].whichParameterAsPyEnum();
- std::string mainParUnits =
+ const std::string mainParUnits =
simulation->findRealParameter(distributions[i].whichParameter())->unit();
- size_t nbr_samples = distributions[i].getNbrSamples();
- double sigma_factor = distributions[i].getSigmaFactor();
- std::string distr = "distr_" + std::to_string(i + 1);
+ const std::string distr = "distr_" + std::to_string(i + 1);
result << indent() << distr << " = "
<< pyfmt2::printDistribution(*distributions[i].getDistribution(), mainParUnits)
<< "\n";
- result << indent() << "simulation.addParameterDistribution(" << main_par_name << ", "
- << distr << ", " << nbr_samples << ", " << pyfmt::printDouble(sigma_factor)
+ result << indent() << "simulation.addParameterDistribution("
+ << distributions[i].whichParameterAsPyEnum() << ", " << distr << ", "
+ << distributions[i].getNbrSamples() << ", "
+ << pyfmt::printDouble(distributions[i].getSigmaFactor())
<< pyfmt::printRealLimitsArg(distributions[i].getLimits(), mainParUnits) << ")\n";
}
return result.str();
diff --git a/Core/Simulation/DepthProbeSimulation.cpp b/Core/Simulation/DepthProbeSimulation.cpp
index d41658f76e5..97bdd831874 100644
--- a/Core/Simulation/DepthProbeSimulation.cpp
+++ b/Core/Simulation/DepthProbeSimulation.cpp
@@ -204,10 +204,7 @@ void DepthProbeSimulation::validateParametrization(const ParameterDistribution&
if (zero_mean)
return;
- const bool isInclinationAngle =
- par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle;
-
- if (isInclinationAngle && !zero_mean)
+ if (par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle)
throw std::runtime_error("Error in DepthProbeSimulation: parameter distribution of "
"beam inclination angle should have zero mean.");
}
diff --git a/Core/Simulation/OffSpecularSimulation.cpp b/Core/Simulation/OffSpecularSimulation.cpp
index 095456f4aaf..44e96994a03 100644
--- a/Core/Simulation/OffSpecularSimulation.cpp
+++ b/Core/Simulation/OffSpecularSimulation.cpp
@@ -111,10 +111,7 @@ void OffSpecularSimulation::validateParametrization(const ParameterDistribution&
if (zero_mean)
return;
- const bool isInclinationAngle =
- par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle;
-
- if (isInclinationAngle && !zero_mean)
+ if (par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle)
throw std::runtime_error("Error in OffSpecularSimulation: parameter distribution of "
"beam inclination angle should have zero mean.");
}
diff --git a/Core/Simulation/SpecularSimulation.cpp b/Core/Simulation/SpecularSimulation.cpp
index 6141367cdaa..74bf8d193a7 100644
--- a/Core/Simulation/SpecularSimulation.cpp
+++ b/Core/Simulation/SpecularSimulation.cpp
@@ -190,10 +190,7 @@ void SpecularSimulation::validateParametrization(const ParameterDistribution& pa
if (zero_mean)
return;
- const bool isInclinationAngle =
- par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle;
-
- if (isInclinationAngle && !zero_mean)
+ if (par_distr.whichParameter() == ParameterDistribution::BeamInclinationAngle)
throw std::runtime_error("Error in SpecularSimulation: parameter distribution of "
"beam inclination angle should have zero mean.");
}
--
GitLab