From 8fb6e7b4df08e67fadcdb9f27e2a0dbc4f140430 Mon Sep 17 00:00:00 2001 From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de> Date: Fri, 16 Feb 2024 11:56:34 +0100 Subject: [PATCH] rm unused fcts simCoordSystem --- Sim/Simulation/DepthprobeSimulation.cpp | 5 ----- Sim/Simulation/DepthprobeSimulation.h | 2 -- Sim/Simulation/ISimulation.h | 2 -- Sim/Simulation/OffspecSimulation.cpp | 5 ----- Sim/Simulation/OffspecSimulation.h | 2 -- Sim/Simulation/ScatteringSimulation.h | 2 +- Sim/Simulation/SpecularSimulation.cpp | 5 ----- Sim/Simulation/SpecularSimulation.h | 1 - 8 files changed, 1 insertion(+), 23 deletions(-) diff --git a/Sim/Simulation/DepthprobeSimulation.cpp b/Sim/Simulation/DepthprobeSimulation.cpp index cc2245dd872..fd826370f9e 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 082a781ddb2..ad88944958b 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 4014dbad1f9..04b233fdd89 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 254c187e78c..c7ed6e6a263 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 503e496662f..9e0319139ec 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 b2d2c765af8..48968edca1a 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 c34ee460bc7..e35ec33423c 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 f249d3967ab..ae1cfed7929 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 { -- GitLab