simplify

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();

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.");
 }

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.");
 }

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.");
 }