diff --git a/GUI/Model/FromCore/ItemizeSimulation.cpp b/GUI/Model/FromCore/ItemizeSimulation.cpp index 54afb3b82f1004b9d0d9148ce2d90bff3284a469..a73551fd0d1d96137926a8c4675c1211e38f59c9 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 69dc7d2aebf0f7a5d7206137666962f4120807e9..66fb477641ee0fa0dce85e85e7a6c0f5b74b73d9 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 87ef10643bfcf8fafbab75019e25726d92e3a2d7..a707bf5aa62f7f4806a9036e07e209f32cd31bf8 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