diff --git a/Examples/fit/specular/Honeycomb_fit.py b/Examples/fit/specular/Honeycomb_fit.py index 475320513cfa314327b15b5af393d7ecee5493fe..e2199b0f29e00d620f5f4de84b262238f8a7fd66 100755 --- a/Examples/fit/specular/Honeycomb_fit.py +++ b/Examples/fit/specular/Honeycomb_fit.py @@ -77,10 +77,7 @@ def get_sample(parameters, sign, ms150=1): def get_simulation(q_axis, parameters, sign, ms150=False): - n_points = 25 - n_sig = 3.0 - - q_distr = ba.RangedDistributionGaussian(n_points, n_sig) + q_distr = ba.DistributionGaussian(0., 1., 25, 3.) dq = parameters["dq"]*q_axis scan = ba.QzScan(q_axis) diff --git a/Examples/fit/specular/Pt_layer_fit.py b/Examples/fit/specular/Pt_layer_fit.py index 07391f91c49567ee8b80324b510ae7f4ae406b42..bc2de2a639ca445f4297e037e328c33defc3b63d 100755 --- a/Examples/fit/specular/Pt_layer_fit.py +++ b/Examples/fit/specular/Pt_layer_fit.py @@ -64,8 +64,8 @@ def get_simulation(q_axis, parameters): n_sig = 4.0 n_samples = 25 - distr = ba.RangedDistributionGaussian(n_samples, n_sig) - scan.setAbsoluteQResolution(distr, parameters["q_res/q"]) + distr = ba.DistributionGaussian(0., parameters["q_res/q"], 25, 4.) + scan.setAbsoluteQResolution(distr) simulation = ba.SpecularSimulation(scan, sample) diff --git a/Examples/fit/specular/RealLifeReflectometryFitting.py b/Examples/fit/specular/RealLifeReflectometryFitting.py index a81a1e1103420c92dfd5298c477b98b6919792ad..3d2588292192aeaf6db67ece3aafa52e3a2c9bab 100755 --- a/Examples/fit/specular/RealLifeReflectometryFitting.py +++ b/Examples/fit/specular/RealLifeReflectometryFitting.py @@ -93,7 +93,7 @@ def create_simulation(sample, arg_dict, bin_start, bin_end): Creates and returns specular simulation """ wavelength = 1.54*ba.angstrom - alpha_distr = ba.RangedDistributionGaussian(0, arg_dict["divergence"]{} + alpha_distr = ba.DistributionGaussian(0, arg_dict["divergence"]) footprint = ba.FootprintGauss(arg_dict["footprint_factor"]) scan = ba.AlphaScan(wavelength, get_real_data_axis(bin_start, bin_end)) diff --git a/GUI/Model/Descriptor/DistributionItems.h b/GUI/Model/Descriptor/DistributionItems.h index cf801557ce19f2219667d57e72d3ae19527cfd5c..c9aef85e526210044d462d3828b85555cb0d2a71 100644 --- a/GUI/Model/Descriptor/DistributionItems.h +++ b/GUI/Model/Descriptor/DistributionItems.h @@ -20,7 +20,6 @@ #include <memory> class IDistribution1D; -class IRangedDistribution; class DistributionItem { public: diff --git a/Sim/Export/PyFmt2.h b/Sim/Export/PyFmt2.h index 469ad8dac6dfd7b1d1067ec00f0796e34dcba402..ea109532b4ea4f8040159d158249535b8af7ab10 100644 --- a/Sim/Export/PyFmt2.h +++ b/Sim/Export/PyFmt2.h @@ -23,7 +23,6 @@ class IAxis; class IDistribution1D; -class IRangedDistribution; class IShape2D; class ParameterDistribution; @@ -39,8 +38,6 @@ std::string printAxis(const IAxis* axis, const std::string& unit); std::string printParameterDistribution(const ParameterDistribution& par_distr, const std::string& distVarName); -std::string printRangedDistribution(const IRangedDistribution& distr); - std::string printDistribution(const IDistribution1D& distr); } // namespace Py::Fmt2 diff --git a/Sim/Scan/QzScan.h b/Sim/Scan/QzScan.h index 46afc6cc02e8fe54516e85efa348ef1fc467f2de..aed3524fbb81b0422c70a7de2056521254718f4b 100644 --- a/Sim/Scan/QzScan.h +++ b/Sim/Scan/QzScan.h @@ -43,9 +43,7 @@ public: void setRelativeQResolution(const IDistribution1D& distr, double rel_dev); void setAbsoluteQResolution(const IDistribution1D& distr, double std_dev); - //! Sets qz resolution values via IRangedDistribution and values of standard deviations. - //! _std_dev_ can be either single-valued or a numpy array. In the latter case the length of the - //! array should coinside with the length of the qz-axis. + //! Sets qz resolution function and list of standard deviations. void setVectorResolution(const IDistribution1D& distr, const std::vector<double>& std_devs); void setOffset(double offset) { m_offset = offset; }