From a8f4646aed845e7f27f48d69d0fb30d89afaad09 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Wed, 28 Apr 2021 19:42:26 +0200
Subject: [PATCH] ctd (OffSpecular)
---
Core/Fitting/SimDataPair.cpp | 2 +-
Core/Simulation/OffSpecularSimulation.cpp | 4 ++--
Core/Simulation/OffSpecularSimulation.h | 2 +-
auto/Wrap/doxygenCore.i | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Core/Fitting/SimDataPair.cpp b/Core/Fitting/SimDataPair.cpp
index 53018710ab4..73228670fab 100644
--- a/Core/Fitting/SimDataPair.cpp
+++ b/Core/Fitting/SimDataPair.cpp
@@ -61,7 +61,7 @@ std::unique_ptr<ICoordSystem> createConverter(const ISimulation& simulation)
return std::unique_ptr<ICoordSystem>(probe->createCoordSystem());
if (auto off_spec = dynamic_cast<const OffSpecularSimulation*>(&simulation))
- return off_spec->createCoordSystem();
+ return std::unique_ptr<ICoordSystem>(off_spec->createCoordSystem());
ASSERT(0);
}
diff --git a/Core/Simulation/OffSpecularSimulation.cpp b/Core/Simulation/OffSpecularSimulation.cpp
index dce7696a447..ed676aac3ff 100644
--- a/Core/Simulation/OffSpecularSimulation.cpp
+++ b/Core/Simulation/OffSpecularSimulation.cpp
@@ -66,13 +66,13 @@ const IAxis* OffSpecularSimulation::beamAxis() const
return m_alpha_i_axis.get();
}
-std::unique_ptr<ICoordSystem> OffSpecularSimulation::createCoordSystem() const
+ICoordSystem* OffSpecularSimulation::createCoordSystem() const
{
const IAxis* axis = beamAxis();
if (!axis)
throw std::runtime_error("Error in OffSpecularSimulation::createCoordSystem:"
" missing inclination angle axis");
- return std::make_unique<OffSpecularCoordinates>(detector2D(), beam(), *axis);
+ return new OffSpecularCoordinates(detector2D(), beam(), *axis);
}
size_t OffSpecularSimulation::intensityMapSize() const
diff --git a/Core/Simulation/OffSpecularSimulation.h b/Core/Simulation/OffSpecularSimulation.h
index 82188cfd85e..c81f0e6d197 100644
--- a/Core/Simulation/OffSpecularSimulation.h
+++ b/Core/Simulation/OffSpecularSimulation.h
@@ -47,7 +47,7 @@ public:
const IAxis* beamAxis() const;
#ifndef SWIG
- std::unique_ptr<ICoordSystem> createCoordSystem() const;
+ ICoordSystem* createCoordSystem() const;
#endif
//! Returns the total number of the intensity values in the simulation result
diff --git a/auto/Wrap/doxygenCore.i b/auto/Wrap/doxygenCore.i
index 813cd42ed22..e111d942978 100644
--- a/auto/Wrap/doxygenCore.i
+++ b/auto/Wrap/doxygenCore.i
@@ -1571,7 +1571,7 @@ Sets beam parameters from here (forwarded to Instrument)
Returns axis of the beam.
";
-%feature("docstring") OffSpecularSimulation::createCoordSystem "std::unique_ptr< ICoordSystem > OffSpecularSimulation::createCoordSystem() const
+%feature("docstring") OffSpecularSimulation::createCoordSystem "ICoordSystem * OffSpecularSimulation::createCoordSystem() const
";
%feature("docstring") OffSpecularSimulation::intensityMapSize "size_t OffSpecularSimulation::intensityMapSize() const override
--
GitLab