Skip to content
Snippets Groups Projects
Commit d921479f authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

simplify

parent d7a92bed
No related branches found
No related tags found
1 merge request!1303simplifications of resolution handling; resolve warnings
......@@ -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);
}
......
......@@ -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;
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment