From 8850bdaa995100d46b01cb958d9744ecb8cab7c2 Mon Sep 17 00:00:00 2001
From: Gennady Pospelov <g.pospelov@fz-juelich.de>
Date: Tue, 25 Oct 2016 13:50:42 +0200
Subject: [PATCH] Renaming in DetectorMask methods.
---
Core/Export/ExportToPython.cpp | 4 +-
Core/Instrument/DetectorMask.cpp | 13 ++--
Core/Instrument/DetectorMask.h | 8 +--
Core/Instrument/IDetector2D.cpp | 8 +--
Core/Instrument/IDetector2D.h | 3 +-
GUI/coregui/Models/TransformFromDomain.cpp | 4 +-
Tests/UnitTests/Core/3/DetectorMaskTest.h | 28 ++++----
.../UnitTests/Core/3/SphericalDetectorTest.h | 4 +-
auto/Wrap/libBornAgainCore.py | 44 ++++---------
auto/Wrap/libBornAgainCore_wrap.cpp | 66 +++++++------------
10 files changed, 71 insertions(+), 111 deletions(-)
diff --git a/Core/Export/ExportToPython.cpp b/Core/Export/ExportToPython.cpp
index 29c6e828c6c..425d130ded9 100644
--- a/Core/Export/ExportToPython.cpp
+++ b/Core/Export/ExportToPython.cpp
@@ -757,9 +757,9 @@ std::string ExportToPython::defineMasks(const GISASSimulation* simulation) const
const IDetector2D* detector = simulation->getInstrument().getDetector();
const DetectorMask* detectorMask = detector->getDetectorMask();
- if(detectorMask && detectorMask->getNumberOfMasks()) {
+ if(detectorMask && detectorMask->numberOfMasks()) {
result << "\n";
- for(size_t i_mask=0; i_mask<detectorMask->getNumberOfMasks(); ++i_mask) {
+ for(size_t i_mask=0; i_mask<detectorMask->numberOfMasks(); ++i_mask) {
bool mask_value(false);
const Geometry::IShape2D* shape = detectorMask->getMaskShape(i_mask, mask_value);
result << representShape2D(indent(), shape, mask_value, printFunc(detector));
diff --git a/Core/Instrument/DetectorMask.cpp b/Core/Instrument/DetectorMask.cpp
index c56916b6405..3eaab05c5c7 100644
--- a/Core/Instrument/DetectorMask.cpp
+++ b/Core/Instrument/DetectorMask.cpp
@@ -80,11 +80,14 @@ void DetectorMask::initMaskData(const OutputData<double>& data)
process_masks();
}
-bool DetectorMask::getMask(size_t index) const
+bool DetectorMask::isMasked(size_t index) const
{
if(!m_mask_data.isInitialized())
- throw Exceptions::LogicErrorException(
- "DetectorMask::getMask() -> Error. Masks are not initialized");
+ return false;
+
+ if(index >= m_mask_data.getAllocatedSize())
+ throw Exceptions::RuntimeErrorException("DetectorMask::getMask() -> Error. "
+ "Index is out of range "+std::to_string(index));
return m_mask_data[index];
}
@@ -104,14 +107,14 @@ void DetectorMask::removeMasks()
m_mask_data.clear();
}
-size_t DetectorMask::getNumberOfMasks() const
+size_t DetectorMask::numberOfMasks() const
{
return m_shapes.size();
}
const Geometry::IShape2D* DetectorMask::getMaskShape(size_t mask_index, bool& mask_value) const
{
- if(mask_index >= getNumberOfMasks())
+ if(mask_index >= numberOfMasks())
return nullptr;
mask_value = m_mask_of_shape[mask_index];
return m_shapes[mask_index];
diff --git a/Core/Instrument/DetectorMask.h b/Core/Instrument/DetectorMask.h
index 25bc8ae0799..8e4f2808fce 100644
--- a/Core/Instrument/DetectorMask.h
+++ b/Core/Instrument/DetectorMask.h
@@ -44,7 +44,7 @@ public:
void initMaskData(const OutputData<double>& data);
- bool getMask(size_t index) const;
+ bool isMasked(size_t index) const;
const OutputData<bool>* getMaskData() const { return &m_mask_data; }
@@ -54,11 +54,11 @@ public:
void removeMasks();
//! returns true if has masks
- bool hasMasks() const { return getNumberOfMasks()>0; }
+ bool hasMasks() const { return numberOfMasks()>0; }
- int getNumberOfMaskedChannels() const { return m_number_of_masked_channels; }
+ int numberOfMaskedChannels() const { return m_number_of_masked_channels; }
- size_t getNumberOfMasks() const;
+ size_t numberOfMasks() const;
const Geometry::IShape2D* getMaskShape(size_t mask_index, bool& mask_value) const;
diff --git a/Core/Instrument/IDetector2D.cpp b/Core/Instrument/IDetector2D.cpp
index cfcba9c9d9f..ace4686ca56 100644
--- a/Core/Instrument/IDetector2D.cpp
+++ b/Core/Instrument/IDetector2D.cpp
@@ -177,10 +177,10 @@ const DetectorMask *IDetector2D::getDetectorMask() const
return &m_detector_mask;
}
-int IDetector2D::getNumberOfMaskedChannels() const
+size_t IDetector2D::numberOfMaskedChannels() const
{
if (getDetectorMask()) {
- return getDetectorMask()->getNumberOfMaskedChannels();
+ return getDetectorMask()->numberOfMaskedChannels();
} else {
return 0;
}
@@ -188,9 +188,7 @@ int IDetector2D::getNumberOfMaskedChannels() const
bool IDetector2D::isMasked(size_t index) const
{
- if (!m_detector_mask.getMaskData()->isInitialized())
- return false;
- return m_detector_mask.getMask(index);
+ return m_detector_mask.isMasked(index);
}
bool IDetector2D::hasMasks() const
diff --git a/Core/Instrument/IDetector2D.h b/Core/Instrument/IDetector2D.h
index 8660c413ea6..fda8d9ce660 100644
--- a/Core/Instrument/IDetector2D.h
+++ b/Core/Instrument/IDetector2D.h
@@ -95,8 +95,7 @@ public:
const DetectorMask* getDetectorMask() const;
- int getNumberOfMaskedChannels() const;
-
+ size_t numberOfMaskedChannels() const;
bool isMasked(size_t index) const;
diff --git a/GUI/coregui/Models/TransformFromDomain.cpp b/GUI/coregui/Models/TransformFromDomain.cpp
index 410bd35c7aa..83a39a010c7 100644
--- a/GUI/coregui/Models/TransformFromDomain.cpp
+++ b/GUI/coregui/Models/TransformFromDomain.cpp
@@ -440,10 +440,10 @@ void TransformFromDomain::setDetectorMasks(DetectorItem* detectorItem, const GIS
const IDetector2D* detector = simulation.getInstrument().getDetector();
const DetectorMask* detectorMask = detector->getDetectorMask();
- if(detectorMask && detectorMask->getNumberOfMasks()) {
+ if(detectorMask && detectorMask->numberOfMasks()) {
MaskContainerItem* containerItem = new MaskContainerItem();
detectorItem->insertItem(-1, containerItem);
- for(size_t i_mask=0; i_mask<detectorMask->getNumberOfMasks(); ++i_mask) {
+ for(size_t i_mask=0; i_mask<detectorMask->numberOfMasks(); ++i_mask) {
bool mask_value(false);
const Geometry::IShape2D* shape = detectorMask->getMaskShape(i_mask, mask_value);
if(const Geometry::Ellipse* ellipse = dynamic_cast<const Geometry::Ellipse*>(shape)) {
diff --git a/Tests/UnitTests/Core/3/DetectorMaskTest.h b/Tests/UnitTests/Core/3/DetectorMaskTest.h
index ed63c3caa6d..0d7915f257a 100644
--- a/Tests/UnitTests/Core/3/DetectorMaskTest.h
+++ b/Tests/UnitTests/Core/3/DetectorMaskTest.h
@@ -15,7 +15,7 @@ public:
TEST_F(DetectorMaskTest, InitialState)
{
DetectorMask test;
- EXPECT_THROW(test.getMask(0), Exceptions::LogicErrorException);
+ EXPECT_FALSE(test.isMasked(0));
EXPECT_FALSE(test.getMaskData()->isInitialized());
}
@@ -57,22 +57,22 @@ TEST_F(DetectorMaskTest, AddMask)
double x = detectorMask.getMaskData()->getAxisValue(index, 0);
double y = detectorMask.getMaskData()->getAxisValue(index, 1);
if( x>= -4.0 && x <=4.0 && y>=-2.0 && y<=2.0) {
- EXPECT_TRUE(detectorMask.getMask(index));
+ EXPECT_TRUE(detectorMask.isMasked(index));
} else {
- EXPECT_FALSE(detectorMask.getMask(index));
+ EXPECT_FALSE(detectorMask.isMasked(index));
}
}
- EXPECT_EQ(detectorMask.getNumberOfMaskedChannels(), 32);
+ EXPECT_EQ(detectorMask.numberOfMaskedChannels(), 32);
// adding second mask of same size which discard previous one
detectorMask.addMask(polygon, false);
detectorMask.initMaskData(detector);
for(size_t index=0; index<detectorMask.getMaskData()->getAllocatedSize(); ++index) {
- EXPECT_FALSE(detectorMask.getMask(index));
+ EXPECT_FALSE(detectorMask.isMasked(index));
}
- EXPECT_EQ(detectorMask.getNumberOfMaskedChannels(), 0);
+ EXPECT_EQ(detectorMask.numberOfMaskedChannels(), 0);
// adding third mask
x = {5.0, 5.0, 8.0, 8.0, 5.0};
@@ -84,9 +84,9 @@ TEST_F(DetectorMaskTest, AddMask)
double x = detectorMask.getMaskData()->getAxisValue(index, 0);
double y = detectorMask.getMaskData()->getAxisValue(index, 1);
if( x>= 5.0 && x <=8.0 && y>=2.0 && y<=4.0) {
- EXPECT_TRUE(detectorMask.getMask(index));
+ EXPECT_TRUE(detectorMask.isMasked(index));
} else {
- EXPECT_FALSE(detectorMask.getMask(index));
+ EXPECT_FALSE(detectorMask.isMasked(index));
}
}
@@ -94,7 +94,7 @@ TEST_F(DetectorMaskTest, AddMask)
detectorMask.removeMasks();
detectorMask.initMaskData(detector);
for(size_t index=0; index<detectorMask.getMaskData()->getAllocatedSize(); ++index) {
- EXPECT_FALSE(detectorMask.getMask(index));
+ EXPECT_FALSE(detectorMask.isMasked(index));
}
}
@@ -124,12 +124,12 @@ TEST_F(DetectorMaskTest, AssignmentOperator)
double x = mask.getMaskData()->getAxisValue(index, 0);
double y = mask.getMaskData()->getAxisValue(index, 1);
if( x>= -4.0 && x <=4.0 && y>=-2.0 && y<=2.0) {
- EXPECT_TRUE(mask.getMask(index));
+ EXPECT_TRUE(mask.isMasked(index));
} else {
- EXPECT_FALSE(mask.getMask(index));
+ EXPECT_FALSE(mask.isMasked(index));
}
}
- EXPECT_EQ(mask.getNumberOfMaskedChannels(), 32);
+ EXPECT_EQ(mask.numberOfMaskedChannels(), 32);
}
@@ -158,9 +158,9 @@ TEST_F(DetectorMaskTest, CopyConstructor)
double x = mask.getMaskData()->getAxisValue(index, 0);
double y = mask.getMaskData()->getAxisValue(index, 1);
if( x>= -4.0 && x <=4.0 && y>=-2.0 && y<=2.0) {
- EXPECT_TRUE(mask.getMask(index));
+ EXPECT_TRUE(mask.isMasked(index));
} else {
- EXPECT_FALSE(mask.getMask(index));
+ EXPECT_FALSE(mask.isMasked(index));
}
}
}
diff --git a/Tests/UnitTests/Core/3/SphericalDetectorTest.h b/Tests/UnitTests/Core/3/SphericalDetectorTest.h
index 3c0014c2e97..80f1c8128c2 100644
--- a/Tests/UnitTests/Core/3/SphericalDetectorTest.h
+++ b/Tests/UnitTests/Core/3/SphericalDetectorTest.h
@@ -40,7 +40,7 @@ TEST_F(SphericalDetectorTest, initialState)
// masks
EXPECT_FALSE(detector.hasMasks());
- EXPECT_EQ(0, detector.getNumberOfMaskedChannels());
+ EXPECT_EQ(0, detector.numberOfMaskedChannels());
// resolution function
EXPECT_EQ(nullptr, detector.getDetectorResolutionFunction());
@@ -351,7 +351,7 @@ TEST_F(SphericalDetectorTest, Clone)
EXPECT_EQ(std::string("ConvolutionDetectorResolution"),
clone->getDetectorResolutionFunction()->getName());
- EXPECT_EQ(clone->getNumberOfMaskedChannels(), 8);
+ EXPECT_EQ(clone->numberOfMaskedChannels(), 8);
// checking iteration over the map of cloned detector
SimulationArea area(clone.get());
diff --git a/auto/Wrap/libBornAgainCore.py b/auto/Wrap/libBornAgainCore.py
index 9f065a65949..af361537ab7 100644
--- a/auto/Wrap/libBornAgainCore.py
+++ b/auto/Wrap/libBornAgainCore.py
@@ -8110,14 +8110,9 @@ class DetectorMask(_object):
return _libBornAgainCore.DetectorMask_initMaskData(self, *args)
- def getMask(self, index):
- """
- getMask(DetectorMask self, size_t index) -> bool
-
- bool DetectorMask::getMask(size_t index) const
-
- """
- return _libBornAgainCore.DetectorMask_getMask(self, index)
+ def isMasked(self, index):
+ """isMasked(DetectorMask self, size_t index) -> bool"""
+ return _libBornAgainCore.DetectorMask_isMasked(self, index)
def getMaskData(self):
@@ -8164,24 +8159,14 @@ class DetectorMask(_object):
return _libBornAgainCore.DetectorMask_hasMasks(self)
- def getNumberOfMaskedChannels(self):
- """
- getNumberOfMaskedChannels(DetectorMask self) -> int
-
- int DetectorMask::getNumberOfMaskedChannels() const
+ def numberOfMaskedChannels(self):
+ """numberOfMaskedChannels(DetectorMask self) -> int"""
+ return _libBornAgainCore.DetectorMask_numberOfMaskedChannels(self)
- """
- return _libBornAgainCore.DetectorMask_getNumberOfMaskedChannels(self)
-
- def getNumberOfMasks(self):
- """
- getNumberOfMasks(DetectorMask self) -> size_t
-
- size_t DetectorMask::getNumberOfMasks() const
-
- """
- return _libBornAgainCore.DetectorMask_getNumberOfMasks(self)
+ def numberOfMasks(self):
+ """numberOfMasks(DetectorMask self) -> size_t"""
+ return _libBornAgainCore.DetectorMask_numberOfMasks(self)
def getMaskShape(self, mask_index, mask_value):
@@ -16966,14 +16951,9 @@ class IDetector2D(ICloneable, IParameterized):
return _libBornAgainCore.IDetector2D_getDetectorMask(self)
- def getNumberOfMaskedChannels(self):
- """
- getNumberOfMaskedChannels(IDetector2D self) -> int
-
- int IDetector2D::getNumberOfMaskedChannels() const
-
- """
- return _libBornAgainCore.IDetector2D_getNumberOfMaskedChannels(self)
+ def numberOfMaskedChannels(self):
+ """numberOfMaskedChannels(IDetector2D self) -> size_t"""
+ return _libBornAgainCore.IDetector2D_numberOfMaskedChannels(self)
def isMasked(self, index):
diff --git a/auto/Wrap/libBornAgainCore_wrap.cpp b/auto/Wrap/libBornAgainCore_wrap.cpp
index 1b199051482..df17e06b5cb 100644
--- a/auto/Wrap/libBornAgainCore_wrap.cpp
+++ b/auto/Wrap/libBornAgainCore_wrap.cpp
@@ -50646,7 +50646,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DetectorMask_getMask(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DetectorMask_isMasked(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DetectorMask *arg1 = (DetectorMask *) 0 ;
size_t arg2 ;
@@ -50658,18 +50658,18 @@ SWIGINTERN PyObject *_wrap_DetectorMask_getMask(PyObject *SWIGUNUSEDPARM(self),
PyObject * obj1 = 0 ;
bool result;
- if (!PyArg_ParseTuple(args,(char *)"OO:DetectorMask_getMask",&obj0,&obj1)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"OO:DetectorMask_isMasked",&obj0,&obj1)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_getMask" "', argument " "1"" of type '" "DetectorMask const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_isMasked" "', argument " "1"" of type '" "DetectorMask const *""'");
}
arg1 = reinterpret_cast< DetectorMask * >(argp1);
ecode2 = SWIG_AsVal_size_t(obj1, &val2);
if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DetectorMask_getMask" "', argument " "2"" of type '" "size_t""'");
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "DetectorMask_isMasked" "', argument " "2"" of type '" "size_t""'");
}
arg2 = static_cast< size_t >(val2);
- result = (bool)((DetectorMask const *)arg1)->getMask(arg2);
+ result = (bool)((DetectorMask const *)arg1)->isMasked(arg2);
resultobj = SWIG_From_bool(static_cast< bool >(result));
return resultobj;
fail:
@@ -50764,7 +50764,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DetectorMask_getNumberOfMaskedChannels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DetectorMask_numberOfMaskedChannels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DetectorMask *arg1 = (DetectorMask *) 0 ;
void *argp1 = 0 ;
@@ -50772,13 +50772,13 @@ SWIGINTERN PyObject *_wrap_DetectorMask_getNumberOfMaskedChannels(PyObject *SWIG
PyObject * obj0 = 0 ;
int result;
- if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_getNumberOfMaskedChannels",&obj0)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_numberOfMaskedChannels",&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_getNumberOfMaskedChannels" "', argument " "1"" of type '" "DetectorMask const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_numberOfMaskedChannels" "', argument " "1"" of type '" "DetectorMask const *""'");
}
arg1 = reinterpret_cast< DetectorMask * >(argp1);
- result = (int)((DetectorMask const *)arg1)->getNumberOfMaskedChannels();
+ result = (int)((DetectorMask const *)arg1)->numberOfMaskedChannels();
resultobj = SWIG_From_int(static_cast< int >(result));
return resultobj;
fail:
@@ -50786,7 +50786,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_DetectorMask_getNumberOfMasks(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_DetectorMask_numberOfMasks(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
DetectorMask *arg1 = (DetectorMask *) 0 ;
void *argp1 = 0 ;
@@ -50794,13 +50794,13 @@ SWIGINTERN PyObject *_wrap_DetectorMask_getNumberOfMasks(PyObject *SWIGUNUSEDPAR
PyObject * obj0 = 0 ;
size_t result;
- if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_getNumberOfMasks",&obj0)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"O:DetectorMask_numberOfMasks",&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_DetectorMask, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_getNumberOfMasks" "', argument " "1"" of type '" "DetectorMask const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "DetectorMask_numberOfMasks" "', argument " "1"" of type '" "DetectorMask const *""'");
}
arg1 = reinterpret_cast< DetectorMask * >(argp1);
- result = ((DetectorMask const *)arg1)->getNumberOfMasks();
+ result = ((DetectorMask const *)arg1)->numberOfMasks();
resultobj = SWIG_From_size_t(static_cast< size_t >(result));
return resultobj;
fail:
@@ -75834,22 +75834,22 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IDetector2D_getNumberOfMaskedChannels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDetector2D_numberOfMaskedChannels(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IDetector2D *arg1 = (IDetector2D *) 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
- int result;
+ size_t result;
- if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_getNumberOfMaskedChannels",&obj0)) SWIG_fail;
+ if (!PyArg_ParseTuple(args,(char *)"O:IDetector2D_numberOfMaskedChannels",&obj0)) SWIG_fail;
res1 = SWIG_ConvertPtr(obj0, &argp1,SWIGTYPE_p_IDetector2D, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_getNumberOfMaskedChannels" "', argument " "1"" of type '" "IDetector2D const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector2D_numberOfMaskedChannels" "', argument " "1"" of type '" "IDetector2D const *""'");
}
arg1 = reinterpret_cast< IDetector2D * >(argp1);
- result = (int)((IDetector2D const *)arg1)->getNumberOfMaskedChannels();
- resultobj = SWIG_From_int(static_cast< int >(result));
+ result = ((IDetector2D const *)arg1)->numberOfMaskedChannels();
+ resultobj = SWIG_From_size_t(static_cast< size_t >(result));
return resultobj;
fail:
return NULL;
@@ -104286,12 +104286,7 @@ static PyMethodDef SwigMethods[] = {
"void DetectorMask::initMaskData(const OutputData< double > &data)\n"
"\n"
""},
- { (char *)"DetectorMask_getMask", _wrap_DetectorMask_getMask, METH_VARARGS, (char *)"\n"
- "DetectorMask_getMask(DetectorMask self, size_t index) -> bool\n"
- "\n"
- "bool DetectorMask::getMask(size_t index) const \n"
- "\n"
- ""},
+ { (char *)"DetectorMask_isMasked", _wrap_DetectorMask_isMasked, METH_VARARGS, (char *)"DetectorMask_isMasked(DetectorMask self, size_t index) -> bool"},
{ (char *)"DetectorMask_getMaskData", _wrap_DetectorMask_getMaskData, METH_VARARGS, (char *)"\n"
"DetectorMask_getMaskData(DetectorMask self) -> OutputData< bool > const *\n"
"\n"
@@ -104320,18 +104315,8 @@ static PyMethodDef SwigMethods[] = {
"returns true if has masks \n"
"\n"
""},
- { (char *)"DetectorMask_getNumberOfMaskedChannels", _wrap_DetectorMask_getNumberOfMaskedChannels, METH_VARARGS, (char *)"\n"
- "DetectorMask_getNumberOfMaskedChannels(DetectorMask self) -> int\n"
- "\n"
- "int DetectorMask::getNumberOfMaskedChannels() const \n"
- "\n"
- ""},
- { (char *)"DetectorMask_getNumberOfMasks", _wrap_DetectorMask_getNumberOfMasks, METH_VARARGS, (char *)"\n"
- "DetectorMask_getNumberOfMasks(DetectorMask self) -> size_t\n"
- "\n"
- "size_t DetectorMask::getNumberOfMasks() const \n"
- "\n"
- ""},
+ { (char *)"DetectorMask_numberOfMaskedChannels", _wrap_DetectorMask_numberOfMaskedChannels, METH_VARARGS, (char *)"DetectorMask_numberOfMaskedChannels(DetectorMask self) -> int"},
+ { (char *)"DetectorMask_numberOfMasks", _wrap_DetectorMask_numberOfMasks, METH_VARARGS, (char *)"DetectorMask_numberOfMasks(DetectorMask self) -> size_t"},
{ (char *)"DetectorMask_getMaskShape", _wrap_DetectorMask_getMaskShape, METH_VARARGS, (char *)"\n"
"DetectorMask_getMaskShape(DetectorMask self, size_t mask_index, bool & mask_value) -> IShape2D\n"
"\n"
@@ -108848,12 +108833,7 @@ static PyMethodDef SwigMethods[] = {
"const DetectorMask * IDetector2D::getDetectorMask() const \n"
"\n"
""},
- { (char *)"IDetector2D_getNumberOfMaskedChannels", _wrap_IDetector2D_getNumberOfMaskedChannels, METH_VARARGS, (char *)"\n"
- "IDetector2D_getNumberOfMaskedChannels(IDetector2D self) -> int\n"
- "\n"
- "int IDetector2D::getNumberOfMaskedChannels() const \n"
- "\n"
- ""},
+ { (char *)"IDetector2D_numberOfMaskedChannels", _wrap_IDetector2D_numberOfMaskedChannels, METH_VARARGS, (char *)"IDetector2D_numberOfMaskedChannels(IDetector2D self) -> size_t"},
{ (char *)"IDetector2D_isMasked", _wrap_IDetector2D_isMasked, METH_VARARGS, (char *)"\n"
"IDetector2D_isMasked(IDetector2D self, size_t index) -> bool\n"
"\n"
--
GitLab