From c110a1c71f46855c291351b8ea49ab85bc25dda0 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 2 Aug 2021 16:03:40 +0200
Subject: [PATCH] clang-format
---
Core/Export/SimulationToPython.cpp | 6 ++---
Core/Simulation/ISimulation.cpp | 24 ++++++++++++-------
Device/Detector/IDetector.cpp | 5 ++--
Device/Detector/IDetector.h | 5 ++--
Device/Detector/IDetector2D.cpp | 2 +-
Device/Detector/SimulationAreaIterator.cpp | 2 +-
Device/{ProDetector => Mask}/DetectorMask.cpp | 4 ++--
Device/{ProDetector => Mask}/DetectorMask.h | 8 +++----
Device/{ProDetector => Pol}/PolFilter.cpp | 12 ++++------
Device/{ProDetector => Pol}/PolFilter.h | 16 ++++++-------
GUI/Models/TransformFromDomain.cpp | 2 +-
.../MaskWidgets/MaskResultsPresenter.cpp | 2 +-
Sample/Aggregate/IInterferenceFunction.h | 2 +-
Sample/Correlations/IPeakShape.h | 2 +-
Sample/Interface/LayerRoughness.h | 2 +-
Sample/Lattice/Lattice3D.h | 2 +-
Sample/Particle/IAbstractParticle.h | 2 +-
Sample/Scattering/IFormFactor.h | 2 +-
Sample/Scattering/Rotations.h | 2 +-
Tests/Unit/Device/DetectorMaskTest.cpp | 2 +-
Tests/Unit/Device/SphericalDetectorTest.cpp | 2 +-
Wrap/Swig/libBornAgainDevice.i | 4 ++--
auto/Wrap/doxygenDevice.i | 14 +++++------
auto/Wrap/libBornAgainDevice_wrap.cpp | 2 +-
24 files changed, 63 insertions(+), 63 deletions(-)
rename Device/{ProDetector => Mask}/DetectorMask.cpp (97%)
rename Device/{ProDetector => Mask}/DetectorMask.h (90%)
rename Device/{ProDetector => Pol}/PolFilter.cpp (88%)
rename Device/{ProDetector => Pol}/PolFilter.h (83%)
diff --git a/Core/Export/SimulationToPython.cpp b/Core/Export/SimulationToPython.cpp
index 002d74551aa..858afebb936 100644
--- a/Core/Export/SimulationToPython.cpp
+++ b/Core/Export/SimulationToPython.cpp
@@ -29,7 +29,7 @@
#include "Device/Beam/FootprintSquare.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Resolution/ScanResolution.h"
@@ -252,8 +252,8 @@ std::string defineDetectorPolarizationAnalysis(const ISimulation* simulation)
<< Py::Fmt::printDouble(analyzer_direction.x()) << ", "
<< Py::Fmt::printDouble(analyzer_direction.y()) << ", "
<< Py::Fmt::printDouble(analyzer_direction.z()) << ")\n";
- result << indent() << "simulation.detector().setAnalyzer(" << direction_name
- << ", " << Py::Fmt::printDouble(analyzer_efficiency) << ", "
+ result << indent() << "simulation.detector().setAnalyzer(" << direction_name << ", "
+ << Py::Fmt::printDouble(analyzer_efficiency) << ", "
<< Py::Fmt::printDouble(analyzer_total_transmission) << ")\n";
}
return result.str();
diff --git a/Core/Simulation/ISimulation.cpp b/Core/Simulation/ISimulation.cpp
index 22d650750ca..fcf061fef17 100644
--- a/Core/Simulation/ISimulation.cpp
+++ b/Core/Simulation/ISimulation.cpp
@@ -144,25 +144,32 @@ void ISimulation::initialize()
registerChild(m_sample_provider.get());
}
-void ISimulation::setOptions(const SimulationOptions& options) {
+void ISimulation::setOptions(const SimulationOptions& options)
+{
ASSERT(m_options);
*m_options = options;
}
-const SimulationOptions& ISimulation::options() const {
+const SimulationOptions& ISimulation::options() const
+{
ASSERT(m_options);
- return *m_options; }
+ return *m_options;
+}
-SimulationOptions& ISimulation::options() {
+SimulationOptions& ISimulation::options()
+{
ASSERT(m_options);
- return *m_options; }
+ return *m_options;
+}
-ProgressHandler& ISimulation::progress() {
+ProgressHandler& ISimulation::progress()
+{
ASSERT(m_progress);
return *m_progress;
}
-void ISimulation::subscribe(const std::function<bool(size_t)>& inform) {
+void ISimulation::subscribe(const std::function<bool(size_t)>& inform)
+{
ASSERT(m_progress);
m_progress->subscribe(inform);
}
@@ -194,8 +201,7 @@ void ISimulation::runSimulation()
{
prepareSimulation();
- const bool force_polarized =
- detector().analyzer().polDirection() != kvector_t{};
+ const bool force_polarized = detector().analyzer().polDirection() != kvector_t{};
const auto re_sample = ProcessedSample::make(*sample(), options(), force_polarized);
diff --git a/Device/Detector/IDetector.cpp b/Device/Detector/IDetector.cpp
index 64338d8b178..c5f7b2b3f71 100644
--- a/Device/Detector/IDetector.cpp
+++ b/Device/Detector/IDetector.cpp
@@ -14,7 +14,7 @@
#include "Device/Detector/IDetector.h"
#include "Base/Utils/Assert.h"
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Resample/Element/DiffuseElement.h"
@@ -154,8 +154,7 @@ size_t IDetector::detectorIndexToRegionOfInterestIndex(const size_t detectorInde
"implemented by derived class.");
}
-void IDetector::setAnalyzer(const kvector_t direction, double efficiency,
- double total_transmission)
+void IDetector::setAnalyzer(const kvector_t direction, double efficiency, double total_transmission)
{
m_detection_properties.setDirEffTra(direction, efficiency, total_transmission);
}
diff --git a/Device/Detector/IDetector.h b/Device/Detector/IDetector.h
index 03c9ecdd411..f89638848f4 100644
--- a/Device/Detector/IDetector.h
+++ b/Device/Detector/IDetector.h
@@ -21,7 +21,7 @@
#include "Base/Vector/Vectors3D.h"
#include "Device/Coord/Axes.h"
#include "Device/Detector/SimulationAreaIterator.h"
-#include "Device/ProDetector/PolFilter.h"
+#include "Device/Pol/PolFilter.h"
class DetectorMask;
class Direction;
@@ -63,8 +63,7 @@ public:
void addAxis(const IAxis& axis);
//! Sets the polarization analyzer characteristics of the detector
- void setAnalyzer(const kvector_t direction, double efficiency,
- double total_transmission);
+ void setAnalyzer(const kvector_t direction, double efficiency, double total_transmission);
//! Sets the detector resolution
void setDetectorResolution(const IDetectorResolution& p_detector_resolution);
void setResolutionFunction(const IResolutionFunction2D& resFunc);
diff --git a/Device/Detector/IDetector2D.cpp b/Device/Detector/IDetector2D.cpp
index 10a044ad516..b6fcbb5db01 100644
--- a/Device/Detector/IDetector2D.cpp
+++ b/Device/Detector/IDetector2D.cpp
@@ -16,8 +16,8 @@
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
#include "Device/Detector/DetectorContext.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Mask/InfinitePlane.h"
-#include "Device/ProDetector/DetectorMask.h"
#include "Resample/Element/DiffuseElement.h"
namespace {
diff --git a/Device/Detector/SimulationAreaIterator.cpp b/Device/Detector/SimulationAreaIterator.cpp
index 49d5b3e8d14..e5ab4ef1962 100644
--- a/Device/Detector/SimulationAreaIterator.cpp
+++ b/Device/Detector/SimulationAreaIterator.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "Device/Detector/IDetector2D.h"
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
SimulationAreaIterator::SimulationAreaIterator(const IDetector* detector, Mode mode,
size_t start_at_index)
diff --git a/Device/ProDetector/DetectorMask.cpp b/Device/Mask/DetectorMask.cpp
similarity index 97%
rename from Device/ProDetector/DetectorMask.cpp
rename to Device/Mask/DetectorMask.cpp
index 71d4bbacb71..c5b8c577b40 100644
--- a/Device/ProDetector/DetectorMask.cpp
+++ b/Device/Mask/DetectorMask.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/ProDetector/DetectorMask.cpp
+//! @file Device/Mask/DetectorMask.cpp
//! @brief Implements class DetectorMask.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,7 +12,7 @@
//
// ************************************************************************************************
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "Base/Axis/IAxis.h"
#include "Device/Histo/Histogram2D.h"
diff --git a/Device/ProDetector/DetectorMask.h b/Device/Mask/DetectorMask.h
similarity index 90%
rename from Device/ProDetector/DetectorMask.h
rename to Device/Mask/DetectorMask.h
index 5c01199eec4..e0c1b79cb4b 100644
--- a/Device/ProDetector/DetectorMask.h
+++ b/Device/Mask/DetectorMask.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/ProDetector/DetectorMask.h
+//! @file Device/Mask/DetectorMask.h
//! @brief Defines class DetectorMask.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,8 +12,8 @@
//
// ************************************************************************************************
-#ifndef BORNAGAIN_DEVICE_PRODETECTOR_DETECTORMASK_H
-#define BORNAGAIN_DEVICE_PRODETECTOR_DETECTORMASK_H
+#ifndef BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
+#define BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
#include "Base/Types/CloneableVector.h"
#include "Device/Data/OutputData.h"
@@ -65,4 +65,4 @@ private:
int m_number_of_masked_channels;
};
-#endif // BORNAGAIN_DEVICE_PRODETECTOR_DETECTORMASK_H
+#endif // BORNAGAIN_DEVICE_MASK_DETECTORMASK_H
diff --git a/Device/ProDetector/PolFilter.cpp b/Device/Pol/PolFilter.cpp
similarity index 88%
rename from Device/ProDetector/PolFilter.cpp
rename to Device/Pol/PolFilter.cpp
index f3add634d6f..c2f7a208f96 100644
--- a/Device/ProDetector/PolFilter.cpp
+++ b/Device/Pol/PolFilter.cpp
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/ProDetector/PolFilter.cpp
+//! @file Device/Pol/PolFilter.cpp
//! @brief Implements class DetectionProperties.
//!
//! @homepage http://www.bornagainproject.org
@@ -12,11 +12,10 @@
//
// ************************************************************************************************
-#include "Device/ProDetector/PolFilter.h"
+#include "Device/Pol/PolFilter.h"
#include "Fit/Param/RealLimits.h"
-PolFilter::PolFilter(kvector_t direction, double efficiency,
- double total_transmission)
+PolFilter::PolFilter(kvector_t direction, double efficiency, double total_transmission)
: m_direction(direction), m_efficiency(efficiency), m_total_transmission(total_transmission)
{
setName("Analyzer");
@@ -32,7 +31,7 @@ PolFilter::PolFilter(const PolFilter& other)
}
void PolFilter::setDirEffTra(const kvector_t direction, double efficiency,
- double total_transmission)
+ double total_transmission)
{
if (!check(direction, efficiency, total_transmission))
throw std::runtime_error("IDetector2D::setAnalyzer: the "
@@ -80,8 +79,7 @@ double PolFilter::totalTransmission() const
return m_total_transmission;
}
-bool PolFilter::check(const kvector_t direction, double efficiency,
- double total_transmission) const
+bool PolFilter::check(const kvector_t direction, double efficiency, double total_transmission) const
{
if (direction.mag() == 0.0)
return false;
diff --git a/Device/ProDetector/PolFilter.h b/Device/Pol/PolFilter.h
similarity index 83%
rename from Device/ProDetector/PolFilter.h
rename to Device/Pol/PolFilter.h
index 27f24bc56b0..ca4a11a0206 100644
--- a/Device/ProDetector/PolFilter.h
+++ b/Device/Pol/PolFilter.h
@@ -2,7 +2,7 @@
//
// BornAgain: simulate and fit reflection and scattering
//
-//! @file Device/ProDetector/PolFilter.h
+//! @file Device/Pol/PolFilter.h
//! @brief Defines class DetectionProperties.
//!
//! @homepage http://www.bornagainproject.org
@@ -17,12 +17,12 @@
#endif
#ifndef USER_API
-#ifndef BORNAGAIN_DEVICE_PRODETECTOR_POLFILTER_H
-#define BORNAGAIN_DEVICE_PRODETECTOR_POLFILTER_H
+#ifndef BORNAGAIN_DEVICE_POL_POLFILTER_H
+#define BORNAGAIN_DEVICE_POL_POLFILTER_H
-#include "Param/Node/INode.h"
#include "Base/Vector/EigenCore.h"
#include "Base/Vector/Vectors3D.h"
+#include "Param/Node/INode.h"
//! Detector properties (efficiency, transmission).
//! @ingroup detector
@@ -36,8 +36,7 @@ public:
virtual ~PolFilter() = default;
//! Sets the polarization analyzer characteristics of the detector
- void setDirEffTra(const kvector_t direction, double efficiency,
- double total_transmission);
+ void setDirEffTra(const kvector_t direction, double efficiency, double total_transmission);
//! Return the polarization density matrix (in spin basis along z-axis)
Eigen::Matrix2cd analyzerOperator() const;
@@ -51,13 +50,12 @@ public:
private:
//! Verify if the given analyzer properties are physical
- bool check(const kvector_t direction, double efficiency,
- double total_transmission) const;
+ bool check(const kvector_t direction, double efficiency, double total_transmission) const;
kvector_t m_direction; //!< direction of polarization analysis
double m_efficiency; //!< efficiency of polarization analysis
double m_total_transmission; //!< total transmission of polarization analysis
};
-#endif // BORNAGAIN_DEVICE_PRODETECTOR_POLFILTER_H
+#endif // BORNAGAIN_DEVICE_POL_POLFILTER_H
#endif // USER_API
diff --git a/GUI/Models/TransformFromDomain.cpp b/GUI/Models/TransformFromDomain.cpp
index 52bc80b36ed..db7c15888c8 100644
--- a/GUI/Models/TransformFromDomain.cpp
+++ b/GUI/Models/TransformFromDomain.cpp
@@ -24,12 +24,12 @@
#include "Device/Beam/FootprintSquare.h"
#include "Device/Detector/RectangularDetector.h"
#include "Device/Detector/SphericalDetector.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Mask/Ellipse.h"
#include "Device/Mask/InfinitePlane.h"
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "Device/ProDetector/DetectorMask.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Resolution/ScanResolution.h"
diff --git a/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp b/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
index 64d73b17392..93b2685c67e 100644
--- a/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
+++ b/GUI/Views/MaskWidgets/MaskResultsPresenter.cpp
@@ -13,7 +13,7 @@
// ************************************************************************************************
#include "GUI/Views/MaskWidgets/MaskResultsPresenter.h"
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "GUI/Models/IntensityDataItem.h"
#include "GUI/Models/MaskItems.h"
#include "GUI/Models/SessionModel.h"
diff --git a/Sample/Aggregate/IInterferenceFunction.h b/Sample/Aggregate/IInterferenceFunction.h
index 47c72e74797..2ae4d4bf323 100644
--- a/Sample/Aggregate/IInterferenceFunction.h
+++ b/Sample/Aggregate/IInterferenceFunction.h
@@ -16,8 +16,8 @@
#ifndef BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H
#define BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H
-#include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
+#include "Sample/Scattering/ISampleNode.h"
//! Abstract base class of interference functions.
diff --git a/Sample/Correlations/IPeakShape.h b/Sample/Correlations/IPeakShape.h
index 1e0d4aea891..42dcc46262e 100644
--- a/Sample/Correlations/IPeakShape.h
+++ b/Sample/Correlations/IPeakShape.h
@@ -16,8 +16,8 @@
#ifndef BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
#define BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
-#include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
+#include "Sample/Scattering/ISampleNode.h"
//! Abstract base class class that defines the peak shape of a Bragg peak.
diff --git a/Sample/Interface/LayerRoughness.h b/Sample/Interface/LayerRoughness.h
index bd22235b77f..a0956114cda 100644
--- a/Sample/Interface/LayerRoughness.h
+++ b/Sample/Interface/LayerRoughness.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
#define BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
-#include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
+#include "Sample/Scattering/ISampleNode.h"
//! A roughness of interface between two layers.
//!
diff --git a/Sample/Lattice/Lattice3D.h b/Sample/Lattice/Lattice3D.h
index d7fd2ed50c4..f2268ffdc83 100644
--- a/Sample/Lattice/Lattice3D.h
+++ b/Sample/Lattice/Lattice3D.h
@@ -15,8 +15,8 @@
#ifndef BORNAGAIN_SAMPLE_LATTICE_LATTICE3D_H
#define BORNAGAIN_SAMPLE_LATTICE_LATTICE3D_H
-#include "Param/Node/INode.h"
#include "Base/Vector/Vectors3D.h"
+#include "Param/Node/INode.h"
#include <memory>
#include <vector>
diff --git a/Sample/Particle/IAbstractParticle.h b/Sample/Particle/IAbstractParticle.h
index 93401fbf70e..185b34d1d8c 100644
--- a/Sample/Particle/IAbstractParticle.h
+++ b/Sample/Particle/IAbstractParticle.h
@@ -16,8 +16,8 @@
#ifndef BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H
#define BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H
-#include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
+#include "Sample/Scattering/ISampleNode.h"
class IRotation;
diff --git a/Sample/Scattering/IFormFactor.h b/Sample/Scattering/IFormFactor.h
index cbf3776c17d..872db3c3540 100644
--- a/Sample/Scattering/IFormFactor.h
+++ b/Sample/Scattering/IFormFactor.h
@@ -16,9 +16,9 @@
#ifndef BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTOR_H
#define BORNAGAIN_SAMPLE_SCATTERING_IFORMFACTOR_H
+#include "Base/Vector/Vectors3D.h"
#include "Sample/Scattering/ISampleNode.h"
#include "Sample/Scattering/ZLimits.h"
-#include "Base/Vector/Vectors3D.h"
#include <Eigen/Core>
class IRotation;
diff --git a/Sample/Scattering/Rotations.h b/Sample/Scattering/Rotations.h
index 28e24513860..4685921dc5c 100644
--- a/Sample/Scattering/Rotations.h
+++ b/Sample/Scattering/Rotations.h
@@ -16,8 +16,8 @@
#define BORNAGAIN_SAMPLE_SCATTERING_ROTATIONS_H
#include "Base/Types/ICloneable.h"
-#include "Param/Node/INode.h"
#include "Base/Vector/Vectors3D.h"
+#include "Param/Node/INode.h"
class Transform3D;
diff --git a/Tests/Unit/Device/DetectorMaskTest.cpp b/Tests/Unit/Device/DetectorMaskTest.cpp
index 0b80b1f124c..2b6c7400dff 100644
--- a/Tests/Unit/Device/DetectorMaskTest.cpp
+++ b/Tests/Unit/Device/DetectorMaskTest.cpp
@@ -1,4 +1,4 @@
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "Base/Axis/FixedBinAxis.h"
#include "Device/Detector/SphericalDetector.h"
#include "Device/Mask/Polygon.h"
diff --git a/Tests/Unit/Device/SphericalDetectorTest.cpp b/Tests/Unit/Device/SphericalDetectorTest.cpp
index b4eaccbdd8b..70665afeef4 100644
--- a/Tests/Unit/Device/SphericalDetectorTest.cpp
+++ b/Tests/Unit/Device/SphericalDetectorTest.cpp
@@ -2,9 +2,9 @@
#include "Base/Axis/FixedBinAxis.h"
#include "Base/Const/Units.h"
#include "Device/Beam/Beam.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "Device/ProDetector/DetectorMask.h"
#include "Device/Resolution/ConvolutionDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Tests/GTestWrapper/google_test.h"
diff --git a/Wrap/Swig/libBornAgainDevice.i b/Wrap/Swig/libBornAgainDevice.i
index c2d2eaedb19..a3c715308e5 100644
--- a/Wrap/Swig/libBornAgainDevice.i
+++ b/Wrap/Swig/libBornAgainDevice.i
@@ -51,7 +51,7 @@
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Resolution/IDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Resolution/ScanResolution.h"
@@ -101,7 +101,7 @@
%include "Device/Coord/Axes.h"
-%include "Device/ProDetector/DetectorMask.h"
+%include "Device/Mask/DetectorMask.h"
%include "Device/Detector/IDetector.h"
%include "Device/Detector/IDetector2D.h"
%include "Device/Detector/RectangularDetector.h"
diff --git a/auto/Wrap/doxygenDevice.i b/auto/Wrap/doxygenDevice.i
index 5774b7ae922..b276b1bb919 100644
--- a/auto/Wrap/doxygenDevice.i
+++ b/auto/Wrap/doxygenDevice.i
@@ -3230,6 +3230,12 @@ make Swappable
// File: Instrument_8h.xml
+// File: DetectorMask_8cpp.xml
+
+
+// File: DetectorMask_8h.xml
+
+
// File: Ellipse_8cpp.xml
@@ -3260,12 +3266,6 @@ make Swappable
// File: Rectangle_8h.xml
-// File: DetectorMask_8cpp.xml
-
-
-// File: DetectorMask_8h.xml
-
-
// File: PolFilter_8cpp.xml
@@ -3335,7 +3335,7 @@ make Swappable
// File: dir_4866552d576e04b61ad8ade47c8db877.xml
-// File: dir_da994f4366e479a3c15631d7a5d6d07d.xml
+// File: dir_6f4ccf6b1bfd53aaa1440d548704c25a.xml
// File: dir_aa6451b5aab7f40a79bc1a0dc7cac3c6.xml
diff --git a/auto/Wrap/libBornAgainDevice_wrap.cpp b/auto/Wrap/libBornAgainDevice_wrap.cpp
index b22c4c52938..126ab0e147c 100644
--- a/auto/Wrap/libBornAgainDevice_wrap.cpp
+++ b/auto/Wrap/libBornAgainDevice_wrap.cpp
@@ -6718,7 +6718,7 @@ SWIGINTERN void std_vector_Sl_std_pair_Sl_double_Sc_double_Sg__Sg__insert__SWIG_
#include "Device/Mask/Line.h"
#include "Device/Mask/Polygon.h"
#include "Device/Mask/Rectangle.h"
-#include "Device/ProDetector/DetectorMask.h"
+#include "Device/Mask/DetectorMask.h"
#include "Device/Resolution/IDetectorResolution.h"
#include "Device/Resolution/ResolutionFunction2DGaussian.h"
#include "Device/Resolution/ScanResolution.h"
--
GitLab