From 26a5555b8b117d20f38406f7164c81cdbebb7300 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Fri, 16 Feb 2024 11:58:45 +0100
Subject: [PATCH] merge remaining fct simCoordSystem
---
Sim/Fitting/SimDataPair.cpp | 2 +-
Sim/Simulation/ScatteringSimulation.cpp | 5 -----
Sim/Simulation/ScatteringSimulation.h | 2 --
3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/Sim/Fitting/SimDataPair.cpp b/Sim/Fitting/SimDataPair.cpp
index 3c8f6ecab5a..d0eebd79c44 100644
--- a/Sim/Fitting/SimDataPair.cpp
+++ b/Sim/Fitting/SimDataPair.cpp
@@ -42,7 +42,7 @@ bool haveSameSizes(const IDetector& detector, const Datafield& data)
Datafield repositionData(const ScatteringSimulation& simulation, const Datafield& data)
{
- Frame coordSystem = simulation.simCoordSystem();
+ Frame coordSystem = simulation.detector().clippedFrame();
std::vector<double> values(coordSystem.size(), 0.);
std::vector<double> errors;
diff --git a/Sim/Simulation/ScatteringSimulation.cpp b/Sim/Simulation/ScatteringSimulation.cpp
index ec65403e8d3..db3870a84a5 100644
--- a/Sim/Simulation/ScatteringSimulation.cpp
+++ b/Sim/Simulation/ScatteringSimulation.cpp
@@ -38,11 +38,6 @@ ScatteringSimulation::ScatteringSimulation(const Beam& beam, const MultiLayer& s
ScatteringSimulation::~ScatteringSimulation() = default;
-Frame ScatteringSimulation::simCoordSystem() const
-{
- return m_detector->clippedFrame();
-}
-
//... Overridden executors:
//! init callbacks for setting the parameter values
diff --git a/Sim/Simulation/ScatteringSimulation.h b/Sim/Simulation/ScatteringSimulation.h
index 48968edca1a..f0d2c760b63 100644
--- a/Sim/Simulation/ScatteringSimulation.h
+++ b/Sim/Simulation/ScatteringSimulation.h
@@ -39,8 +39,6 @@ public:
IDetector& detector() { return *m_detector; }
#ifndef SWIG
- Frame simCoordSystem() const;
-
const Beam& beam() const
{
return *m_beam;
--
GitLab