From d921479f861de85bd53121297f479f63d0a87e98 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 23 Jan 2023 10:11:38 +0100
Subject: [PATCH] simplify
---
GUI/Model/FromCore/ItemizeSimulation.cpp | 4 ++--
Sim/Scan/ScanResolution.cpp | 5 -----
Sim/Scan/ScanResolution.h | 5 ++++-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp
index 54afb3b82f1..a73551fd0d1 100644
--- a/GUI/Model/FromCore/ItemizeSimulation.cpp
+++ b/GUI/Model/FromCore/ItemizeSimulation.cpp
@@ -453,13 +453,13 @@ SpecularInstrumentItem* createSpecularInstrumentItem(const SpecularSimulation& s
if (const ScanResolution* resolution = alphaScan->wavelengthResolution())
if (const IRangedDistribution* rdis = resolution->rdistribution()) {
double mean = alphaScan->wavelength();
- double std_dev = resolution->stdDevs(mean, 1).front();
+ double std_dev = resolution->stdDev();
addRangedDistributionToItem(beam_item->wavelengthItem(), *rdis, mean, std_dev);
}
if (const ScanResolution* resolution = alphaScan->angleResolution())
if (const IRangedDistribution* rdis = resolution->rdistribution()) {
- double std_dev = resolution->stdDevs(0.0, 1).front();
+ double std_dev = resolution->stdDev();
addRangedDistributionToItem(beam_item->inclinationAngleItem(), *rdis, 0, std_dev);
}
diff --git a/Sim/Scan/ScanResolution.cpp b/Sim/Scan/ScanResolution.cpp
index 69dc7d2aebf..66fb477641e 100644
--- a/Sim/Scan/ScanResolution.cpp
+++ b/Sim/Scan/ScanResolution.cpp
@@ -35,11 +35,6 @@ std::vector<ParameterSample> ScanResolution::resolutionSamples(double mean) cons
return rdistribution()->generateSamples(mean, m_stddev);
}
-std::vector<double> ScanResolution::stdDevs(double, size_t n_times) const
-{
- return std::vector<double>(n_times, m_stddev);
-}
-
size_t ScanResolution::nSamples() const
{
return m_distr ? m_distr->nSamples() : 1L;
diff --git a/Sim/Scan/ScanResolution.h b/Sim/Scan/ScanResolution.h
index 87ef10643bf..a707bf5aa62 100644
--- a/Sim/Scan/ScanResolution.h
+++ b/Sim/Scan/ScanResolution.h
@@ -38,7 +38,10 @@ public:
std::vector<ParameterSample> resolutionSamples(double mean) const;
- std::vector<double> stdDevs(double mean, size_t n_times) const;
+ double stdDev() const
+ {
+ return m_stddev;
+ }
//... For export:
double delta() const
--
GitLab