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

mv src to Base/Element

parent a755511c
No related branches found
No related tags found
1 merge request!232Cleanup in context of Simulation, Computation; *Element now inherits from IElement
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file Core/Element/DepthProbeElement.cpp //! @file Base/Element/DepthProbeElement.cpp
//! @brief Implements class DepthProbeElement. //! @brief Implements class DepthProbeElement.
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
// //
// ************************************************************************************************ // ************************************************************************************************
#include "Core/Element/DepthProbeElement.h" #include "Base/Element/DepthProbeElement.h"
#include "Base/Axis/IAxis.h" #include "Base/Axis/IAxis.h"
#include "Base/Vector/Direction.h" #include "Base/Vector/Direction.h"
...@@ -31,16 +31,6 @@ DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IA ...@@ -31,16 +31,6 @@ DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IA
m_intensities.resize(z_positions->size(), 0.0); m_intensities.resize(z_positions->size(), 0.0);
} }
DepthProbeElement::DepthProbeElement(const DepthProbeElement& other)
: IElement(PolarizerPair())
, m_wavelength(other.m_wavelength)
, m_alpha_i(other.m_alpha_i)
, m_intensities(other.m_intensities)
, m_z_positions(other.m_z_positions)
, m_calculation_flag(other.m_calculation_flag)
{
}
DepthProbeElement::DepthProbeElement(DepthProbeElement&& other) noexcept DepthProbeElement::DepthProbeElement(DepthProbeElement&& other) noexcept
: IElement(PolarizerPair()) : IElement(PolarizerPair())
, m_wavelength(other.m_wavelength) , m_wavelength(other.m_wavelength)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// BornAgain: simulate and fit reflection and scattering // BornAgain: simulate and fit reflection and scattering
// //
//! @file Core/Element/DepthProbeElement.h //! @file Base/Element/DepthProbeElement.h
//! @brief Defines class DepthProbeElement. //! @brief Defines class DepthProbeElement.
//! //!
//! @homepage http://www.bornagainproject.org //! @homepage http://www.bornagainproject.org
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
#endif #endif
#ifndef USER_API #ifndef USER_API
#ifndef BORNAGAIN_CORE_ELEMENT_DEPTHPROBEELEMENT_H #ifndef BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
#define BORNAGAIN_CORE_ELEMENT_DEPTHPROBEELEMENT_H #define BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
#include "Base/Element/IElement.h" #include "Base/Element/IElement.h"
#include "Base/Vector/Vectors3D.h" #include "Base/Vector/Vectors3D.h"
...@@ -29,13 +29,11 @@ class IAxis; ...@@ -29,13 +29,11 @@ class IAxis;
class DepthProbeElement : public IElement { class DepthProbeElement : public IElement {
public: public:
DepthProbeElement(double wavelength, double alpha_i, const IAxis* z_positions); DepthProbeElement(double wavelength, double alpha_i, const IAxis* z_positions);
DepthProbeElement(const DepthProbeElement& other); DepthProbeElement(const DepthProbeElement& other) = delete;
DepthProbeElement(DepthProbeElement&& other) noexcept; DepthProbeElement(DepthProbeElement&& other) noexcept;
~DepthProbeElement(); ~DepthProbeElement();
DepthProbeElement& operator=(const DepthProbeElement& other) = delete;
double wavelength() const { return m_wavelength; } double wavelength() const { return m_wavelength; }
double getAlphaI() const { return m_alpha_i; } double getAlphaI() const { return m_alpha_i; }
kvector_t getKi() const; kvector_t getKi() const;
...@@ -66,5 +64,5 @@ private: ...@@ -66,5 +64,5 @@ private:
bool m_calculation_flag; bool m_calculation_flag;
}; };
#endif // BORNAGAIN_CORE_ELEMENT_DEPTHPROBEELEMENT_H #endif // BORNAGAIN_BASE_ELEMENT_DEPTHPROBEELEMENT_H
#endif // USER_API #endif // USER_API
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "Base/Axis/IAxis.h" #include "Base/Axis/IAxis.h"
#include "Base/Progress/ProgressHandler.h" #include "Base/Progress/ProgressHandler.h"
#include "Base/Utils/Assert.h" #include "Base/Utils/Assert.h"
#include "Core/Element/DepthProbeElement.h" #include "Base/Element/DepthProbeElement.h"
#include "Resample/Flux/ScalarFlux.h" #include "Resample/Flux/ScalarFlux.h"
#include "Resample/Processed/ProcessedSample.h" #include "Resample/Processed/ProcessedSample.h"
......
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#ifndef BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H #ifndef BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
#define BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H #define BORNAGAIN_CORE_SIMULATION_DEPTHPROBESIMULATION_H
#include "Core/Element/DepthProbeElement.h" #include "Base/Element/DepthProbeElement.h"
#include "Core/Simulation/ISimulation.h" #include "Core/Simulation/ISimulation.h"
#include <vector> #include <vector>
......
#include "Core/Element/DepthProbeElement.h" #include "Base/Element/DepthProbeElement.h"
#include "Base/Axis/FixedBinAxis.h" #include "Base/Axis/FixedBinAxis.h"
#include "Base/Vector/Direction.h" #include "Base/Vector/Direction.h"
#include "Tests/GTestWrapper/google_test.h" #include "Tests/GTestWrapper/google_test.h"
......
...@@ -302,7 +302,7 @@ C++ includes: DepthProbeComputation.h ...@@ -302,7 +302,7 @@ C++ includes: DepthProbeComputation.h
%feature("docstring") DepthProbeElement::DepthProbeElement "DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IAxis *z_positions) %feature("docstring") DepthProbeElement::DepthProbeElement "DepthProbeElement::DepthProbeElement(double wavelength, double alpha_i, const IAxis *z_positions)
"; ";
%feature("docstring") DepthProbeElement::DepthProbeElement "DepthProbeElement::DepthProbeElement(const DepthProbeElement &other) %feature("docstring") DepthProbeElement::DepthProbeElement "DepthProbeElement::DepthProbeElement(const DepthProbeElement &other)=delete
"; ";
%feature("docstring") DepthProbeElement::DepthProbeElement "DepthProbeElement::DepthProbeElement(DepthProbeElement &&other) noexcept %feature("docstring") DepthProbeElement::DepthProbeElement "DepthProbeElement::DepthProbeElement(DepthProbeElement &&other) noexcept
......
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