diff --git a/Device/Instrument/Instrument.cpp b/GUI/Model/Device/Instrument.cpp
similarity index 95%
rename from Device/Instrument/Instrument.cpp
rename to GUI/Model/Device/Instrument.cpp
index cbadec1c6a0f0a0a1be0b2d7289da5044a69c417..57ebc412850e98e792e90dcf8b32b6ca55a02680 100644
--- a/Device/Instrument/Instrument.cpp
+++ b/GUI/Model/Device/Instrument.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Instrument/Instrument.cpp
+//! @file GUI/Model/Device/Instrument.cpp
//! @brief Implements class Instrument.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Device/Instrument/Instrument.h"
+#include "GUI/Model/Device/Instrument.h"
#include "Base/Element/PolMatrices.h"
#include "Base/Pixel/RectangularPixel.h"
#include "Device/Beam/Beam.h"
diff --git a/Device/Instrument/Instrument.h b/GUI/Model/Device/Instrument.h
similarity index 89%
rename from Device/Instrument/Instrument.h
rename to GUI/Model/Device/Instrument.h
index b8717b4a8214ccb1ef2f2fbb43eea00e5a8cc19d..0be144cf9a646c4b08b16756892f0a43bb9f9e78 100644
--- a/Device/Instrument/Instrument.h
+++ b/GUI/Model/Device/Instrument.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/Instrument/Instrument.h
+//! @file GUI/Model/Device/Instrument.h
//! @brief Defines class Instrument.
//!
//! @homepage http://www.bornagainproject.org
@@ -13,8 +13,8 @@
// ************************************************************************************************
#ifndef USER_API
-#ifndef BORNAGAIN_DEVICE_INSTRUMENT_INSTRUMENT_H
-#define BORNAGAIN_DEVICE_INSTRUMENT_INSTRUMENT_H
+#ifndef BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENT_H
+#define BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENT_H
#include "Param/Node/INode.h"
#include <heinz/Vectors3D.h>
@@ -54,5 +54,5 @@ protected:
std::unique_ptr<IDetector> m_detector;
};
-#endif // BORNAGAIN_DEVICE_INSTRUMENT_INSTRUMENT_H
+#endif // BORNAGAIN_GUI_MODEL_DEVICE_INSTRUMENT_H
#endif // USER_API
diff --git a/GUI/Model/Device/InstrumentItems.cpp b/GUI/Model/Device/InstrumentItems.cpp
index cd77db10c37675c00c5cd3e45b843b504324911f..3e79bc0eba55630636c0efdfe1e37b5754e74f57 100644
--- a/GUI/Model/Device/InstrumentItems.cpp
+++ b/GUI/Model/Device/InstrumentItems.cpp
@@ -20,7 +20,7 @@
#include "Device/Coord/CoordSystem2D.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
-#include "Device/Instrument/Instrument.h"
+#include "GUI/Model/Device/Instrument.h"
#include "GUI/Model/CatDevice/BackgroundItemCatalog.h"
#include "GUI/Model/CatDevice/DetectorItemCatalog.h"
#include "GUI/Model/CatDevice/InstrumentItemCatalog.h"
diff --git a/GUI/Model/Model/JobFunctions.cpp b/GUI/Model/Model/JobFunctions.cpp
index 6abf67b2133bb1a1d1d3976dae995cb894dc6931..bad5de3f67c819419b3b664cbc71485af04a2f61 100644
--- a/GUI/Model/Model/JobFunctions.cpp
+++ b/GUI/Model/Model/JobFunctions.cpp
@@ -14,7 +14,7 @@
#include "GUI/Model/Model/JobFunctions.h"
#include "Base/Util/Assert.h"
-#include "Device/Instrument/Instrument.h"
+#include "GUI/Model/Device/Instrument.h"
#include "GUI/Model/Data/Data1DViewItem.h"
#include "GUI/Model/Data/DataPropertyContainer.h"
#include "GUI/Model/Data/IntensityDataItem.h"
diff --git a/GUI/Model/To/DomainSimulationBuilder.cpp b/GUI/Model/To/DomainSimulationBuilder.cpp
index 18f8979a3cdceeaf71506a058dde22fd96f8deee..db786957dbf830a0b3a2989b02b9d8dc5ed516de 100644
--- a/GUI/Model/To/DomainSimulationBuilder.cpp
+++ b/GUI/Model/To/DomainSimulationBuilder.cpp
@@ -17,7 +17,7 @@
#include "Base/Util/Assert.h"
#include "Device/Beam/Beam.h"
#include "Device/Beam/IFootprintFactor.h"
-#include "Device/Instrument/Instrument.h"
+#include "GUI/Model/Device/Instrument.h"
#include "GUI/Model/Device/AxesItems.h"
#include "GUI/Model/Device/BackgroundItems.h"
#include "GUI/Model/Device/BeamAngleItems.h"
diff --git a/Tests/Unit/Sim/SpecularScanTest.cpp b/Tests/Unit/Sim/SpecularScanTest.cpp
index 6c6d87fc70d9239f46643a8bf677620d35a0dc10..f54c489a47d28a73d31b2e9094ad2e5206d79fd0 100644
--- a/Tests/Unit/Sim/SpecularScanTest.cpp
+++ b/Tests/Unit/Sim/SpecularScanTest.cpp
@@ -1,7 +1,6 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Axis/PointwiseAxis.h"
#include "Device/Beam/FootprintGauss.h"
-#include "Device/Instrument/Instrument.h"
#include "Param/Distrib/RangedDistributions.h"
#include "Resample/Element/SpecularElement.h"
#include "Resample/Slice/SliceStack.h"
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index 31f332cc43b633b36584316f2d3800f12dc8adc7..73721b2d4472286180482e18080fde7470608256 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -34,7 +34,6 @@
#include "Device/Histo/Histogram2D.h"
#include "Device/Histo/IOFactory.h"
#include "Device/Histo/SimulationResult.h"
-#include "Device/Instrument/Instrument.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
@@ -88,8 +87,6 @@
%include "Device/Detector/RectangularDetector.h"
%include "Device/Detector/SphericalDetector.h"
-%include "Device/Instrument/Instrument.h"
-
%include "Device/Histo/HistoUtils.h"
%include "Device/Histo/IHistogram.h"
%include "Device/Histo/Histogram1D.h"
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 689ce8e1bb827954d02245cce9bac012832b6487..28465d4ea6df848027250eb878e8b43dd558cd45 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -4223,86 +4223,6 @@ class SphericalDetector(IDetector2D):
# Register SphericalDetector in _libBornAgainDevice:
_libBornAgainDevice.SphericalDetector_swigregister(SphericalDetector)
-class Instrument(libBornAgainParam.INode):
- r"""
-
-
- Assembles beam, detector and their relative positions with respect to the sample.
-
- C++ includes: Instrument.h
-
- """
-
- thisown = property(lambda x: x.this.own(), lambda x, v: x.this.own(v), doc="The membership flag")
- __repr__ = _swig_repr
-
- def __init__(self, *args):
- r"""
- __init__(Instrument self) -> Instrument
- __init__(Instrument self, Beam beam, IDetector detector) -> Instrument
- __init__(Instrument self, Instrument other) -> Instrument
- Instrument::Instrument(const Instrument &other)
-
- """
- _libBornAgainDevice.Instrument_swiginit(self, _libBornAgainDevice.new_Instrument(*args))
- __swig_destroy__ = _libBornAgainDevice.delete_Instrument
-
- def className(self):
- r"""
- className(Instrument self) -> std::string
- std::string Instrument::className() const final
-
- """
- return _libBornAgainDevice.Instrument_className(self)
-
- def beam(self, *args):
- r"""
- beam(Instrument self) -> Beam
- beam(Instrument self) -> Beam
- const Beam& Instrument::beam() const
-
- """
- return _libBornAgainDevice.Instrument_beam(self, *args)
-
- def getDetector(self, *args):
- r"""
- getDetector(Instrument self) -> IDetector
- getDetector(Instrument self) -> IDetector
- const IDetector * Instrument::getDetector() const
-
- """
- return _libBornAgainDevice.Instrument_getDetector(self, *args)
-
- def detector(self, *args):
- r"""
- detector(Instrument self) -> IDetector
- detector(Instrument self) -> IDetector
- const IDetector & Instrument::detector() const
-
- """
- return _libBornAgainDevice.Instrument_detector(self, *args)
-
- def setDetector(self, detector):
- r"""
- setDetector(Instrument self, IDetector detector)
- void Instrument::setDetector(const IDetector &detector)
-
- Sets the detector (axes can be overwritten later)
-
- """
- return _libBornAgainDevice.Instrument_setDetector(self, detector)
-
- def nodeChildren(self):
- r"""
- nodeChildren(Instrument self) -> std::vector< INode const *,std::allocator< INode const * > >
- std::vector< const INode * > Instrument::nodeChildren() const override
-
- """
- return _libBornAgainDevice.Instrument_nodeChildren(self)
-
-# Register Instrument in _libBornAgainDevice:
-_libBornAgainDevice.Instrument_swigregister(Instrument)
-
def FindPeaks(*args):
r"""
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 2bfcc0ccbe6b9f1dd8ded6a57da3fb9e73aa965a..d8e94d7b0ffc1580eeb1b951a88aaba3e145b17b 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -3123,87 +3123,86 @@ namespace Swig {
#define SWIGTYPE_p_IPixel swig_types[23]
#define SWIGTYPE_p_IResolutionFunction2D swig_types[24]
#define SWIGTYPE_p_IShape2D swig_types[25]
-#define SWIGTYPE_p_Instrument swig_types[26]
-#define SWIGTYPE_p_Line swig_types[27]
-#define SWIGTYPE_p_MaskPattern swig_types[28]
-#define SWIGTYPE_p_OwningVectorT_IAxis_t swig_types[29]
-#define SWIGTYPE_p_Polygon swig_types[30]
-#define SWIGTYPE_p_PolygonPrivate swig_types[31]
-#define SWIGTYPE_p_PowerfieldIteratorT_double_PowerfieldT_double_t_t swig_types[32]
-#define SWIGTYPE_p_PowerfieldIteratorT_double_const_PowerfieldT_double_t_const_t swig_types[33]
-#define SWIGTYPE_p_PowerfieldT_CumulativeValue_t swig_types[34]
-#define SWIGTYPE_p_PowerfieldT_bool_t swig_types[35]
-#define SWIGTYPE_p_PowerfieldT_double_t swig_types[36]
-#define SWIGTYPE_p_RealLimits swig_types[37]
-#define SWIGTYPE_p_Rectangle swig_types[38]
-#define SWIGTYPE_p_RectangularDetector swig_types[39]
-#define SWIGTYPE_p_RectangularPixel swig_types[40]
-#define SWIGTYPE_p_ResolutionFunction2DGaussian swig_types[41]
-#define SWIGTYPE_p_SimulationResult swig_types[42]
-#define SWIGTYPE_p_SphericalDetector swig_types[43]
-#define SWIGTYPE_p_SpinMatrix swig_types[44]
-#define SWIGTYPE_p_Vec3T_double_t swig_types[45]
-#define SWIGTYPE_p_Vec3T_int_t swig_types[46]
-#define SWIGTYPE_p_Vec3T_std__complexT_double_t_t swig_types[47]
-#define SWIGTYPE_p_VerticalLine swig_types[48]
-#define SWIGTYPE_p_allocator_type swig_types[49]
-#define SWIGTYPE_p_char swig_types[50]
-#define SWIGTYPE_p_const_iterator swig_types[51]
-#define SWIGTYPE_p_corr_matrix_t swig_types[52]
-#define SWIGTYPE_p_difference_type swig_types[53]
-#define SWIGTYPE_p_double swig_types[54]
-#define SWIGTYPE_p_first_type swig_types[55]
-#define SWIGTYPE_p_int swig_types[56]
-#define SWIGTYPE_p_iterator swig_types[57]
-#define SWIGTYPE_p_key_type swig_types[58]
-#define SWIGTYPE_p_long_long swig_types[59]
-#define SWIGTYPE_p_mapped_type swig_types[60]
-#define SWIGTYPE_p_p_ICoordSystem swig_types[61]
-#define SWIGTYPE_p_p_PyObject swig_types[62]
-#define SWIGTYPE_p_parameters_t swig_types[63]
-#define SWIGTYPE_p_second_type swig_types[64]
-#define SWIGTYPE_p_short swig_types[65]
-#define SWIGTYPE_p_signed_char swig_types[66]
-#define SWIGTYPE_p_size_type swig_types[67]
-#define SWIGTYPE_p_std__allocatorT_Vec3T_double_t_t swig_types[68]
-#define SWIGTYPE_p_std__allocatorT_double_t swig_types[69]
-#define SWIGTYPE_p_std__allocatorT_int_t swig_types[70]
-#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[71]
-#define SWIGTYPE_p_std__allocatorT_std__pairT_double_double_t_t swig_types[72]
-#define SWIGTYPE_p_std__allocatorT_std__pairT_std__string_const_double_t_t swig_types[73]
-#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[74]
-#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[75]
-#define SWIGTYPE_p_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t swig_types[76]
-#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[77]
-#define SWIGTYPE_p_std__complexT_double_t swig_types[78]
-#define SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t swig_types[79]
-#define SWIGTYPE_p_std__invalid_argument swig_types[80]
-#define SWIGTYPE_p_std__lessT_std__string_t swig_types[81]
-#define SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t swig_types[82]
-#define SWIGTYPE_p_std__pairT_double_double_t swig_types[83]
-#define SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t swig_types[84]
-#define SWIGTYPE_p_std__vectorT_IAxis_p_std__allocatorT_IAxis_p_t_t swig_types[85]
-#define SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t swig_types[86]
-#define SWIGTYPE_p_std__vectorT_ParaMeta_std__allocatorT_ParaMeta_t_t swig_types[87]
-#define SWIGTYPE_p_std__vectorT_Vec3T_double_t_std__allocatorT_Vec3T_double_t_t_t swig_types[88]
-#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[89]
-#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[90]
-#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[91]
-#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[92]
-#define SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t swig_types[93]
-#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[94]
-#define SWIGTYPE_p_std__vectorT_std__unique_ptrT_DiffuseElement_t_std__allocatorT_std__unique_ptrT_DiffuseElement_t_t_t swig_types[95]
-#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[96]
-#define SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t swig_types[97]
-#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[98]
-#define SWIGTYPE_p_swig__SwigPyIterator swig_types[99]
-#define SWIGTYPE_p_unsigned_char swig_types[100]
-#define SWIGTYPE_p_unsigned_int swig_types[101]
-#define SWIGTYPE_p_unsigned_long_long swig_types[102]
-#define SWIGTYPE_p_unsigned_short swig_types[103]
-#define SWIGTYPE_p_value_type swig_types[104]
-static swig_type_info *swig_types[106];
-static swig_module_info swig_module = {swig_types, 105, 0, 0, 0, 0};
+#define SWIGTYPE_p_Line swig_types[26]
+#define SWIGTYPE_p_MaskPattern swig_types[27]
+#define SWIGTYPE_p_OwningVectorT_IAxis_t swig_types[28]
+#define SWIGTYPE_p_Polygon swig_types[29]
+#define SWIGTYPE_p_PolygonPrivate swig_types[30]
+#define SWIGTYPE_p_PowerfieldIteratorT_double_PowerfieldT_double_t_t swig_types[31]
+#define SWIGTYPE_p_PowerfieldIteratorT_double_const_PowerfieldT_double_t_const_t swig_types[32]
+#define SWIGTYPE_p_PowerfieldT_CumulativeValue_t swig_types[33]
+#define SWIGTYPE_p_PowerfieldT_bool_t swig_types[34]
+#define SWIGTYPE_p_PowerfieldT_double_t swig_types[35]
+#define SWIGTYPE_p_RealLimits swig_types[36]
+#define SWIGTYPE_p_Rectangle swig_types[37]
+#define SWIGTYPE_p_RectangularDetector swig_types[38]
+#define SWIGTYPE_p_RectangularPixel swig_types[39]
+#define SWIGTYPE_p_ResolutionFunction2DGaussian swig_types[40]
+#define SWIGTYPE_p_SimulationResult swig_types[41]
+#define SWIGTYPE_p_SphericalDetector swig_types[42]
+#define SWIGTYPE_p_SpinMatrix swig_types[43]
+#define SWIGTYPE_p_Vec3T_double_t swig_types[44]
+#define SWIGTYPE_p_Vec3T_int_t swig_types[45]
+#define SWIGTYPE_p_Vec3T_std__complexT_double_t_t swig_types[46]
+#define SWIGTYPE_p_VerticalLine swig_types[47]
+#define SWIGTYPE_p_allocator_type swig_types[48]
+#define SWIGTYPE_p_char swig_types[49]
+#define SWIGTYPE_p_const_iterator swig_types[50]
+#define SWIGTYPE_p_corr_matrix_t swig_types[51]
+#define SWIGTYPE_p_difference_type swig_types[52]
+#define SWIGTYPE_p_double swig_types[53]
+#define SWIGTYPE_p_first_type swig_types[54]
+#define SWIGTYPE_p_int swig_types[55]
+#define SWIGTYPE_p_iterator swig_types[56]
+#define SWIGTYPE_p_key_type swig_types[57]
+#define SWIGTYPE_p_long_long swig_types[58]
+#define SWIGTYPE_p_mapped_type swig_types[59]
+#define SWIGTYPE_p_p_ICoordSystem swig_types[60]
+#define SWIGTYPE_p_p_PyObject swig_types[61]
+#define SWIGTYPE_p_parameters_t swig_types[62]
+#define SWIGTYPE_p_second_type swig_types[63]
+#define SWIGTYPE_p_short swig_types[64]
+#define SWIGTYPE_p_signed_char swig_types[65]
+#define SWIGTYPE_p_size_type swig_types[66]
+#define SWIGTYPE_p_std__allocatorT_Vec3T_double_t_t swig_types[67]
+#define SWIGTYPE_p_std__allocatorT_double_t swig_types[68]
+#define SWIGTYPE_p_std__allocatorT_int_t swig_types[69]
+#define SWIGTYPE_p_std__allocatorT_std__complexT_double_t_t swig_types[70]
+#define SWIGTYPE_p_std__allocatorT_std__pairT_double_double_t_t swig_types[71]
+#define SWIGTYPE_p_std__allocatorT_std__pairT_std__string_const_double_t_t swig_types[72]
+#define SWIGTYPE_p_std__allocatorT_std__string_t swig_types[73]
+#define SWIGTYPE_p_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t swig_types[74]
+#define SWIGTYPE_p_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t swig_types[75]
+#define SWIGTYPE_p_std__allocatorT_unsigned_long_t swig_types[76]
+#define SWIGTYPE_p_std__complexT_double_t swig_types[77]
+#define SWIGTYPE_p_std__functionT_void_fSimulationAreaIterator_const_RF_t swig_types[78]
+#define SWIGTYPE_p_std__invalid_argument swig_types[79]
+#define SWIGTYPE_p_std__lessT_std__string_t swig_types[80]
+#define SWIGTYPE_p_std__mapT_std__string_double_std__lessT_std__string_t_std__allocatorT_std__pairT_std__string_const_double_t_t_t swig_types[81]
+#define SWIGTYPE_p_std__pairT_double_double_t swig_types[82]
+#define SWIGTYPE_p_std__vectorT_AxisInfo_std__allocatorT_AxisInfo_t_t swig_types[83]
+#define SWIGTYPE_p_std__vectorT_IAxis_p_std__allocatorT_IAxis_p_t_t swig_types[84]
+#define SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t swig_types[85]
+#define SWIGTYPE_p_std__vectorT_ParaMeta_std__allocatorT_ParaMeta_t_t swig_types[86]
+#define SWIGTYPE_p_std__vectorT_Vec3T_double_t_std__allocatorT_Vec3T_double_t_t_t swig_types[87]
+#define SWIGTYPE_p_std__vectorT_double_std__allocatorT_double_t_t swig_types[88]
+#define SWIGTYPE_p_std__vectorT_int_std__allocatorT_int_t_t swig_types[89]
+#define SWIGTYPE_p_std__vectorT_size_t_std__allocatorT_size_t_t_t swig_types[90]
+#define SWIGTYPE_p_std__vectorT_std__complexT_double_t_std__allocatorT_std__complexT_double_t_t_t swig_types[91]
+#define SWIGTYPE_p_std__vectorT_std__pairT_double_double_t_std__allocatorT_std__pairT_double_double_t_t_t swig_types[92]
+#define SWIGTYPE_p_std__vectorT_std__string_std__allocatorT_std__string_t_t swig_types[93]
+#define SWIGTYPE_p_std__vectorT_std__unique_ptrT_DiffuseElement_t_std__allocatorT_std__unique_ptrT_DiffuseElement_t_t_t swig_types[94]
+#define SWIGTYPE_p_std__vectorT_std__vectorT_double_std__allocatorT_double_t_t_std__allocatorT_std__vectorT_double_std__allocatorT_double_t_t_t_t swig_types[95]
+#define SWIGTYPE_p_std__vectorT_std__vectorT_int_std__allocatorT_int_t_t_std__allocatorT_std__vectorT_int_std__allocatorT_int_t_t_t_t swig_types[96]
+#define SWIGTYPE_p_std__vectorT_unsigned_long_std__allocatorT_unsigned_long_t_t swig_types[97]
+#define SWIGTYPE_p_swig__SwigPyIterator swig_types[98]
+#define SWIGTYPE_p_unsigned_char swig_types[99]
+#define SWIGTYPE_p_unsigned_int swig_types[100]
+#define SWIGTYPE_p_unsigned_long_long swig_types[101]
+#define SWIGTYPE_p_unsigned_short swig_types[102]
+#define SWIGTYPE_p_value_type swig_types[103]
+static swig_type_info *swig_types[105];
+static swig_module_info swig_module = {swig_types, 104, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -6709,7 +6708,6 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Device/Histo/Histogram2D.h"
#include "Device/Histo/IOFactory.h"
#include "Device/Histo/SimulationResult.h"
-#include "Device/Instrument/Instrument.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
@@ -35687,465 +35685,6 @@ SWIGINTERN PyObject *SphericalDetector_swiginit(PyObject *SWIGUNUSEDPARM(self),
return SWIG_Python_InitShadowInstance(args);
}
-SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **SWIGUNUSEDPARM(swig_obj)) {
- PyObject *resultobj = 0;
- Instrument *result = 0 ;
-
- if ((nobjs < 0) || (nobjs > 0)) SWIG_fail;
- result = (Instrument *)new Instrument();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Instrument, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Beam *arg1 = 0 ;
- IDetector *arg2 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- Instrument *result = 0 ;
-
- if ((nobjs < 2) || (nobjs > 2)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Beam, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Instrument" "', argument " "1"" of type '" "Beam const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Instrument" "', argument " "1"" of type '" "Beam const &""'");
- }
- arg1 = reinterpret_cast< Beam * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDetector, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "new_Instrument" "', argument " "2"" of type '" "IDetector const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Instrument" "', argument " "2"" of type '" "IDetector const &""'");
- }
- arg2 = reinterpret_cast< IDetector * >(argp2);
- result = (Instrument *)new Instrument((Beam const &)*arg1,(IDetector const &)*arg2);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Instrument, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_Instrument__SWIG_2(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- Instrument *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1, SWIGTYPE_p_Instrument, 0 | 0);
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "new_Instrument" "', argument " "1"" of type '" "Instrument const &""'");
- }
- if (!argp1) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "new_Instrument" "', argument " "1"" of type '" "Instrument const &""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (Instrument *)new Instrument((Instrument const &)*arg1);
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Instrument, SWIG_POINTER_NEW | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_new_Instrument(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[3] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "new_Instrument", 0, 2, argv))) SWIG_fail;
- --argc;
- if (argc == 0) {
- return _wrap_new_Instrument__SWIG_0(self, argc, argv);
- }
- if (argc == 1) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Instrument, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_Instrument__SWIG_2(self, argc, argv);
- }
- }
- if (argc == 2) {
- int _v;
- int res = SWIG_ConvertPtr(argv[0], 0, SWIGTYPE_p_Beam, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_IDetector, SWIG_POINTER_NO_NULL | 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_new_Instrument__SWIG_1(self, argc, argv);
- }
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'new_Instrument'.\n"
- " Possible C/C++ prototypes are:\n"
- " Instrument::Instrument()\n"
- " Instrument::Instrument(Beam const &,IDetector const &)\n"
- " Instrument::Instrument(Instrument const &)\n");
- return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_delete_Instrument(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, SWIG_POINTER_DISOWN | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "delete_Instrument" "', argument " "1"" of type '" "Instrument *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- delete arg1;
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_className(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- std::string result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_className" "', argument " "1"" of type '" "Instrument const *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = ((Instrument const *)arg1)->className();
- resultobj = SWIG_From_std_string(static_cast< std::string >(result));
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_beam__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- Beam *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_beam" "', argument " "1"" of type '" "Instrument *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (Beam *) &(arg1)->beam();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Beam, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_beam__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- Beam *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_beam" "', argument " "1"" of type '" "Instrument const *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (Beam *) &((Instrument const *)arg1)->beam();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_Beam, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_beam(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "Instrument_beam", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_Instrument_beam__SWIG_0(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_Instrument_beam__SWIG_1(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Instrument_beam'.\n"
- " Possible C/C++ prototypes are:\n"
- " Instrument::beam()\n"
- " Instrument::beam() const\n");
- return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_getDetector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- IDetector *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetector" "', argument " "1"" of type '" "Instrument *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (IDetector *)(arg1)->getDetector();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IDetector, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_getDetector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- IDetector *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_getDetector" "', argument " "1"" of type '" "Instrument const *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (IDetector *)((Instrument const *)arg1)->getDetector();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IDetector, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_getDetector(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "Instrument_getDetector", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_Instrument_getDetector__SWIG_0(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_Instrument_getDetector__SWIG_1(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Instrument_getDetector'.\n"
- " Possible C/C++ prototypes are:\n"
- " Instrument::getDetector()\n"
- " Instrument::getDetector() const\n");
- return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_detector__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- IDetector *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_detector" "', argument " "1"" of type '" "Instrument *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (IDetector *) &(arg1)->detector();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IDetector, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_detector__SWIG_1(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- IDetector *result = 0 ;
-
- if ((nobjs < 1) || (nobjs > 1)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_detector" "', argument " "1"" of type '" "Instrument const *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = (IDetector *) &((Instrument const *)arg1)->detector();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_IDetector, 0 | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_detector(PyObject *self, PyObject *args) {
- Py_ssize_t argc;
- PyObject *argv[2] = {
- 0
- };
-
- if (!(argc = SWIG_Python_UnpackTuple(args, "Instrument_detector", 0, 1, argv))) SWIG_fail;
- --argc;
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_Instrument_detector__SWIG_0(self, argc, argv);
- }
- }
- if (argc == 1) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Instrument, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- return _wrap_Instrument_detector__SWIG_1(self, argc, argv);
- }
- }
-
-fail:
- SWIG_Python_RaiseOrModifyTypeError("Wrong number or type of arguments for overloaded function 'Instrument_detector'.\n"
- " Possible C/C++ prototypes are:\n"
- " Instrument::detector()\n"
- " Instrument::detector() const\n");
- return 0;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_setDetector(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- IDetector *arg2 = 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- PyObject *swig_obj[2] ;
-
- if (!SWIG_Python_UnpackTuple(args, "Instrument_setDetector", 2, 2, swig_obj)) SWIG_fail;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_setDetector" "', argument " "1"" of type '" "Instrument *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- res2 = SWIG_ConvertPtr(swig_obj[1], &argp2, SWIGTYPE_p_IDetector, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "Instrument_setDetector" "', argument " "2"" of type '" "IDetector const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "Instrument_setDetector" "', argument " "2"" of type '" "IDetector const &""'");
- }
- arg2 = reinterpret_cast< IDetector * >(argp2);
- (arg1)->setDetector((IDetector const &)*arg2);
- resultobj = SWIG_Py_Void();
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *_wrap_Instrument_nodeChildren(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *resultobj = 0;
- Instrument *arg1 = (Instrument *) 0 ;
- void *argp1 = 0 ;
- int res1 = 0 ;
- PyObject *swig_obj[1] ;
- SwigValueWrapper< std::vector< INode const *,std::allocator< INode const * > > > result;
-
- if (!args) SWIG_fail;
- swig_obj[0] = args;
- res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_Instrument, 0 | 0 );
- if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "Instrument_nodeChildren" "', argument " "1"" of type '" "Instrument const *""'");
- }
- arg1 = reinterpret_cast< Instrument * >(argp1);
- result = ((Instrument const *)arg1)->nodeChildren();
- resultobj = SWIG_NewPointerObj((new std::vector< INode const *,std::allocator< INode const * > >(static_cast< const std::vector< INode const *,std::allocator< INode const * > >& >(result))), SWIGTYPE_p_std__vectorT_INode_const_p_std__allocatorT_INode_const_p_t_t, SWIG_POINTER_OWN | 0 );
- return resultobj;
-fail:
- return NULL;
-}
-
-
-SWIGINTERN PyObject *Instrument_swigregister(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- PyObject *obj;
- if (!SWIG_Python_UnpackTuple(args, "swigregister", 1, 1, &obj)) return NULL;
- SWIG_TypeNewClientData(SWIGTYPE_p_Instrument, SWIG_NewClientData(obj));
- return SWIG_Py_Void();
-}
-
-SWIGINTERN PyObject *Instrument_swiginit(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
- return SWIG_Python_InitShadowInstance(args);
-}
-
SWIGINTERN PyObject *_wrap_FindPeaks__SWIG_0(PyObject *SWIGUNUSEDPARM(self), Py_ssize_t nobjs, PyObject **swig_obj) {
PyObject *resultobj = 0;
Histogram2D *arg1 = 0 ;
@@ -43267,55 +42806,6 @@ static PyMethodDef SwigMethods[] = {
""},
{ "SphericalDetector_swigregister", SphericalDetector_swigregister, METH_O, NULL},
{ "SphericalDetector_swiginit", SphericalDetector_swiginit, METH_VARARGS, NULL},
- { "new_Instrument", _wrap_new_Instrument, METH_VARARGS, "\n"
- "Instrument()\n"
- "Instrument(Beam beam, IDetector detector)\n"
- "new_Instrument(Instrument other) -> Instrument\n"
- "Instrument::Instrument(const Instrument &other)\n"
- "\n"
- ""},
- { "delete_Instrument", _wrap_delete_Instrument, METH_O, "\n"
- "delete_Instrument(Instrument self)\n"
- "Instrument::~Instrument() override\n"
- "\n"
- ""},
- { "Instrument_className", _wrap_Instrument_className, METH_O, "\n"
- "Instrument_className(Instrument self) -> std::string\n"
- "std::string Instrument::className() const final\n"
- "\n"
- ""},
- { "Instrument_beam", _wrap_Instrument_beam, METH_VARARGS, "\n"
- "Instrument_beam(Instrument self) -> Beam\n"
- "Instrument_beam(Instrument self) -> Beam\n"
- "const Beam& Instrument::beam() const\n"
- "\n"
- ""},
- { "Instrument_getDetector", _wrap_Instrument_getDetector, METH_VARARGS, "\n"
- "Instrument_getDetector(Instrument self) -> IDetector\n"
- "Instrument_getDetector(Instrument self) -> IDetector\n"
- "const IDetector * Instrument::getDetector() const\n"
- "\n"
- ""},
- { "Instrument_detector", _wrap_Instrument_detector, METH_VARARGS, "\n"
- "Instrument_detector(Instrument self) -> IDetector\n"
- "Instrument_detector(Instrument self) -> IDetector\n"
- "const IDetector & Instrument::detector() const\n"
- "\n"
- ""},
- { "Instrument_setDetector", _wrap_Instrument_setDetector, METH_VARARGS, "\n"
- "Instrument_setDetector(Instrument self, IDetector detector)\n"
- "void Instrument::setDetector(const IDetector &detector)\n"
- "\n"
- "Sets the detector (axes can be overwritten later) \n"
- "\n"
- ""},
- { "Instrument_nodeChildren", _wrap_Instrument_nodeChildren, METH_O, "\n"
- "Instrument_nodeChildren(Instrument self) -> std::vector< INode const *,std::allocator< INode const * > >\n"
- "std::vector< const INode * > Instrument::nodeChildren() const override\n"
- "\n"
- ""},
- { "Instrument_swigregister", Instrument_swigregister, METH_O, NULL},
- { "Instrument_swiginit", Instrument_swiginit, METH_VARARGS, NULL},
{ "FindPeaks", _wrap_FindPeaks, METH_VARARGS, "\n"
"FindPeaks(Histogram2D hist, double sigma=2, std::string const & option={}, double threshold=0.05) -> vector_pvacuum_double_t\n"
"std::vector< std::pair< double, double > > DataUtils::Histo::FindPeaks(const Histogram2D &hist, double sigma=2, const std::string &option={}, double threshold=0.05)\n"
@@ -43981,9 +43471,6 @@ static void *_p_FootprintSquareTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory
static void *_p_IDetectorResolutionTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) ((IDetectorResolution *) x));
}
-static void *_p_InstrumentTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
- return (void *)((INode *) ((Instrument *) x));
-}
static void *_p_IFootprintFactorTo_p_INode(void *x, int *SWIGUNUSEDPARM(newmemory)) {
return (void *)((INode *) ((IFootprintFactor *) x));
}
@@ -44094,7 +43581,6 @@ static swig_type_info _swigt__p_IOFactory = {"_p_IOFactory", "IOFactory *", 0, 0
static swig_type_info _swigt__p_IPixel = {"_p_IPixel", "IPixel *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IResolutionFunction2D = {"_p_IResolutionFunction2D", "IResolutionFunction2D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_IShape2D = {"_p_IShape2D", "IShape2D *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_Instrument = {"_p_Instrument", "Instrument *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Line = {"_p_Line", "Line *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_MaskPattern = {"_p_MaskPattern", "MaskPattern *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_OwningVectorT_IAxis_t = {"_p_OwningVectorT_IAxis_t", "OwningVector< IAxis > *", 0, 0, (void*)0, 0};
@@ -44201,7 +43687,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_IPixel,
&_swigt__p_IResolutionFunction2D,
&_swigt__p_IShape2D,
- &_swigt__p_Instrument,
&_swigt__p_Line,
&_swigt__p_MaskPattern,
&_swigt__p_OwningVectorT_IAxis_t,
@@ -44303,12 +43788,11 @@ static swig_cast_info _swigc__p_IDetector2D[] = { {&_swigt__p_RectangularDetect
static swig_cast_info _swigc__p_IDetectorResolution[] = { {&_swigt__p_IDetectorResolution, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IFootprintFactor[] = { {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_IFootprintFactor, 0, 0}, {&_swigt__p_IFootprintFactor, 0, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_IFootprintFactor, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IHistogram[] = { {&_swigt__p_IHistogram, 0, 0, 0}, {&_swigt__p_Histogram2D, _p_Histogram2DTo_p_IHistogram, 0, 0}, {&_swigt__p_Histogram1D, _p_Histogram1DTo_p_IHistogram, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_INode[] = { {&_swigt__p_INode, 0, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_INode, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_INode, 0, 0}, {&_swigt__p_Instrument, _p_InstrumentTo_p_INode, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_INode, 0, 0}, {&_swigt__p_Beam, _p_BeamTo_p_INode, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_INode, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_INode, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_INode, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_INode, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_INode, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_INode, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_INode, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_INode[] = { {&_swigt__p_INode, 0, 0, 0}, {&_swigt__p_FootprintSquare, _p_FootprintSquareTo_p_INode, 0, 0}, {&_swigt__p_IDetectorResolution, _p_IDetectorResolutionTo_p_INode, 0, 0}, {&_swigt__p_IFootprintFactor, _p_IFootprintFactorTo_p_INode, 0, 0}, {&_swigt__p_Beam, _p_BeamTo_p_INode, 0, 0}, {&_swigt__p_IResolutionFunction2D, _p_IResolutionFunction2DTo_p_INode, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_INode, 0, 0}, {&_swigt__p_IDetector, _p_IDetectorTo_p_INode, 0, 0}, {&_swigt__p_RectangularDetector, _p_RectangularDetectorTo_p_INode, 0, 0}, {&_swigt__p_SphericalDetector, _p_SphericalDetectorTo_p_INode, 0, 0}, {&_swigt__p_FootprintGauss, _p_FootprintGaussTo_p_INode, 0, 0}, {&_swigt__p_IDetector2D, _p_IDetector2DTo_p_INode, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IOFactory[] = { {&_swigt__p_IOFactory, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IPixel[] = { {&_swigt__p_IPixel, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IResolutionFunction2D[] = { {&_swigt__p_IResolutionFunction2D, 0, 0, 0}, {&_swigt__p_ResolutionFunction2DGaussian, _p_ResolutionFunction2DGaussianTo_p_IResolutionFunction2D, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_IShape2D[] = { {&_swigt__p_Polygon, _p_PolygonTo_p_IShape2D, 0, 0}, {&_swigt__p_Line, _p_LineTo_p_IShape2D, 0, 0}, {&_swigt__p_VerticalLine, _p_VerticalLineTo_p_IShape2D, 0, 0}, {&_swigt__p_Ellipse, _p_EllipseTo_p_IShape2D, 0, 0}, {&_swigt__p_HorizontalLine, _p_HorizontalLineTo_p_IShape2D, 0, 0}, {&_swigt__p_Rectangle, _p_RectangleTo_p_IShape2D, 0, 0}, {&_swigt__p_IShape2D, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_Instrument[] = { {&_swigt__p_Instrument, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Line[] = { {&_swigt__p_Line, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_MaskPattern[] = { {&_swigt__p_MaskPattern, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_OwningVectorT_IAxis_t[] = { {&_swigt__p_OwningVectorT_IAxis_t, 0, 0, 0},{0, 0, 0, 0}};
@@ -44415,7 +43899,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_IPixel,
_swigc__p_IResolutionFunction2D,
_swigc__p_IShape2D,
- _swigc__p_Instrument,
_swigc__p_Line,
_swigc__p_MaskPattern,
_swigc__p_OwningVectorT_IAxis_t,