diff --git a/Examples/fit/specular/RealLifeReflectometryFitting.py b/Examples/fit/specular/RealLifeReflectometryFitting.py
index c2f77907fbd3504043083c4218f73bc6ce24d2a5..ddda1ba583ac83c649a0766ca5b56e3b0fd55fd6 100755
--- a/Examples/fit/specular/RealLifeReflectometryFitting.py
+++ b/Examples/fit/specular/RealLifeReflectometryFitting.py
@@ -97,7 +97,7 @@ def create_simulation(sample, arg_dict, bin_start, bin_end):
footprint = ba.FootprintGauss(arg_dict["footprint_factor"])
scan = ba.AlphaScan(wavelength, get_real_data_axis(bin_start, bin_end))
- scan.setAbsoluteAngularResolution(alpha_distr, arg_dict["divergence"])
+ scan.setAngleResolution(alpha_distr, arg_dict["divergence"])
scan.setFootprintFactor(footprint)
simulation = ba.SpecularSimulation(scan, sample)
diff --git a/Examples/specular/BeamAngularDivergence.py b/Examples/specular/BeamAngularDivergence.py
index 9c132e36628ffd790d2c7cb1ce7d7000e81cbe89..7852faa00efd3fb9f92a3a8b916e8ea875129a71 100755
--- a/Examples/specular/BeamAngularDivergence.py
+++ b/Examples/specular/BeamAngularDivergence.py
@@ -47,7 +47,7 @@ def get_simulation(sample, **kwargs):
scan = ba.AlphaScan(wavelength, n, 2*deg/n, 2*deg)
scan.setFootprintFactor(footprint)
- scan.setAbsoluteAngularResolution(alpha_distr, d_ang)
+ scan.setAngleResolution(alpha_distr, d_ang)
return ba.SpecularSimulation(scan, sample)
diff --git a/Examples/specular/BeamFullDivergence.py b/Examples/specular/BeamFullDivergence.py
index 74c8cdbfa3762e5661f6f3a3506586a386ccfefa..897ccff6809801feb6e6b107311bdbdb92eeff48 100755
--- a/Examples/specular/BeamFullDivergence.py
+++ b/Examples/specular/BeamFullDivergence.py
@@ -30,7 +30,7 @@ def get_simulation(sample):
wavelength_distr = ba.RangedDistributionGaussian(n_points, n_sig)
scan = ba.AlphaScan(wavelength, n, 2*deg/n, 2*deg)
- scan.setAbsoluteAngularResolution(alpha_distr, d_ang)
+ scan.setAngleResolution(alpha_distr, d_ang)
scan.setWavelengthResolution(wavelength_distr, d_wl)
return ba.SpecularSimulation(scan, sample)
diff --git a/GUI/Model/ToCore/SimulationToCore.cpp b/GUI/Model/ToCore/SimulationToCore.cpp
index dd1620c990606ea39af14e488440e6158437a603..75061d5a68713d3bd4870097386aae18e765c228 100644
--- a/GUI/Model/ToCore/SimulationToCore.cpp
+++ b/GUI/Model/ToCore/SimulationToCore.cpp
@@ -132,7 +132,7 @@ SpecularSimulation* createSpecularSimulation(std::unique_ptr<MultiLayer> sample,
const double scale = it->scaleFactor();
if (std::unique_ptr<IRangedDistribution> distr =
distr_item->createIRangedDistribution(scale))
- scan.setAbsoluteAngularResolution(*distr, distr_item->deviation(scale));
+ scan.setAngleResolution(*distr, distr_item->deviation(scale));
}
}
diff --git a/Sim/Export/SimulationToPython.cpp b/Sim/Export/SimulationToPython.cpp
index 1f2a35694b1d7b91f5e48836ab5b7bdb701ede10..468387b2f5e867402433ab60949a266fea031e76 100644
--- a/Sim/Export/SimulationToPython.cpp
+++ b/Sim/Export/SimulationToPython.cpp
@@ -96,7 +96,7 @@ std::string defineAlphaScan(const AlphaScan& scan)
}
if (const auto* r = scan.angleResolution(); r && r->rdistribution()) {
result << Py::Fmt2::printRangedDistribution(*r->rdistribution()) << "\n";
- result << indent() << "scan.setAbsoluteAngularResolution(distribution, "
+ result << indent() << "scan.setAngleResolution(distribution, "
<< Py::Fmt::printDouble(r->stdDev()) << ")\n";
}
if (const auto* r = scan.wavelengthResolution(); r && r->rdistribution()) {
diff --git a/Sim/Scan/AlphaScan.cpp b/Sim/Scan/AlphaScan.cpp
index e4f70000f5a33acf6eed6732c24b7d2441a06465..b67bd63505b77f8de1c89b61e9bf6c6be0647b90 100644
--- a/Sim/Scan/AlphaScan.cpp
+++ b/Sim/Scan/AlphaScan.cpp
@@ -109,7 +109,7 @@ void AlphaScan::setWavelengthResolution(const IRangedDistribution& distr, double
m_lambda_distrib.reset(new ScanResolution(distr, std_dev));
}
-void AlphaScan::setAbsoluteAngularResolution(const IRangedDistribution& distr, double std_dev)
+void AlphaScan::setAngleResolution(const IRangedDistribution& distr, double std_dev)
{
m_alpha_distrib.reset(new ScanResolution(distr, std_dev));
}
diff --git a/Sim/Scan/AlphaScan.h b/Sim/Scan/AlphaScan.h
index d8c9767b840ccf83ee74cb45bb5baa48dae3c3f0..276b113b49934515ac0aa8ecfecf2518c585ffce 100644
--- a/Sim/Scan/AlphaScan.h
+++ b/Sim/Scan/AlphaScan.h
@@ -41,7 +41,7 @@ public:
void setWavelengthResolution(const IRangedDistribution& distr, double std_dev);
- void setAbsoluteAngularResolution(const IRangedDistribution& distr, double std_dev);
+ void setAngleResolution(const IRangedDistribution& distr, double std_dev);
#ifndef SWIG
//! Generates simulation elements for specular simulations
diff --git a/Tests/SimFactory/MakeSimulations.cpp b/Tests/SimFactory/MakeSimulations.cpp
index 545f04c549d2ac8e9a77914440aa219b5cddb9a8..f46697f116bc9c4c01724740745021229d9e9cbf 100644
--- a/Tests/SimFactory/MakeSimulations.cpp
+++ b/Tests/SimFactory/MakeSimulations.cpp
@@ -423,7 +423,7 @@ test::makeSimulation::SpecularDivergentBeam(const MultiLayer& sample)
RangedDistributionGaussian alpha_distr(n_integration_points, /*sigma_factor = */ 2.0);
scan.setWavelengthResolution(wl_distr, wl_stddev);
- scan.setAbsoluteAngularResolution(alpha_distr, ang_stddev);
+ scan.setAngleResolution(alpha_distr, ang_stddev);
return std::make_unique<SpecularSimulation>(scan, sample);
}
diff --git a/auto/Wrap/libBornAgainSim.py b/auto/Wrap/libBornAgainSim.py
index ecb9a91bb641989a1980b9cc8247eecde7a83394..43731f7d5c94eeb83e44b68fe2d269268ac12f7a 100644
--- a/auto/Wrap/libBornAgainSim.py
+++ b/auto/Wrap/libBornAgainSim.py
@@ -2572,9 +2572,9 @@ class AlphaScan(ISpecularScan):
r"""setWavelengthResolution(AlphaScan self, IRangedDistribution const & distr, double std_dev)"""
return _libBornAgainSim.AlphaScan_setWavelengthResolution(self, distr, std_dev)
- def setAbsoluteAngularResolution(self, distr, std_dev):
- r"""setAbsoluteAngularResolution(AlphaScan self, IRangedDistribution const & distr, double std_dev)"""
- return _libBornAgainSim.AlphaScan_setAbsoluteAngularResolution(self, distr, std_dev)
+ def setAngleResolution(self, distr, std_dev):
+ r"""setAngleResolution(AlphaScan self, IRangedDistribution const & distr, double std_dev)"""
+ return _libBornAgainSim.AlphaScan_setAngleResolution(self, distr, std_dev)
# Register AlphaScan in _libBornAgainSim:
_libBornAgainSim.AlphaScan_swigregister(AlphaScan)
diff --git a/auto/Wrap/libBornAgainSim_wrap.cpp b/auto/Wrap/libBornAgainSim_wrap.cpp
index 4aa4eddc5e5a23502139e4ef4e0fb222998fbd9a..03efb029a9633cb4e72fdd2f5290d8242e3a14ee 100644
--- a/auto/Wrap/libBornAgainSim_wrap.cpp
+++ b/auto/Wrap/libBornAgainSim_wrap.cpp
@@ -32291,7 +32291,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_AlphaScan_setAbsoluteAngularResolution(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_AlphaScan_setAngleResolution(PyObject *self, PyObject *args) {
PyObject *resultobj = 0;
AlphaScan *arg1 = (AlphaScan *) 0 ;
IRangedDistribution *arg2 = 0 ;
@@ -32304,26 +32304,26 @@ SWIGINTERN PyObject *_wrap_AlphaScan_setAbsoluteAngularResolution(PyObject *self
int ecode3 = 0 ;
PyObject *swig_obj[3] ;
- if (!SWIG_Python_UnpackTuple(args, "AlphaScan_setAbsoluteAngularResolution", 3, 3, swig_obj)) SWIG_fail;
+ if (!SWIG_Python_UnpackTuple(args, "AlphaScan_setAngleResolution", 3, 3, swig_obj)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_AlphaScan, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaScan_setAbsoluteAngularResolution" "', argument " "1"" of type '" "AlphaScan *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "AlphaScan_setAngleResolution" "', argument " "1"" of type '" "AlphaScan *""'");
}
arg1 = reinterpret_cast< AlphaScan * >(argp1);
res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IRangedDistribution, 0 | 0);
if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaScan_setAbsoluteAngularResolution" "', argument " "2"" of type '" "IRangedDistribution const &""'");
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "AlphaScan_setAngleResolution" "', argument " "2"" of type '" "IRangedDistribution const &""'");
}
if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaScan_setAbsoluteAngularResolution" "', argument " "2"" of type '" "IRangedDistribution const &""'");
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "AlphaScan_setAngleResolution" "', argument " "2"" of type '" "IRangedDistribution const &""'");
}
arg2 = reinterpret_cast< IRangedDistribution * >(argp2);
ecode3 = SWIG_AsVal_double(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaScan_setAbsoluteAngularResolution" "', argument " "3"" of type '" "double""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "AlphaScan_setAngleResolution" "', argument " "3"" of type '" "double""'");
}
arg3 = static_cast< double >(val3);
- (arg1)->setAbsoluteAngularResolution((IRangedDistribution const &)*arg2,arg3);
+ (arg1)->setAngleResolution((IRangedDistribution const &)*arg2,arg3);
resultobj = SWIG_Py_Void();
return resultobj;
fail:
@@ -36623,7 +36623,7 @@ static PyMethodDef SwigMethods[] = {
{ "AlphaScan_clone", _wrap_AlphaScan_clone, METH_O, "AlphaScan_clone(AlphaScan self) -> AlphaScan"},
{ "AlphaScan_setFootprintFactor", _wrap_AlphaScan_setFootprintFactor, METH_VARARGS, "AlphaScan_setFootprintFactor(AlphaScan self, IFootprintFactor const * f_factor)"},
{ "AlphaScan_setWavelengthResolution", _wrap_AlphaScan_setWavelengthResolution, METH_VARARGS, "AlphaScan_setWavelengthResolution(AlphaScan self, IRangedDistribution const & distr, double std_dev)"},
- { "AlphaScan_setAbsoluteAngularResolution", _wrap_AlphaScan_setAbsoluteAngularResolution, METH_VARARGS, "AlphaScan_setAbsoluteAngularResolution(AlphaScan self, IRangedDistribution const & distr, double std_dev)"},
+ { "AlphaScan_setAngleResolution", _wrap_AlphaScan_setAngleResolution, METH_VARARGS, "AlphaScan_setAngleResolution(AlphaScan self, IRangedDistribution const & distr, double std_dev)"},
{ "AlphaScan_swigregister", AlphaScan_swigregister, METH_O, NULL},
{ "AlphaScan_swiginit", AlphaScan_swiginit, METH_VARARGS, NULL},
{ "new_QzScan", _wrap_new_QzScan, METH_VARARGS, "\n"