diff --git a/Device/Histo/SimulationResult.cpp b/Device/Histo/SimulationResult.cpp
index a08581deb2ff1bb8a5da95da2eeec50ad5b7f30b..c7eb63b1366bd403a4e2649ffc617bf6766a1cac 100644
--- a/Device/Histo/SimulationResult.cpp
+++ b/Device/Histo/SimulationResult.cpp
@@ -48,7 +48,7 @@ std::pair<double, double> SimulationResult::axisMinMax(size_t i, Coords units) c
return {converter().calculateMin(i, units), converter().calculateMax(i, units)};
}
-std::string SimulationResult::nameOfAxis(size_t i, Coords units) const
+std::string SimulationResult::name_of_axis(size_t i, Coords units) const
{
return converter().nameOfAxis(i, units);
}
diff --git a/Device/Histo/SimulationResult.h b/Device/Histo/SimulationResult.h
index c759dcd6133e0ce97511f473c53d757538f3ccfc..2f04aaa22b0b3cad3294f70fb12192794281b351 100644
--- a/Device/Histo/SimulationResult.h
+++ b/Device/Histo/SimulationResult.h
@@ -39,7 +39,7 @@ public:
std::pair<double, double> axisMinMax(size_t i, Coords units = Coords::UNDEFINED) const;
- std::string nameOfAxis(size_t i, Coords units = Coords::UNDEFINED) const;
+ std::string name_of_axis(size_t i, Coords units = Coords::UNDEFINED) const;
//! Returns intensity data as Python numpy array
#ifdef BORNAGAIN_PYTHON
diff --git a/Wrap/Python/ba_plot.py b/Wrap/Python/ba_plot.py
index b2b06455e03bcdd7faa72a79234b71008c02ccff..e49f3c3f5a9ebbd8b5e17c6c0c2b52e4576c9c36 100644
--- a/Wrap/Python/ba_plot.py
+++ b/Wrap/Python/ba_plot.py
@@ -166,7 +166,7 @@ def get_axes_labels(result, units):
"""
labels = []
for i in range(result.rank()):
- labels.append(translate_axis_label(result.nameOfAxis(i, units)))
+ labels.append(translate_axis_label(result.name_of_axis(i, units)))
return labels
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 4f87939a520d34e3f94925fc1b505aa1b01dd78e..40dec146a06150ffc4ef667240433657aff53af6 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -3071,9 +3071,9 @@ class SimulationResult(Datafield):
r"""axisMinMax(SimulationResult self, size_t i, Coords units=UNDEFINED) -> pvacuum_double_t"""
return _libBornAgainDevice.SimulationResult_axisMinMax(self, *args)
- def nameOfAxis(self, *args):
- r"""nameOfAxis(SimulationResult self, size_t i, Coords units=UNDEFINED) -> std::string"""
- return _libBornAgainDevice.SimulationResult_nameOfAxis(self, *args)
+ def name_of_axis(self, *args):
+ r"""name_of_axis(SimulationResult self, size_t i, Coords units=UNDEFINED) -> std::string"""
+ return _libBornAgainDevice.SimulationResult_name_of_axis(self, *args)
def array(self, *args):
r"""array(SimulationResult self, Coords units=UNDEFINED) -> PyObject"""
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 0417a4c9917343cf0c5f5ee89c8eb6fb0219bba2..df19730304cd983451ea8d56e186c69e62369c64 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -37295,7 +37295,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SimulationResult_name_of_axis__SWIG_0(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
size_t arg2 ;
@@ -37311,20 +37311,20 @@ SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis__SWIG_0(PyObject *self, P
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_nameOfAxis" "', argument " "1"" of type '" "SimulationResult const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_name_of_axis" "', 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_nameOfAxis" "', argument " "2"" of type '" "size_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_name_of_axis" "', 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_nameOfAxis" "', argument " "3"" of type '" "Coords""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "SimulationResult_name_of_axis" "', argument " "3"" of type '" "Coords""'");
}
arg3 = static_cast< Coords >(val3);
- result = ((SimulationResult const *)arg1)->nameOfAxis(arg2,arg3);
+ result = ((SimulationResult const *)arg1)->name_of_axis(arg2,arg3);
resultobj = SWIG_From_std_string(static_cast< std::string >(result));
return resultobj;
fail:
@@ -37332,7 +37332,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
+SWIGINTERN PyObject *_wrap_SimulationResult_name_of_axis__SWIG_1(PyObject *self, Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
SimulationResult *arg1 = (SimulationResult *) 0 ;
size_t arg2 ;
@@ -37345,15 +37345,15 @@ SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis__SWIG_1(PyObject *self, P
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_nameOfAxis" "', argument " "1"" of type '" "SimulationResult const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "SimulationResult_name_of_axis" "', 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_nameOfAxis" "', argument " "2"" of type '" "size_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "SimulationResult_name_of_axis" "', argument " "2"" of type '" "size_t""'");
}
arg2 = static_cast< size_t >(val2);
- result = ((SimulationResult const *)arg1)->nameOfAxis(arg2);
+ result = ((SimulationResult const *)arg1)->name_of_axis(arg2);
resultobj = SWIG_From_std_string(static_cast< std::string >(result));
return resultobj;
fail:
@@ -37361,13 +37361,13 @@ fail:
}
-SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis(PyObject *self, PyObject *args) {
+SWIGINTERN PyObject *_wrap_SimulationResult_name_of_axis(PyObject *self, PyObject *args) {
Py_ssize_t argc;
PyObject *argv[4] = {
0
};
- if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_nameOfAxis", 0, 3, argv))) SWIG_fail;
+ if (!(argc = SWIG_Python_UnpackTuple(args, "SimulationResult_name_of_axis", 0, 3, argv))) SWIG_fail;
--argc;
if (argc == 2) {
int _v = 0;
@@ -37380,7 +37380,7 @@ SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis(PyObject *self, PyObject
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_SimulationResult_nameOfAxis__SWIG_1(self, argc, argv);
+ return _wrap_SimulationResult_name_of_axis__SWIG_1(self, argc, argv);
}
}
}
@@ -37400,17 +37400,17 @@ SWIGINTERN PyObject *_wrap_SimulationResult_nameOfAxis(PyObject *self, PyObject
_v = SWIG_CheckState(res);
}
if (_v) {
- return _wrap_SimulationResult_nameOfAxis__SWIG_0(self, argc, argv);
+ return _wrap_SimulationResult_name_of_axis__SWIG_0(self, argc, argv);
}
}
}
}
fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_nameOfAxis'.\n"
+ SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'SimulationResult_name_of_axis'.\n"
" Possible C/C++ prototypes are:\n"
- " SimulationResult::nameOfAxis(size_t,Coords) const\n"
- " SimulationResult::nameOfAxis(size_t) const\n");
+ " SimulationResult::name_of_axis(size_t,Coords) const\n"
+ " SimulationResult::name_of_axis(size_t) const\n");
return 0;
}
@@ -38780,7 +38780,7 @@ static PyMethodDef SwigMethods[] = {
{ "delete_SimulationResult", _wrap_delete_SimulationResult, METH_O, "delete_SimulationResult(SimulationResult self)"},
{ "SimulationResult_extracted_field", _wrap_SimulationResult_extracted_field, METH_O, "SimulationResult_extracted_field(SimulationResult self) -> Datafield"},
{ "SimulationResult_axisMinMax", _wrap_SimulationResult_axisMinMax, METH_VARARGS, "SimulationResult_axisMinMax(SimulationResult self, size_t i, Coords units=UNDEFINED) -> pvacuum_double_t"},
- { "SimulationResult_nameOfAxis", _wrap_SimulationResult_nameOfAxis, METH_VARARGS, "SimulationResult_nameOfAxis(SimulationResult self, size_t i, Coords units=UNDEFINED) -> std::string"},
+ { "SimulationResult_name_of_axis", _wrap_SimulationResult_name_of_axis, METH_VARARGS, "SimulationResult_name_of_axis(SimulationResult self, size_t i, Coords units=UNDEFINED) -> std::string"},
{ "SimulationResult_array", _wrap_SimulationResult_array, METH_VARARGS, "SimulationResult_array(SimulationResult self, Coords units=UNDEFINED) -> PyObject"},
{ "SimulationResult_convertedBinCenters", _wrap_SimulationResult_convertedBinCenters, METH_VARARGS, "\n"
"SimulationResult_convertedBinCenters(SimulationResult self, Coords units=UNDEFINED) -> vdouble1d_t\n"