Skip to content
Snippets Groups Projects
Commit d923fc2c authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

Swig/Param now indpendent of BasicVector3D

parent f1f1ef27
No related branches found
No related tags found
1 merge request!240Break include chains, resolve warnings
Showing
with 653 additions and 6480 deletions
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "Device/Beam/FootprintSquare.h" #include "Device/Beam/FootprintSquare.h"
#include "Base/Math/Constants.h" #include "Base/Math/Constants.h"
#include <algorithm> #include <algorithm>
#include <cmath>
#include <stdexcept> #include <stdexcept>
FootprintSquare::FootprintSquare(const std::vector<double> P) FootprintSquare::FootprintSquare(const std::vector<double> P)
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "Base/Types/CloneableVector.h" #include "Base/Types/CloneableVector.h"
#include "Base/Types/ICloneable.h" #include "Base/Types/ICloneable.h"
#include "Base/Vector/Vectors3D.h"
#include "Device/Coord/Axes.h" #include "Device/Coord/Axes.h"
#include "Device/Detector/SimulationAreaIterator.h" #include "Device/Detector/SimulationAreaIterator.h"
#include "Device/ProDetector/DetectionProperties.h" #include "Device/ProDetector/DetectionProperties.h"
......
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
#ifndef BORNAGAIN_DEVICE_PRODETECTOR_DETECTIONPROPERTIES_H #ifndef BORNAGAIN_DEVICE_PRODETECTOR_DETECTIONPROPERTIES_H
#define BORNAGAIN_DEVICE_PRODETECTOR_DETECTIONPROPERTIES_H #define BORNAGAIN_DEVICE_PRODETECTOR_DETECTIONPROPERTIES_H
#include "Base/Vector/EigenCore.h"
#include "Param/Node/INode.h" #include "Param/Node/INode.h"
#include "Base/Vector/EigenCore.h"
#include "Base/Vector/Vectors3D.h"
//! Detector properties (efficiency, transmission). //! Detector properties (efficiency, transmission).
//! @ingroup detector //! @ingroup detector
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#ifndef BORNAGAIN_PARAM_BASE_IPARAMETRIC_H #ifndef BORNAGAIN_PARAM_BASE_IPARAMETRIC_H
#define BORNAGAIN_PARAM_BASE_IPARAMETRIC_H #define BORNAGAIN_PARAM_BASE_IPARAMETRIC_H
#include "Base/Vector/Vectors3D.h" #include <string>
class RealLimits; class RealLimits;
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "Param/Distrib/RangedDistributions.h" #include "Param/Distrib/RangedDistributions.h"
#include "Param/Distrib/Distributions.h" #include "Param/Distrib/Distributions.h"
#include "Param/Varia/ParameterSample.h" #include "Param/Varia/ParameterSample.h"
#include <cmath>
#include <limits> #include <limits>
namespace { namespace {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H #define BORNAGAIN_SAMPLE_AGGREGATE_IINTERFERENCEFUNCTION_H
#include "Sample/Scattering/ISampleNode.h" #include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
//! Abstract base class of interference functions. //! Abstract base class of interference functions.
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H #define BORNAGAIN_SAMPLE_CORRELATIONS_IPEAKSHAPE_H
#include "Sample/Scattering/ISampleNode.h" #include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
//! Abstract base class class that defines the peak shape of a Bragg peak. //! Abstract base class class that defines the peak shape of a Bragg peak.
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H #define BORNAGAIN_SAMPLE_INTERFACE_LAYERROUGHNESS_H
#include "Sample/Scattering/ISampleNode.h" #include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
//! A roughness of interface between two layers. //! A roughness of interface between two layers.
//! //!
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define BORNAGAIN_SAMPLE_LATTICE_LATTICE3D_H #define BORNAGAIN_SAMPLE_LATTICE_LATTICE3D_H
#include "Param/Node/INode.h" #include "Param/Node/INode.h"
#include "Base/Vector/Vectors3D.h"
#include <memory> #include <memory>
#include <vector> #include <vector>
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H #define BORNAGAIN_SAMPLE_MULTILAYER_MULTILAYER_H
#include "Base/Types/SafePointerVector.h" #include "Base/Types/SafePointerVector.h"
#include "Base/Vector/Vectors3D.h"
#include "Sample/Multilayer/RoughnessModels.h" #include "Sample/Multilayer/RoughnessModels.h"
#include "Sample/Scattering/ISampleNode.h" #include "Sample/Scattering/ISampleNode.h"
#include <functional> #include <functional>
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H #define BORNAGAIN_SAMPLE_PARTICLE_IABSTRACTPARTICLE_H
#include "Sample/Scattering/ISampleNode.h" #include "Sample/Scattering/ISampleNode.h"
#include "Base/Vector/Vectors3D.h"
class IRotation; class IRotation;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#define BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H #define BORNAGAIN_SAMPLE_PARTICLE_IPARTICLE_H
#include "Base/Types/SafePointerVector.h" #include "Base/Types/SafePointerVector.h"
#include "Base/Vector/Vectors3D.h"
#include "Sample/Particle/IAbstractParticle.h" #include "Sample/Particle/IAbstractParticle.h"
#include <memory> #include <memory>
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "Sample/Scattering/ISampleNode.h" #include "Sample/Scattering/ISampleNode.h"
#include "Sample/Scattering/ZLimits.h" #include "Sample/Scattering/ZLimits.h"
#include "Base/Vector/Vectors3D.h"
#include <Eigen/Core> #include <Eigen/Core>
class IRotation; class IRotation;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "Base/Types/ICloneable.h" #include "Base/Types/ICloneable.h"
#include "Param/Node/INode.h" #include "Param/Node/INode.h"
#include "Base/Vector/Vectors3D.h"
class Transform3D; class Transform3D;
......
#include "Sample/Lattice/Lattice2D.h" #include "Sample/Lattice/Lattice2D.h"
#include "Base/Math/Constants.h"
#include "Tests/GTestWrapper/google_test.h" #include "Tests/GTestWrapper/google_test.h"
class Lattice2DTest : public ::testing::Test { class Lattice2DTest : public ::testing::Test {
......
...@@ -31,9 +31,6 @@ ...@@ -31,9 +31,6 @@
%import(module="libBornAgainBase") "Base/Types/Complex.h" %import(module="libBornAgainBase") "Base/Types/Complex.h"
%import(module="libBornAgainBase") "Base/Types/ICloneable.h" %import(module="libBornAgainBase") "Base/Types/ICloneable.h"
%import(module="libBornAgainBase") "Base/Vector/BasicVector3D.h"
%import(module="libBornAgainBase") "Base/Vector/Vectors3D.h"
%include "fromBase.i"
%ignore IRangedDistribution; %ignore IRangedDistribution;
...@@ -46,7 +43,6 @@ ...@@ -46,7 +43,6 @@
%include "Param/Node/INode.h" %include "Param/Node/INode.h"
%include "Param/Node/INodeVisitor.h" %include "Param/Node/INodeVisitor.h"
%include "Param/Distrib/Distributions.h"
%include "Param/Distrib/Distributions.h" %include "Param/Distrib/Distributions.h"
%include "Param/Distrib/ParameterDistribution.h" %include "Param/Distrib/ParameterDistribution.h"
%include "Param/Distrib/RangedDistributions.h" %include "Param/Distrib/RangedDistributions.h"
......
This diff is collapsed.
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment