DetectorMask + swig switch

Device/Mask/DetectorMask.cpp

@@ -75,6 +75,10 @@ Histogram2D* DetectorMask::createHistogram() const
     return dynamic_cast<Histogram2D*>(IHistogram::createHistogram(data));
 }
 
+bool DetectorMask::hasMasks() const {
+    return !m_shapes.empty();
+}
+
 size_t DetectorMask::numberOfMasks() const
 {
     return m_shapes.size();

Device/Mask/DetectorMask.h

@@ -15,14 +15,18 @@
 #ifndef BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
 #define BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
 
-#include "Base/Types/CloneableVector.h"
 #include "Device/Data/OutputData.h"
 #include "Device/Mask/IShape2D.h"
 
+#ifndef SWIG
+#include "Base/Types/CloneableVector.h"
+#endif
+
+class Histogram2D;
 class IAxis;
+
 template <class T>
 class OutputData;
-class Histogram2D;
 
 //! Collection of detector masks.
 //! @ingroup detector
@@ -49,7 +53,7 @@ public:
     Histogram2D* createHistogram() const;
 
     //! Returns true if has masks
-    bool hasMasks() const { return !m_shapes.empty(); }
+    bool hasMasks() const;
 
     int numberOfMaskedChannels() const { return m_number_of_masked_channels; }
 
@@ -60,7 +64,9 @@ public:
 private:
     void process_masks();
 
+#ifndef SWIG
     CloneableVector<IShape2D> m_shapes;
+#endif
     std::vector<bool> m_mask_of_shape;
     OutputData<bool> m_mask_data;
     int m_number_of_masked_channels;