diff --git a/CHANGELOG b/CHANGELOG
index ab25b6e7d50eb5e871ba0a24167a1951a83281fc..3eed48de462e0aff9abeb5888c885681bd157ada 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ BornAgain-1.20?
> API changes:
* Support soft-matter reflectometry parameterization files of Anaklasis
* Remove unused/undocumented functions Layer::setThickness, setMaterial
+ * Rename SimulationResult::axis to convertedBinCenters
> GUI changes:
* Support "*.0001" files generated by Nicos at SANS-1 of MLZ / FRM2
* Improved file chooser for 2d data import
diff --git a/Device/Histo/SimulationResult.cpp b/Device/Histo/SimulationResult.cpp
index 283f85b7954786bed7983161dedfef870b70c23f..11a74cbc37c2c13245dd8937947898b3c7baa102 100644
--- a/Device/Histo/SimulationResult.cpp
+++ b/Device/Histo/SimulationResult.cpp
@@ -130,12 +130,12 @@ PyObject* SimulationResult::array(Axes::Units units) const
}
#endif
-std::vector<double> SimulationResult::axis(Axes::Units units) const
+std::vector<double> SimulationResult::convertedBinCenters(Axes::Units units) const
{
- return axis(0, units);
+ return convertedBinCenters(0, units);
}
-std::vector<double> SimulationResult::axis(size_t i_axis, Axes::Units units) const
+std::vector<double> SimulationResult::convertedBinCenters(size_t i_axis, Axes::Units units) const
{
if (i_axis >= m_unit_converter->dimension())
throw std::runtime_error(
diff --git a/Device/Histo/SimulationResult.h b/Device/Histo/SimulationResult.h
index 818f97003a7ac918ec22e7de0093a92801108ef6..2047aeed88fdd51ce18cf0ef5a2e1fdfd593c6e2 100644
--- a/Device/Histo/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -72,11 +72,12 @@ public:
PyObject* array(Axes::Units units = Axes::Units::UNDEFINED) const;
#endif
- std::vector<double> axis(Axes::Units units = Axes::Units::UNDEFINED) const;
+ std::vector<double> convertedBinCenters(Axes::Units units = Axes::Units::UNDEFINED) const;
//! Returns axis coordinates as a numpy array. With no parameters given
//! returns coordinates of x-axis in default units.
- std::vector<double> axis(size_t i_axis, Axes::Units units = Axes::Units::UNDEFINED) const;
+ std::vector<double> convertedBinCenters(
+ size_t i_axis, Axes::Units units = Axes::Units::UNDEFINED) const;
private:
void checkDimensions() const;
diff --git a/Examples/varia/BasicPolarizedReflectometry.py b/Examples/varia/BasicPolarizedReflectometry.py
index 2f64c1595f8e65a9e32c327eb65e63eb22ffbcfc..8e2ca9fddedbe7e9115877b1f05e9e0f026ea22a 100755
--- a/Examples/varia/BasicPolarizedReflectometry.py
+++ b/Examples/varia/BasicPolarizedReflectometry.py
@@ -67,7 +67,7 @@ def plot(data, labels):
plt.figure()
for d, l in zip(data, labels):
- plt.semilogy(d.axis(), d.array(), label=l, linewidth=1)
+ plt.semilogy(d.convertedBinCenters(), d.array(), label=l, linewidth=1)
plt.legend(loc='upper right')
plt.gca().yaxis.set_ticks_position('both')
diff --git a/Examples/varia/FootprintCorrection.py b/Examples/varia/FootprintCorrection.py
index bce268fc309390f06ec9f9c17cbcb49d58422928..658594fb91c375b1079504b487d910383df73538 100755
--- a/Examples/varia/FootprintCorrection.py
+++ b/Examples/varia/FootprintCorrection.py
@@ -58,7 +58,7 @@ def run_simulation(simulation):
def get_plot_data(sim_result):
- return sim_result.axis(), sim_result.array()
+ return sim_result.convertedBinCenters(), sim_result.array()
def plot(sim_result_1, sim_result_2):
diff --git a/Examples/varia/PolarizedNoAnalyzer.py b/Examples/varia/PolarizedNoAnalyzer.py
index 492fd0bca70d76e5597c9240a352ea5109487c10..d7bb4e442d29578fbf4159ad709ee518989c9cd9 100755
--- a/Examples/varia/PolarizedNoAnalyzer.py
+++ b/Examples/varia/PolarizedNoAnalyzer.py
@@ -62,7 +62,7 @@ def run_simulation(polarization=ba.kvector_t(0, 1, 0), analyzer=None):
simulation.runSimulation()
result = simulation.result()
- return result.axis(), result.array()
+ return result.convertedBinCenters(), result.array()
def plot(axis, data, labels):
diff --git a/Examples/varia/PolarizedNonperfectAnalyzerPolarizer.py b/Examples/varia/PolarizedNonperfectAnalyzerPolarizer.py
index 8a9c670e8a5ec5b9a8f3f3ea4a4f512854782f6a..1611c62ed3a011c8ffdf45ac5491478ab45bfd54 100755
--- a/Examples/varia/PolarizedNonperfectAnalyzerPolarizer.py
+++ b/Examples/varia/PolarizedNonperfectAnalyzerPolarizer.py
@@ -96,7 +96,7 @@ def plot(data, labels):
plt.figure()
for d, l in zip(data, labels):
- plt.semilogy(numpy.array(d.axis(ba.Axes.QSPACE)),
+ plt.semilogy(numpy.array(d.convertedBinCenters(ba.Axes.QSPACE)),
d.array(ba.Axes.QSPACE),
label=l,
linewidth=1)
diff --git a/Examples/varia/PolarizedSpinAsymmetry.py b/Examples/varia/PolarizedSpinAsymmetry.py
index e99696af85faaeb1a0ad535570d52bf43fb96e1f..5e4c3b0252b4ddc1b636a5d96b160c542b365ed7 100755
--- a/Examples/varia/PolarizedSpinAsymmetry.py
+++ b/Examples/varia/PolarizedSpinAsymmetry.py
@@ -111,7 +111,7 @@ def qr(result):
Returns two arrays that hold the q-values as well as the
reflectivity from a given simulation result
"""
- q = numpy.array(result.result().axis(ba.Axes.QSPACE))
+ q = numpy.array(result.result().convertedBinCenters(ba.Axes.QSPACE))
r = numpy.array(result.result().array(ba.Axes.QSPACE))
return q, r
diff --git a/Examples/varia/PolarizedSpinFlip.py b/Examples/varia/PolarizedSpinFlip.py
index a9549a30c4bf70f6c802a7ca4d96602a952715e0..b4a533ad67318712e5ad85ecb23c3a2409f33436 100755
--- a/Examples/varia/PolarizedSpinFlip.py
+++ b/Examples/varia/PolarizedSpinFlip.py
@@ -67,7 +67,7 @@ def plot(data, labels):
plt.figure()
for d, l in zip(data, labels):
- plt.semilogy(d.axis(), d.array(), label=l, linewidth=1)
+ plt.semilogy(d.convertedBinCenters(), d.array(), label=l, linewidth=1)
plt.legend(loc='upper right')
plt.gca().yaxis.set_ticks_position('both')
diff --git a/Examples/varia/RoughnessModel.py b/Examples/varia/RoughnessModel.py
index 0118c067df39f8448479fae010caadf72998327b..cfed8247b93fda31c27b35139acc1eb147352c6f 100755
--- a/Examples/varia/RoughnessModel.py
+++ b/Examples/varia/RoughnessModel.py
@@ -67,10 +67,12 @@ def run_simulation(roughness_model=ba.RoughnessModel.TANH):
def plot(result_tanh, result_nevot_croce):
- plt.semilogy(result_nevot_croce.axis(),
+ plt.semilogy(result_nevot_croce.convertedBinCenters(),
result_nevot_croce.array(),
label="Névot-Croce")
- plt.semilogy(result_tanh.axis(), result_tanh.array(), label="Tanh")
+ plt.semilogy(result_tanh.convertedBinCenters(),
+ result_tanh.array(),
+ label="Tanh")
plt.xlabel(r'$\alpha_i \; (deg)$', fontsize=12)
plt.ylabel(r'Intensity', fontsize=12)
diff --git a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
index 79b907729f5eb0675aa8d7fb516ecf4defd73cb4..9cdb9e7f510656dbf54f84394411a1ad5a0487a7 100644
--- a/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
+++ b/Tests/UnitTests/Core/Fresnel/SpecularSimulationTest.cpp
@@ -208,9 +208,10 @@ TEST_F(SpecularSimulationTest, ConstructSimulation)
EXPECT_EQ(data->getAllocatedSize(), 10u);
EXPECT_EQ(data->rank(), 1u);
- EXPECT_NEAR(0.1 * Units::deg, sim_result.axis(Axes::Units::RADIANS).front(),
+ EXPECT_NEAR(0.1 * Units::deg, sim_result.convertedBinCenters(Axes::Units::RADIANS).front(),
Units::deg * 1e-11);
- EXPECT_NEAR(1.9 * Units::deg, sim_result.axis(Axes::Units::RADIANS).back(), Units::deg * 1e-10);
+ EXPECT_NEAR(1.9 * Units::deg, sim_result.convertedBinCenters(
+ Axes::Units::RADIANS).back(), Units::deg * 1e-10);
}
TEST_F(SpecularSimulationTest, SimulationClone)
diff --git a/Wrap/Python/ba_plot.py b/Wrap/Python/ba_plot.py
index eec9274c1ca013f3161f8869bc6f764e7a8d14eb..5d48ed0448246bc9d2a0b6c7fa433ce05f102ea1 100644
--- a/Wrap/Python/ba_plot.py
+++ b/Wrap/Python/ba_plot.py
@@ -190,7 +190,7 @@ def plot_specular_simulation_result(result, **kwargs):
units = kwargs.pop('units', ba.Axes.UNDEFINED)
intensity = result.array(units)
- x_axis = result.axis(units)
+ x_axis = result.convertedBinCenters(units)
ymax = kwargs.pop('intensity_max', np.amax(np.amax(intensity)*2))
ymin = kwargs.pop('intensity_min',
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index d365b7d1d31645223a954b0737fc73153be053f2..3bcb33f931591532878a0f386e16a0eb0e695c7d 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -2507,10 +2507,10 @@ Returns underlying unit converter.
returns intensity data as Python numpy array
";
-%feature("docstring") SimulationResult::axis "std::vector< double > SimulationResult::axis(Axes::Units units=Axes::Units::UNDEFINED) const
+%feature("docstring") SimulationResult::convertedBinCenters "std::vector< double > SimulationResult::convertedBinCenters(Axes::Units units=Axes::Units::UNDEFINED) const
";
-%feature("docstring") SimulationResult::axis "std::vector< double > SimulationResult::axis(size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) const
+%feature("docstring") SimulationResult::convertedBinCenters "std::vector< double > SimulationResult::convertedBinCenters(size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) const
Returns axis coordinates as a numpy array. With no parameters given returns coordinates of x-axis in default units.
";
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 85aa673ea953ce618a9731ba9150cbd40ed5cab8..2cba0bae617678b051b4699bd20a41f06af12f6c 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -5482,16 +5482,16 @@ class SimulationResult(object):
"""
return _libBornAgainDevice.SimulationResult_array(self, *args)
- def axis(self, *args):
+ def convertedBinCenters(self, *args):
r"""
- axis(SimulationResult self, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t
- axis(SimulationResult self, size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t
- std::vector< double > SimulationResult::axis(size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) const
+ convertedBinCenters(SimulationResult self, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t
+ convertedBinCenters(SimulationResult self, size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t
+ std::vector< double > SimulationResult::convertedBinCenters(size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) const
Returns axis coordinates as a numpy array. With no parameters given returns coordinates of x-axis in default units.
"""
- return _libBornAgainDevice.SimulationResult_axis(self, *args)
+ return _libBornAgainDevice.SimulationResult_convertedBinCenters(self, *args)
def __getitem__(self, i):
r"""__getitem__(SimulationResult self, unsigned int i) -> double"""
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index ceb12aebf2e285679298d19da818732b42f51231..469caf23ee620983fb54daaab3091842089f6f55 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -43072,7 +43072,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SimulationResult_convertedBinCenters__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
Axes::Units arg2 ;
@@ -43085,15 +43085,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_0(PyObject *SWIGUNUSEDPAR
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_convertedBinCenters" "', argument " "1"" of type '" "SimulationResult const *""'");
}
arg1 = reinterpret_cast< SimulationResult * >(argp1);
ecode2 = SWIG_AsVal_int(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axis" "', argument " "2"" of type '" "Axes::Units""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_convertedBinCenters" "', argument " "2"" of type '" "Axes::Units""'");
}
arg2 = static_cast< Axes::Units >(val2);
- result = ((SimulationResult const *)arg1)->axis(arg2);
+ result = ((SimulationResult const *)arg1)->convertedBinCenters(arg2);
resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result));
return resultobj;
fail:
@@ -43101,7 +43101,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SimulationResult_convertedBinCenters__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
void *argp1 = 0 ;
@@ -43111,10 +43111,10 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_1(PyObject *SWIGUNUSEDPAR
if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_convertedBinCenters" "', argument " "1"" of type '" "SimulationResult const *""'");
}
arg1 = reinterpret_cast< SimulationResult * >(argp1);
- result = ((SimulationResult const *)arg1)->axis();
+ result = ((SimulationResult const *)arg1)->convertedBinCenters();
resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result));
return resultobj;
fail:
@@ -43122,7 +43122,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SimulationResult_convertedBinCenters__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
size_t arg2 ;
@@ -43138,20 +43138,20 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_2(PyObject *SWIGUNUSEDPAR
if ((nobjs < 3) || (nobjs > 3)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_convertedBinCenters" "', argument " "1"" of type '" "SimulationResult const *""'");
}
arg1 = reinterpret_cast< SimulationResult * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axis" "', argument " "2"" of type '" "size_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_convertedBinCenters" "', argument " "2"" of type '" "size_t""'");
}
arg2 = static_cast< size_t >(val2);
ecode3 = SWIG_AsVal_int(swig_obj[2], &val3);
if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimulationResult_axis" "', argument " "3"" of type '" "Axes::Units""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimulationResult_convertedBinCenters" "', argument " "3"" of type '" "Axes::Units""'");
}
arg3 = static_cast< Axes::Units >(val3);
- result = ((SimulationResult const *)arg1)->axis(arg2,arg3);
+ result = ((SimulationResult const *)arg1)->convertedBinCenters(arg2,arg3);
resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result));
return resultobj;
fail:
@@ -43159,7 +43159,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SimulationResult_convertedBinCenters__SWIG_3(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
size_t arg2 ;
@@ -43172,15 +43172,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis__SWIG_3(PyObject *SWIGUNUSEDPAR
if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_SimulationResult, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_axis" "', argument " "1"" of type '" "SimulationResult const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_convertedBinCenters" "', argument " "1"" of type '" "SimulationResult const *""'");
}
arg1 = reinterpret_cast< SimulationResult * >(argp1);
ecode2 = SWIG_AsVal_size_t(swig_obj[1], &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_axis" "', argument " "2"" of type '" "size_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_convertedBinCenters" "', argument " "2"" of type '" "size_t""'");
}
arg2 = static_cast< size_t >(val2);
- result = ((SimulationResult const *)arg1)->axis(arg2);
+ result = ((SimulationResult const *)arg1)->convertedBinCenters(arg2);
resultobj = swig::from(static_cast< std::vector< double,std::allocator< double > > >(result));
return resultobj;
fail:
@@ -43188,13 +43188,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_convertedBinCenters(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_axis", 0, 3, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_convertedBinCenters", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 1) {
int _v;
@@ -43202,7 +43202,7 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_SimulationResult, 0);
_v = SWIG_CheckState(res);
if (_v) {
- return _wrap_SimulationResult_axis__SWIG_1(self, argc, argv);
+ return _wrap_SimulationResult_convertedBinCenters__SWIG_1(self, argc, argv);
}
}
if (argc == 2) {
@@ -43216,7 +43216,7 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_SimulationResult_axis__SWIG_0(self, argc, argv);
+ return _wrap_SimulationResult_convertedBinCenters__SWIG_0(self, argc, argv);
}
}
}
@@ -43231,7 +43231,7 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_SimulationResult_axis__SWIG_3(self, argc, argv);
+ return _wrap_SimulationResult_convertedBinCenters__SWIG_3(self, argc, argv);
}
}
}
@@ -43251,19 +43251,19 @@ SWIGINTERN PyObject *_wrap_SimulationResult_axis(PyObject *self, PyObject *args)
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_SimulationResult_axis__SWIG_2(self, argc, argv);
+ return _wrap_SimulationResult_convertedBinCenters__SWIG_2(self, argc, argv);
}
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_axis'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_convertedBinCenters'.\n"
" Possible C/C++ prototypes are:\n"
- " SimulationResult::axis(Axes::Units) const\n"
- " SimulationResult::axis() const\n"
- " SimulationResult::axis(size_t,Axes::Units) const\n"
- " SimulationResult::axis(size_t) const\n");
+ " SimulationResult::convertedBinCenters(Axes::Units) const\n"
+ " SimulationResult::convertedBinCenters() const\n"
+ " SimulationResult::convertedBinCenters(size_t,Axes::Units) const\n"
+ " SimulationResult::convertedBinCenters(size_t) const\n");
return 0;
}
@@ -46068,10 +46068,10 @@ static PyMethodDef SwigMethods[] = {
"returns intensity data as Python numpy array \n"
"\n"
""},
- { "SimulationResult_axis", _wrap_SimulationResult_axis, METH_VARARGS, "\n"
- "SimulationResult_axis(SimulationResult self, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t\n"
- "SimulationResult_axis(SimulationResult self, size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t\n"
- "std::vector< double > SimulationResult::axis(size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) const\n"
+ { "SimulationResult_convertedBinCenters", _wrap_SimulationResult_convertedBinCenters, METH_VARARGS, "\n"
+ "SimulationResult_convertedBinCenters(SimulationResult self, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t\n"
+ "SimulationResult_convertedBinCenters(SimulationResult self, size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) -> vdouble1d_t\n"
+ "std::vector< double > SimulationResult::convertedBinCenters(size_t i_axis, Axes::Units units=Axes::Units::UNDEFINED) const\n"
"\n"
"Returns axis coordinates as a numpy array. With no parameters given returns coordinates of x-axis in default units. \n"
"\n"