From c748f34e985b838cfe398b0adbf7ad3e29429692 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 2 Aug 2021 15:58:52 +0200
Subject: [PATCH] detectionProperties -> analyzer
---
Core/Export/SimulationToPython.cpp | 6 +-
Core/Simulation/ISimulation.cpp | 2 +-
Core/Simulation/ISimulation2D.cpp | 2 +-
Device/Detector/DetectorContext.cpp | 2 +-
Device/Detector/IDetector.h | 2 +-
Device/Instrument/Instrument.cpp | 2 +-
GUI/Models/TransformFromDomain.cpp | 6 +-
Tests/Unit/Core/RectangularDetectorTest.cpp | 10 +-
Tests/Unit/Core/SpecularSimulationTest.cpp | 12 +--
Tests/Unit/Device/SpecularDetector1DTest.cpp | 6 +-
Tests/Unit/Device/SphericalDetectorTest.cpp | 10 +-
auto/Wrap/doxygenDevice.i | 104 +++++++++----------
auto/Wrap/libBornAgainDevice.py | 8 +-
auto/Wrap/libBornAgainDevice_wrap.cpp | 88 ++++++++--------
14 files changed, 130 insertions(+), 130 deletions(-)
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 2f9aaf7b899..002d74551aa 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -242,9 +242,9 @@ std::string defineDetectorPolarizationAnalysis(const ISimulation* simulation)
{
std::ostringstream result;
const IDetector& detector = simulation->detector();
- kvector_t analyzer_direction = detector.detectionProperties().polDirection();
- double analyzer_efficiency = detector.detectionProperties().polEfficiency();
- double analyzer_total_transmission = detector.detectionProperties().totalTransmission();
+ kvector_t analyzer_direction = detector.analyzer().polDirection();
+ double analyzer_efficiency = detector.analyzer().polEfficiency();
+ double analyzer_total_transmission = detector.analyzer().totalTransmission();
if (analyzer_direction.mag() > 0.0) {
std::string direction_name = "analyzer_direction";
diff --git a/Core/Simulation/ISimulation.cpp b/Core/Simulation/ISimulation.cpp
index 3062e60c8f9..22d650750ca 100644
--- a/Core/Simulation/ISimulation.cpp
+++ b/Core/Simulation/ISimulation.cpp
@@ -195,7 +195,7 @@ void ISimulation::runSimulation()
prepareSimulation();
const bool force_polarized =
- detector().detectionProperties().polDirection() != kvector_t{};
+ detector().analyzer().polDirection() != kvector_t{};
const auto re_sample = ProcessedSample::make(*sample(), options(), force_polarized);
diff --git a/Core/Simulation/ISimulation2D.cpp b/Core/Simulation/ISimulation2D.cpp
index 0456a0bb6eb..e3179639753 100644
--- a/Core/Simulation/ISimulation2D.cpp
+++ b/Core/Simulation/ISimulation2D.cpp
@@ -110,7 +110,7 @@ std::vector<std::unique_ptr<DiffuseElement>> ISimulation2D::generateElements(con
const Eigen::Matrix2cd beam_polpair = beam.getPolarization();
const IDetector2D& detector = detector2D();
- const Eigen::Matrix2cd analyzer_operator = detector.detectionProperties().analyzerOperator();
+ const Eigen::Matrix2cd analyzer_operator = detector.analyzer().analyzerOperator();
const size_t spec_index = detector.indexOfSpecular(beam);
const size_t N = m_detector_context->numberOfElements();
diff --git a/Device/Detector/DetectorContext.cpp b/Device/Detector/DetectorContext.cpp
index 6786c71cf37..e12ebb3433e 100644
--- a/Device/Detector/DetectorContext.cpp
+++ b/Device/Detector/DetectorContext.cpp
@@ -42,7 +42,7 @@ size_t DetectorContext::detectorIndex(size_t element_index) const
void DetectorContext::setup_context(const IDetector2D* detector)
{
m_active_indices = detector->active_indices();
- m_analyzer_operator = detector->detectionProperties().analyzerOperator();
+ m_analyzer_operator = detector->analyzer().analyzerOperator();
m_pixels.reserve(m_active_indices.size());
for (auto detector_index : m_active_indices)
m_pixels.emplace_back(detector->createPixel(detector_index));
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index f295ed2d113..03c9ecdd411 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -157,7 +157,7 @@ public:
#endif // USER_API
//! Returns detection properties
- const PolFilter& detectionProperties() const { return m_detection_properties; }
+ const PolFilter& analyzer() const { return m_detection_properties; }
//! Returns new intensity map with resolution applied, and cropped to ROI if applicable.
OutputData<double>*
diff --git a/Device/Instrument/Instrument.cpp b/Device/Instrument/Instrument.cpp
index 023a3aca2d8..2cc9f1e741a 100644
--- a/Device/Instrument/Instrument.cpp
+++ b/Device/Instrument/Instrument.cpp
@@ -116,7 +116,7 @@ IDetector& Instrument::detector()
PolarizerPair Instrument::polarizerPair() const
{
- return {m_beam->getPolarization(), m_detector->detectionProperties().analyzerOperator()};
+ return {m_beam->getPolarization(), m_detector->analyzer().analyzerOperator()};
}
CoordSystem2D* Instrument::createScatteringCoords() const
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 12ba4fffa0e..52bc80b36ed 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -560,12 +560,12 @@ void GUI::Transform::FromDomain::setDetectorResolution(DetectorItem* detector_it
void GUI::Transform::FromDomain::setDetectorProperties(DetectorItem* detector_item,
const IDetector& detector)
{
- double total_transmission = detector.detectionProperties().totalTransmission();
+ double total_transmission = detector.analyzer().totalTransmission();
if (total_transmission <= 0.0)
return;
- kvector_t analyzer_dir = detector.detectionProperties().polDirection();
- double efficiency = detector.detectionProperties().polEfficiency();
+ kvector_t analyzer_dir = detector.analyzer().polDirection();
+ double efficiency = detector.analyzer().polEfficiency();
detector_item->setAnalyzerDirection(analyzer_dir);
detector_item->setAnalyzerEfficiency(efficiency);
detector_item->setAnalyzerTotalTransmission(total_transmission);
diff --git a/Tests/Unit/Core/RectangularDetectorTest.cpp b/Tests/Unit/Core/RectangularDetectorTest.cpp
index d9146c40df2..8a0e00ee982 100644
--- a/Tests/Unit/Core/RectangularDetectorTest.cpp
+++ b/Tests/Unit/Core/RectangularDetectorTest.cpp
@@ -204,7 +204,7 @@ TEST_F(RectangularDetectorTest, AnalyzerProperties)
direction = kvector_t(1.0, 0.0, 0.0);
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties = detector.detectionProperties();
+ const PolFilter& detect_properties = detector.analyzer();
EXPECT_NEAR(detect_properties.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties.totalTransmission(), total_transmission, 1e-8);
@@ -219,7 +219,7 @@ TEST_F(RectangularDetectorTest, AnalyzerProperties)
total_transmission = 0.6;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties2 = detector.detectionProperties();
+ const PolFilter& detect_properties2 = detector.analyzer();
EXPECT_NEAR(detect_properties2.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties2.totalTransmission(), total_transmission, 1e-8);
@@ -233,7 +233,7 @@ TEST_F(RectangularDetectorTest, AnalyzerProperties)
total_transmission = 0.5;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties3 = detector.detectionProperties();
+ const PolFilter& detect_properties3 = detector.analyzer();
EXPECT_NEAR(detect_properties3.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties3.totalTransmission(), total_transmission, 1e-8);
@@ -247,7 +247,7 @@ TEST_F(RectangularDetectorTest, AnalyzerProperties)
total_transmission = 0.5;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties4 = detector.detectionProperties();
+ const PolFilter& detect_properties4 = detector.analyzer();
EXPECT_NEAR(detect_properties4.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties4.totalTransmission(), total_transmission, 1e-8);
@@ -261,7 +261,7 @@ TEST_F(RectangularDetectorTest, AnalyzerProperties)
total_transmission = 0.5;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties5 = detector.detectionProperties();
+ const PolFilter& detect_properties5 = detector.analyzer();
EXPECT_NEAR(detect_properties5.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties5.totalTransmission(), total_transmission, 1e-8);
diff --git a/Tests/Unit/Core/SpecularSimulationTest.cpp b/Tests/Unit/Core/SpecularSimulationTest.cpp
index 82b88ead1d8..2a1e4ad767e 100644
--- a/Tests/Unit/Core/SpecularSimulationTest.cpp
+++ b/Tests/Unit/Core/SpecularSimulationTest.cpp
@@ -114,9 +114,9 @@ TEST_F(SpecularSimulationTest, SetAngularScan)
EXPECT_EQ(0.0, sim4.beam().direction().phi());
EXPECT_EQ(sim4.beam().getBlochVector(), polarization);
- EXPECT_EQ(sim4.detector().detectionProperties().polDirection(), analyzer);
- EXPECT_EQ(sim4.detector().detectionProperties().polEfficiency(), 0.33);
- EXPECT_EQ(sim4.detector().detectionProperties().totalTransmission(), 0.22);
+ EXPECT_EQ(sim4.detector().analyzer().polDirection(), analyzer);
+ EXPECT_EQ(sim4.detector().analyzer().polEfficiency(), 0.33);
+ EXPECT_EQ(sim4.detector().analyzer().totalTransmission(), 0.22);
}
TEST_F(SpecularSimulationTest, SetQScan)
@@ -167,9 +167,9 @@ TEST_F(SpecularSimulationTest, SetQScan)
EXPECT_EQ(0.0, sim3.beam().direction().phi());
EXPECT_EQ(sim3.beam().getBlochVector(), polarization);
- EXPECT_EQ(sim3.detector().detectionProperties().polDirection(), analyzer);
- EXPECT_EQ(sim3.detector().detectionProperties().polEfficiency(), 0.33);
- EXPECT_EQ(sim3.detector().detectionProperties().totalTransmission(), 0.22);
+ EXPECT_EQ(sim3.detector().analyzer().polDirection(), analyzer);
+ EXPECT_EQ(sim3.detector().analyzer().polEfficiency(), 0.33);
+ EXPECT_EQ(sim3.detector().analyzer().totalTransmission(), 0.22);
}
TEST_F(SpecularSimulationTest, ConstructSimulation)
diff --git a/Tests/Unit/Device/SpecularDetector1DTest.cpp b/Tests/Unit/Device/SpecularDetector1DTest.cpp
index 09e252a46de..037a70d23e3 100644
--- a/Tests/Unit/Device/SpecularDetector1DTest.cpp
+++ b/Tests/Unit/Device/SpecularDetector1DTest.cpp
@@ -67,7 +67,7 @@ TEST_F(SpecularDetectorTest, Clone)
detectorIndexes.push_back(it.detectorIndex());
EXPECT_EQ(detectorIndexes, expectedDetectorIndexes);
- EXPECT_EQ(clone->detectionProperties().polDirection(), analyzer);
- EXPECT_EQ(clone->detectionProperties().polEfficiency(), 0.33);
- EXPECT_EQ(clone->detectionProperties().totalTransmission(), 0.22);
+ EXPECT_EQ(clone->analyzer().polDirection(), analyzer);
+ EXPECT_EQ(clone->analyzer().polEfficiency(), 0.33);
+ EXPECT_EQ(clone->analyzer().totalTransmission(), 0.22);
}
diff --git a/Tests/Unit/Device/SphericalDetectorTest.cpp b/Tests/Unit/Device/SphericalDetectorTest.cpp
index c27619e336a..b4eaccbdd8b 100644
--- a/Tests/Unit/Device/SphericalDetectorTest.cpp
+++ b/Tests/Unit/Device/SphericalDetectorTest.cpp
@@ -231,7 +231,7 @@ TEST_F(SphericalDetectorTest, AnalyzerProperties)
direction = kvector_t(1.0, 0.0, 0.0);
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties = detector.detectionProperties();
+ const PolFilter& detect_properties = detector.analyzer();
EXPECT_NEAR(detect_properties.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties.totalTransmission(), total_transmission, 1e-8);
@@ -246,7 +246,7 @@ TEST_F(SphericalDetectorTest, AnalyzerProperties)
total_transmission = 0.6;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties2 = detector.detectionProperties();
+ const PolFilter& detect_properties2 = detector.analyzer();
EXPECT_NEAR(detect_properties2.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties2.totalTransmission(), total_transmission, 1e-8);
@@ -260,7 +260,7 @@ TEST_F(SphericalDetectorTest, AnalyzerProperties)
total_transmission = 0.5;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties3 = detector.detectionProperties();
+ const PolFilter& detect_properties3 = detector.analyzer();
EXPECT_NEAR(detect_properties3.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties3.totalTransmission(), total_transmission, 1e-8);
@@ -274,7 +274,7 @@ TEST_F(SphericalDetectorTest, AnalyzerProperties)
total_transmission = 0.5;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties4 = detector.detectionProperties();
+ const PolFilter& detect_properties4 = detector.analyzer();
EXPECT_NEAR(detect_properties4.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties4.totalTransmission(), total_transmission, 1e-8);
@@ -288,7 +288,7 @@ TEST_F(SphericalDetectorTest, AnalyzerProperties)
total_transmission = 0.5;
unit_direction = direction.unit();
detector.setAnalyzer(direction, efficiency, total_transmission);
- const PolFilter& detect_properties5 = detector.detectionProperties();
+ const PolFilter& detect_properties5 = detector.analyzer();
EXPECT_NEAR(detect_properties5.polEfficiency(), efficiency, 1e-8);
EXPECT_NEAR(detect_properties5.totalTransmission(), total_transmission, 1e-8);
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 8174871610d..5774b7ae922 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -371,53 +371,6 @@ Returns the list of all available units.
";
-// File: classDetectionProperties.xml
-%feature("docstring") DetectionProperties "
-
-Detector properties (efficiency, transmission).
-
-C++ includes: DetectionProperties.h
-";
-
-%feature("docstring") DetectionProperties::DetectionProperties "DetectionProperties::DetectionProperties(kvector_t direction, double efficiency, double total_transmission)
-";
-
-%feature("docstring") DetectionProperties::DetectionProperties "DetectionProperties::DetectionProperties()
-";
-
-%feature("docstring") DetectionProperties::DetectionProperties "DetectionProperties::DetectionProperties(const DetectionProperties &other)
-";
-
-%feature("docstring") DetectionProperties::~DetectionProperties "virtual DetectionProperties::~DetectionProperties()=default
-";
-
-%feature("docstring") DetectionProperties::setAnalyzer "void DetectionProperties::setAnalyzer(const kvector_t direction, double efficiency, double total_transmission)
-
-Sets the polarization analyzer characteristics of the detector.
-";
-
-%feature("docstring") DetectionProperties::analyzerOperator "Eigen::Matrix2cd DetectionProperties::analyzerOperator() const
-
-Return the polarization density matrix (in spin basis along z-axis)
-";
-
-%feature("docstring") DetectionProperties::analyzerDirection "kvector_t DetectionProperties::analyzerDirection() const
-
-Retrieve the analyzer characteristics.
-";
-
-%feature("docstring") DetectionProperties::analyzerEfficiency "double DetectionProperties::analyzerEfficiency() const
-
-will always return positive value
-";
-
-%feature("docstring") DetectionProperties::analyzerTotalTransmission "double DetectionProperties::analyzerTotalTransmission() const
-";
-
-%feature("docstring") DetectionProperties::accept "void DetectionProperties::accept(INodeVisitor *visitor) const override
-";
-
-
// File: classDetectorContext.xml
%feature("docstring") DetectorContext "
@@ -1108,7 +1061,7 @@ Returns a pointer to detector resolution object.
Returns empty detector map in given axes units. This map is a data array limited to the size of the \"Region of interest\"
";
-%feature("docstring") IDetector::detectionProperties "const DetectionProperties& IDetector::detectionProperties() const
+%feature("docstring") IDetector::analyzer "const PolFilter& IDetector::analyzer() const
Returns detection properties.
";
@@ -2209,6 +2162,53 @@ C++ includes: OutputDataReadWriteNumpyTXT.h
";
+// File: classPolFilter.xml
+%feature("docstring") PolFilter "
+
+Detector properties (efficiency, transmission).
+
+C++ includes: PolFilter.h
+";
+
+%feature("docstring") PolFilter::PolFilter "PolFilter::PolFilter(kvector_t direction, double efficiency, double total_transmission)
+";
+
+%feature("docstring") PolFilter::PolFilter "PolFilter::PolFilter()
+";
+
+%feature("docstring") PolFilter::PolFilter "PolFilter::PolFilter(const PolFilter &other)
+";
+
+%feature("docstring") PolFilter::~PolFilter "virtual PolFilter::~PolFilter()=default
+";
+
+%feature("docstring") PolFilter::setDirEffTra "void PolFilter::setDirEffTra(const kvector_t direction, double efficiency, double total_transmission)
+
+Sets the polarization analyzer characteristics of the detector.
+";
+
+%feature("docstring") PolFilter::analyzerOperator "Eigen::Matrix2cd PolFilter::analyzerOperator() const
+
+Return the polarization density matrix (in spin basis along z-axis)
+";
+
+%feature("docstring") PolFilter::polDirection "kvector_t PolFilter::polDirection() const
+
+Retrieve the analyzer characteristics.
+";
+
+%feature("docstring") PolFilter::polEfficiency "double PolFilter::polEfficiency() const
+
+will always return positive value
+";
+
+%feature("docstring") PolFilter::totalTransmission "double PolFilter::totalTransmission() const
+";
+
+%feature("docstring") PolFilter::accept "void PolFilter::accept(INodeVisitor *visitor) const override
+";
+
+
// File: classPolygon.xml
%feature("docstring") Polygon "
@@ -3260,16 +3260,16 @@ make Swappable
// File: Rectangle_8h.xml
-// File: DetectionProperties_8cpp.xml
+// File: DetectorMask_8cpp.xml
-// File: DetectionProperties_8h.xml
+// File: DetectorMask_8h.xml
-// File: DetectorMask_8cpp.xml
+// File: PolFilter_8cpp.xml
-// File: DetectorMask_8h.xml
+// File: PolFilter_8h.xml
// File: ConvolutionDetectorResolution_8cpp.xml
diff --git a/auto/Wrap/libBornAgainDevice.py b/auto/Wrap/libBornAgainDevice.py
index 0ade3ca41c1..bb726b1eed5 100644
--- a/auto/Wrap/libBornAgainDevice.py
+++ b/auto/Wrap/libBornAgainDevice.py
@@ -4128,15 +4128,15 @@ class IDetector(libBornAgainBase.ICloneable, libBornAgainParam.INode):
"""
return _libBornAgainDevice.IDetector_detectorResolution(self)
- def detectionProperties(self):
+ def analyzer(self):
r"""
- detectionProperties(IDetector self) -> DetectionProperties const &
- const DetectionProperties& IDetector::detectionProperties() const
+ analyzer(IDetector self) -> PolFilter const &
+ const PolFilter& IDetector::analyzer() const
Returns detection properties.
"""
- return _libBornAgainDevice.IDetector_detectionProperties(self)
+ return _libBornAgainDevice.IDetector_analyzer(self)
def createDetectorIntensity(self, elements):
r"""
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index 9e5419a6597..b22c4c52938 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -3105,39 +3105,39 @@ namespace Swig {
#define SWIGTYPE_p_Beam swig_types[5]
#define SWIGTYPE_p_Bin1D swig_types[6]
#define SWIGTYPE_p_CloneableVectorT_IAxis_t swig_types[7]
-#define SWIGTYPE_p_DetectionProperties swig_types[8]
-#define SWIGTYPE_p_DetectorMask swig_types[9]
-#define SWIGTYPE_p_Direction swig_types[10]
-#define SWIGTYPE_p_Ellipse swig_types[11]
-#define SWIGTYPE_p_FootprintGauss swig_types[12]
-#define SWIGTYPE_p_FootprintSquare swig_types[13]
-#define SWIGTYPE_p_Histogram1D swig_types[14]
-#define SWIGTYPE_p_Histogram2D swig_types[15]
-#define SWIGTYPE_p_HorizontalLine swig_types[16]
-#define SWIGTYPE_p_IAxis swig_types[17]
-#define SWIGTYPE_p_ICloneable swig_types[18]
-#define SWIGTYPE_p_ICoordSystem swig_types[19]
-#define SWIGTYPE_p_IDetector swig_types[20]
-#define SWIGTYPE_p_IDetector2D swig_types[21]
-#define SWIGTYPE_p_IDetectorResolution swig_types[22]
-#define SWIGTYPE_p_IFootprintFactor swig_types[23]
-#define SWIGTYPE_p_IHistogram swig_types[24]
-#define SWIGTYPE_p_INode swig_types[25]
-#define SWIGTYPE_p_INodeVisitor swig_types[26]
-#define SWIGTYPE_p_IParametric swig_types[27]
-#define SWIGTYPE_p_IPixel swig_types[28]
-#define SWIGTYPE_p_IRangedDistribution swig_types[29]
-#define SWIGTYPE_p_IResolutionFunction2D swig_types[30]
-#define SWIGTYPE_p_IShape2D swig_types[31]
-#define SWIGTYPE_p_IntensityDataIOFactory swig_types[32]
-#define SWIGTYPE_p_IsGISAXSDetector swig_types[33]
-#define SWIGTYPE_p_Line swig_types[34]
-#define SWIGTYPE_p_OutputDataIteratorT_double_OutputDataT_double_t_t swig_types[35]
-#define SWIGTYPE_p_OutputDataIteratorT_double_const_OutputDataT_double_t_const_t swig_types[36]
-#define SWIGTYPE_p_OutputDataT_CumulativeValue_t swig_types[37]
-#define SWIGTYPE_p_OutputDataT_bool_t swig_types[38]
-#define SWIGTYPE_p_OutputDataT_double_t swig_types[39]
-#define SWIGTYPE_p_ParameterDistribution swig_types[40]
+#define SWIGTYPE_p_DetectorMask swig_types[8]
+#define SWIGTYPE_p_Direction swig_types[9]
+#define SWIGTYPE_p_Ellipse swig_types[10]
+#define SWIGTYPE_p_FootprintGauss swig_types[11]
+#define SWIGTYPE_p_FootprintSquare swig_types[12]
+#define SWIGTYPE_p_Histogram1D swig_types[13]
+#define SWIGTYPE_p_Histogram2D swig_types[14]
+#define SWIGTYPE_p_HorizontalLine swig_types[15]
+#define SWIGTYPE_p_IAxis swig_types[16]
+#define SWIGTYPE_p_ICloneable swig_types[17]
+#define SWIGTYPE_p_ICoordSystem swig_types[18]
+#define SWIGTYPE_p_IDetector swig_types[19]
+#define SWIGTYPE_p_IDetector2D swig_types[20]
+#define SWIGTYPE_p_IDetectorResolution swig_types[21]
+#define SWIGTYPE_p_IFootprintFactor swig_types[22]
+#define SWIGTYPE_p_IHistogram swig_types[23]
+#define SWIGTYPE_p_INode swig_types[24]
+#define SWIGTYPE_p_INodeVisitor swig_types[25]
+#define SWIGTYPE_p_IParametric swig_types[26]
+#define SWIGTYPE_p_IPixel swig_types[27]
+#define SWIGTYPE_p_IRangedDistribution swig_types[28]
+#define SWIGTYPE_p_IResolutionFunction2D swig_types[29]
+#define SWIGTYPE_p_IShape2D swig_types[30]
+#define SWIGTYPE_p_IntensityDataIOFactory swig_types[31]
+#define SWIGTYPE_p_IsGISAXSDetector swig_types[32]
+#define SWIGTYPE_p_Line swig_types[33]
+#define SWIGTYPE_p_OutputDataIteratorT_double_OutputDataT_double_t_t swig_types[34]
+#define SWIGTYPE_p_OutputDataIteratorT_double_const_OutputDataT_double_t_const_t swig_types[35]
+#define SWIGTYPE_p_OutputDataT_CumulativeValue_t swig_types[36]
+#define SWIGTYPE_p_OutputDataT_bool_t swig_types[37]
+#define SWIGTYPE_p_OutputDataT_double_t swig_types[38]
+#define SWIGTYPE_p_ParameterDistribution swig_types[39]
+#define SWIGTYPE_p_PolFilter swig_types[40]
#define SWIGTYPE_p_Polygon swig_types[41]
#define SWIGTYPE_p_PolygonPrivate swig_types[42]
#define SWIGTYPE_p_RealLimits swig_types[43]
@@ -36304,7 +36304,7 @@ fail:
}
-SWIGINTERN PyObject *_wrap_IDetector_detectionProperties(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
+SWIGINTERN PyObject *_wrap_IDetector_analyzer(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
IDetector *arg1 = (IDetector *) 0 ;
void *argp1 = 0 ;
@@ -36316,11 +36316,11 @@ SWIGINTERN PyObject *_wrap_IDetector_detectionProperties(PyObject *SWIGUNUSEDPAR
swig_obj[0] = args;
res1 = SWIG_ConvertPtr(swig_obj[0], &argp1,SWIGTYPE_p_IDetector, 0 | 0 );
if (!SWIG_IsOK(res1)) {
- SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_detectionProperties" "', argument " "1"" of type '" "IDetector const *""'");
+ SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "IDetector_analyzer" "', argument " "1"" of type '" "IDetector const *""'");
}
arg1 = reinterpret_cast< IDetector * >(argp1);
- result = (PolFilter *) &((IDetector const *)arg1)->detectionProperties();
- resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_DetectionProperties, 0 | 0 );
+ result = (PolFilter *) &((IDetector const *)arg1)->analyzer();
+ resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_PolFilter, 0 | 0 );
return resultobj;
fail:
return NULL;
@@ -45753,9 +45753,9 @@ static PyMethodDef SwigMethods[] = {
"Returns a pointer to detector resolution object. \n"
"\n"
""},
- { "IDetector_detectionProperties", _wrap_IDetector_detectionProperties, METH_O, "\n"
- "IDetector_detectionProperties(IDetector self) -> DetectionProperties const &\n"
- "const DetectionProperties& IDetector::detectionProperties() const\n"
+ { "IDetector_analyzer", _wrap_IDetector_analyzer, METH_O, "\n"
+ "IDetector_analyzer(IDetector self) -> PolFilter const &\n"
+ "const PolFilter& IDetector::analyzer() const\n"
"\n"
"Returns detection properties. \n"
"\n"
@@ -46853,7 +46853,6 @@ static swig_type_info _swigt__p_BasicVector3DT_std__complexT_double_t_t = {"_p_B
static swig_type_info _swigt__p_Beam = {"_p_Beam", "Beam *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Bin1D = {"_p_Bin1D", "Bin1D *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_CloneableVectorT_IAxis_t = {"_p_CloneableVectorT_IAxis_t", "CloneableVector< IAxis > *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_DetectionProperties = {"_p_DetectionProperties", "DetectionProperties *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_DetectorMask = {"_p_DetectorMask", "DetectorMask *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Direction = {"_p_Direction", "Direction *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Ellipse = {"_p_Ellipse", "Ellipse *", 0, 0, (void*)0, 0};
@@ -46886,6 +46885,7 @@ static swig_type_info _swigt__p_OutputDataIteratorT_double_const_OutputDataT_dou
static swig_type_info _swigt__p_OutputDataT_CumulativeValue_t = {"_p_OutputDataT_CumulativeValue_t", "OutputData< CumulativeValue > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_OutputDataT_bool_t = {"_p_OutputDataT_bool_t", "OutputData< bool > *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_OutputDataT_double_t = {"_p_OutputDataT_double_t", "OutputData< double > *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_PolFilter = {"_p_PolFilter", "PolFilter *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_Polygon = {"_p_Polygon", "Polygon *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_PolygonPrivate = {"_p_PolygonPrivate", "PolygonPrivate *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_RealLimits = {"_p_RealLimits", "RealLimits *", 0, 0, (void*)0, 0};
@@ -46965,7 +46965,6 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_Beam,
&_swigt__p_Bin1D,
&_swigt__p_CloneableVectorT_IAxis_t,
- &_swigt__p_DetectionProperties,
&_swigt__p_DetectorMask,
&_swigt__p_Direction,
&_swigt__p_Ellipse,
@@ -46998,6 +46997,7 @@ static swig_type_info *swig_type_initial[] = {
&_swigt__p_OutputDataT_bool_t,
&_swigt__p_OutputDataT_double_t,
&_swigt__p_ParameterDistribution,
+ &_swigt__p_PolFilter,
&_swigt__p_Polygon,
&_swigt__p_PolygonPrivate,
&_swigt__p_RealLimits,
@@ -47077,7 +47077,6 @@ static swig_cast_info _swigc__p_BasicVector3DT_std__complexT_double_t_t[] = { {
static swig_cast_info _swigc__p_Beam[] = { {&_swigt__p_Beam, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Bin1D[] = { {&_swigt__p_Bin1D, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_CloneableVectorT_IAxis_t[] = { {&_swigt__p_CloneableVectorT_IAxis_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_DetectionProperties[] = { {&_swigt__p_DetectionProperties, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_DetectorMask[] = { {&_swigt__p_DetectorMask, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Direction[] = { {&_swigt__p_Direction, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Ellipse[] = { {&_swigt__p_Ellipse, 0, 0, 0},{0, 0, 0, 0}};
@@ -47110,6 +47109,7 @@ static swig_cast_info _swigc__p_OutputDataIteratorT_double_const_OutputDataT_dou
static swig_cast_info _swigc__p_OutputDataT_CumulativeValue_t[] = { {&_swigt__p_OutputDataT_CumulativeValue_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_OutputDataT_bool_t[] = { {&_swigt__p_OutputDataT_bool_t, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_OutputDataT_double_t[] = { {&_swigt__p_OutputDataT_double_t, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_PolFilter[] = { {&_swigt__p_PolFilter, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_Polygon[] = { {&_swigt__p_Polygon, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_PolygonPrivate[] = { {&_swigt__p_PolygonPrivate, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_RealLimits[] = { {&_swigt__p_RealLimits, 0, 0, 0},{0, 0, 0, 0}};
@@ -47189,7 +47189,6 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_Beam,
_swigc__p_Bin1D,
_swigc__p_CloneableVectorT_IAxis_t,
- _swigc__p_DetectionProperties,
_swigc__p_DetectorMask,
_swigc__p_Direction,
_swigc__p_Ellipse,
@@ -47222,6 +47221,7 @@ static swig_cast_info *swig_cast_initial[] = {
_swigc__p_OutputDataT_bool_t,
_swigc__p_OutputDataT_double_t,
_swigc__p_ParameterDistribution,
+ _swigc__p_PolFilter,
_swigc__p_Polygon,
_swigc__p_PolygonPrivate,
_swigc__p_RealLimits,
--
GitLab