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

bypass scanAbsoluteResolution

parent f26263f0
No related branches found
No related tags found
1 merge request!1300Merge IScanResolution and child classes -> ScanResolution
......@@ -86,7 +86,7 @@ std::unique_ptr<ScanResolution> createScanResolution(const BeamDistributionItem*
return nullptr;
const double deviation = distr_item->deviation(scale);
return std::unique_ptr<ScanResolution>(scanAbsoluteResolution(*ranged_distr, deviation));
return std::unique_ptr<ScanResolution>(new ScanResolution(*ranged_distr, deviation));
}
void setSimulationOptions(ISimulation* simulation, const SimulationOptionsItem& item)
......
......@@ -111,7 +111,7 @@ void AlphaScan::setWavelengthResolution(const ScanResolution* resolution)
void AlphaScan::setAbsoluteWavelengthResolution(const IRangedDistribution& distr, double std_dev)
{
std::unique_ptr<ScanResolution> resolution(scanAbsoluteResolution(distr, std_dev));
std::unique_ptr<ScanResolution> resolution(new ScanResolution(distr, std_dev));
setWavelengthResolution(resolution.get());
}
......@@ -122,7 +122,7 @@ void AlphaScan::setAngleResolution(const ScanResolution* resolution)
void AlphaScan::setAbsoluteAngularResolution(const IRangedDistribution& distr, double std_dev)
{
std::unique_ptr<ScanResolution> resolution(scanAbsoluteResolution(distr, std_dev));
std::unique_ptr<ScanResolution> resolution(new ScanResolution(distr, std_dev));
setAngleResolution(resolution.get());
}
......
......@@ -115,21 +115,21 @@ CoordSystem1D* QzScan::scanCoordSystem() const
void QzScan::setRelativeQResolution(const IRangedDistribution& distr, double rel_dev)
{
m_resolution.reset(scanAbsoluteResolution(distr, 1.));
m_resolution.reset(new ScanResolution(distr, 1.));
m_relative_resolution = true;
m_resol_width = {rel_dev};
}
void QzScan::setAbsoluteQResolution(const IRangedDistribution& distr, double std_dev)
{
m_resolution.reset(scanAbsoluteResolution(distr, 1.));
m_resolution.reset(new ScanResolution(distr, 1.));
m_resol_width = {std_dev};
}
void QzScan::setVectorResolution(const IRangedDistribution& distr,
const std::vector<double>& std_devs)
{
m_resolution.reset(scanAbsoluteResolution(distr, 1.));
m_resolution.reset(new ScanResolution(distr, 1.));
ASSERT(std_devs.size() > 1);
m_resol_width = std_devs;
}
......@@ -420,10 +420,10 @@ test::makeSimulation::SpecularDivergentBeam(const MultiLayer& sample)
AlphaScan scan(wavelength, FixedBinAxis("axis", number_of_bins, min_angle, max_angle));
RangedDistributionGaussian wl_distr(n_integration_points, /*sigma_factor = */ 2.0);
std::unique_ptr<ScanResolution> wl_res(scanAbsoluteResolution(wl_distr, wl_stddev));
std::unique_ptr<ScanResolution> wl_res(new ScanResolution(wl_distr, wl_stddev));
RangedDistributionGaussian alpha_distr(n_integration_points, /*sigma_factor = */ 2.0);
std::unique_ptr<ScanResolution> ang_res(scanAbsoluteResolution(alpha_distr, ang_stddev));
std::unique_ptr<ScanResolution> ang_res(new ScanResolution(alpha_distr, ang_stddev));
scan.setWavelengthResolution(wl_res.get());
scan.setAngleResolution(ang_res.get());
......
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