diff --git a/Sim/Simulation/DepthprobeSimulation.cpp b/Sim/Simulation/DepthprobeSimulation.cpp index cc2245dd872ef53f83297e501d810e8973890ed9..fd826370f9e0ef25ff767609fc72fd2b9c078b8d 100644 --- a/Sim/Simulation/DepthprobeSimulation.cpp +++ b/Sim/Simulation/DepthprobeSimulation.cpp @@ -52,11 +52,6 @@ DepthprobeSimulation::DepthprobeSimulation(const BeamScan& scan, const MultiLaye DepthprobeSimulation::~DepthprobeSimulation() = default; -Frame DepthprobeSimulation::simCoordSystem() const -{ - return {m_scan->coordinateAxis()->clone(), m_z_axis->clone()}; -} - std::vector<const INode*> DepthprobeSimulation::nodeChildren() const { std::vector<const INode*> result = ISimulation::nodeChildren(); diff --git a/Sim/Simulation/DepthprobeSimulation.h b/Sim/Simulation/DepthprobeSimulation.h index 082a781ddb24a79ccaf46288c31899850ca50d29..ad88944958bd3379f8a760cc9f25b43ca036df62 100644 --- a/Sim/Simulation/DepthprobeSimulation.h +++ b/Sim/Simulation/DepthprobeSimulation.h @@ -56,8 +56,6 @@ public: return *m_z_axis.get(); } - Frame simCoordSystem() const override; - std::vector<const INode*> nodeChildren() const override; private: diff --git a/Sim/Simulation/ISimulation.h b/Sim/Simulation/ISimulation.h index 4014dbad1f931d74cc0385219224b56e06d90f35..04b233fdd89a077ea9cf8818ed0ce8bec84bc20b 100644 --- a/Sim/Simulation/ISimulation.h +++ b/Sim/Simulation/ISimulation.h @@ -71,8 +71,6 @@ public: const IBackground* background() const; const std::vector<ParameterDistribution>& paramDistributions() const; - virtual Frame simCoordSystem() const = 0; - const SimulationOptions& options() const; protected: diff --git a/Sim/Simulation/OffspecSimulation.cpp b/Sim/Simulation/OffspecSimulation.cpp index 254c187e78c25ac0dbd50338303df8e734ec3bed..c7ed6e6a263c90b29e9de57259b3741ac914b2a3 100644 --- a/Sim/Simulation/OffspecSimulation.cpp +++ b/Sim/Simulation/OffspecSimulation.cpp @@ -54,11 +54,6 @@ void OffspecSimulation::prepareSimulation() m_pixels.push_back(m_detector->createPixel(i)); } -Frame OffspecSimulation::simCoordSystem() const -{ - return {m_scan->coordinateAxis()->clone(), m_detector->axis(1).clone()}; -} - //... Overridden executors: //! init callbacks for setting the parameter values diff --git a/Sim/Simulation/OffspecSimulation.h b/Sim/Simulation/OffspecSimulation.h index 503e496662f75d8140bf0e36f0172bdf29aa4bd5..9e0319139ec335292b987bf2474b526d28a47d27 100644 --- a/Sim/Simulation/OffspecSimulation.h +++ b/Sim/Simulation/OffspecSimulation.h @@ -37,8 +37,6 @@ public: std::string className() const final { return "OffspecSimulation"; } #ifndef SWIG - Frame simCoordSystem() const override; - std::vector<const INode*> nodeChildren() const override; const PhysicalScan* scan() const diff --git a/Sim/Simulation/ScatteringSimulation.h b/Sim/Simulation/ScatteringSimulation.h index b2d2c765af8bdf582278f2c7644f4fb050817757..48968edca1a11c0ec1ddce6ac018ba4c334dcea5 100644 --- a/Sim/Simulation/ScatteringSimulation.h +++ b/Sim/Simulation/ScatteringSimulation.h @@ -39,7 +39,7 @@ public: IDetector& detector() { return *m_detector; } #ifndef SWIG - Frame simCoordSystem() const override; + Frame simCoordSystem() const; const Beam& beam() const { diff --git a/Sim/Simulation/SpecularSimulation.cpp b/Sim/Simulation/SpecularSimulation.cpp index c34ee460bc72bdd852e6e0d53cd3488df535e49e..e35ec33423c6bf24e31e45d663aa4b50fefa8de5 100644 --- a/Sim/Simulation/SpecularSimulation.cpp +++ b/Sim/Simulation/SpecularSimulation.cpp @@ -41,11 +41,6 @@ SpecularSimulation::SpecularSimulation(const BeamScan& scan, const MultiLayer& s SpecularSimulation::~SpecularSimulation() = default; -Frame SpecularSimulation::simCoordSystem() const -{ - return m_scan->scanCoordSystem(); -} - //... Overridden executors: void SpecularSimulation::initElementVector() diff --git a/Sim/Simulation/SpecularSimulation.h b/Sim/Simulation/SpecularSimulation.h index f249d3967abb8b4bb6cb9448abf0a930436c6dac..ae1cfed79295171ffcd0d43b2c2ae46b6ffc381d 100644 --- a/Sim/Simulation/SpecularSimulation.h +++ b/Sim/Simulation/SpecularSimulation.h @@ -33,7 +33,6 @@ public: std::string className() const final { return "SpecularSimulation"; } #ifndef SWIG - Frame simCoordSystem() const override; //! Returns internal data handler const BeamScan* scan() const {