From cf7e8a51756ed1a0468d4541c17bfb312c36573e Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 14 Nov 2022 18:01:05 +0100
Subject: [PATCH] rm Py code that just shortens a static fct call
---
Examples/specular/TOFRWithResolution.py | 2 +-
Sim/Scan/QzScan.cpp | 2 +-
Sim/Scan/QzScan.h | 2 +-
Sim/Scan/ScanResolution.cpp | 4 ++--
Wrap/Swig/libBornAgainSim.i | 29 -------------------------
auto/Wrap/libBornAgainSim.py | 26 ----------------------
6 files changed, 5 insertions(+), 60 deletions(-)
diff --git a/Examples/specular/TOFRWithResolution.py b/Examples/specular/TOFRWithResolution.py
index ddcb3687090..a157529a981 100755
--- a/Examples/specular/TOFRWithResolution.py
+++ b/Examples/specular/TOFRWithResolution.py
@@ -34,7 +34,7 @@ def get_simulation(sample):
distr = ba.RangedDistributionGaussian(n_samples, n_sig)
scan = ba.QzScan(qzs)
- scan.setAbsoluteQResolution(distr, dq)
+ scan.setAbsoluteQVectorResolution(distr, dq)
return ba.SpecularSimulation(scan, sample)
diff --git a/Sim/Scan/QzScan.cpp b/Sim/Scan/QzScan.cpp
index 8511aa57d5e..fec0b682e3b 100644
--- a/Sim/Scan/QzScan.cpp
+++ b/Sim/Scan/QzScan.cpp
@@ -151,7 +151,7 @@ void QzScan::setAbsoluteQResolution(const IRangedDistribution& distr, double std
}
void QzScan::setAbsoluteQVectorResolution(const IRangedDistribution& distr,
- const std::vector<double>& std_dev)
+ const std::vector<double>& std_dev)
{
std::unique_ptr<ScanResolution> resolution(
ScanResolution::scanAbsoluteVectorResolution(distr, std_dev));
diff --git a/Sim/Scan/QzScan.h b/Sim/Scan/QzScan.h
index 007d25208c5..e84c8a3dcb5 100644
--- a/Sim/Scan/QzScan.h
+++ b/Sim/Scan/QzScan.h
@@ -89,7 +89,7 @@ public:
//! _std_dev_ can be either single-valued or a numpy array. In the latter case the length of the
//! array should coinside with the length of the qz-axis.
void setAbsoluteQVectorResolution(const IRangedDistribution& distr,
- const std::vector<double>& std_dev);
+ const std::vector<double>& std_dev);
void setOffset(double offset)
{
diff --git a/Sim/Scan/ScanResolution.cpp b/Sim/Scan/ScanResolution.cpp
index 84a0427a944..e950ecff556 100644
--- a/Sim/Scan/ScanResolution.cpp
+++ b/Sim/Scan/ScanResolution.cpp
@@ -21,8 +21,8 @@ namespace {
void checkIfEmpty(const std::vector<double>& input);
-const std::string relative_resolution = "ScanRelativeResolution";
-const std::string absolute_resolution = "ScanAbsoluteResolution";
+const std::string relative_resolution = "ScanResolution.scanRelativeResolution";
+const std::string absolute_resolution = "ScanResolution.scanAbsoluteResolution";
class ScanSingleRelativeResolution : public ScanResolution {
public:
diff --git a/Wrap/Swig/libBornAgainSim.i b/Wrap/Swig/libBornAgainSim.i
index 3b29f1d5842..3d35baabe40 100644
--- a/Wrap/Swig/libBornAgainSim.i
+++ b/Wrap/Swig/libBornAgainSim.i
@@ -248,32 +248,3 @@ class ObserverCallbackWrapper(PyObserverCallback):
return None
%}
};
-
-
-// fancy names for ScanResolution static functions
-%pythoncode %{
- def ScanRelativeResolution(distribution, rel_dev):
- """
- Creates a scan resolution from the given distribution and
- relative deviation values (that is, the ratios of standard
- deviations and means).
- :param distribution: bornagain.IRangedDistribution object
- :param rel_dev: either single-valued or a numpy array.
- In the latter case should coinside in
- size with later used mean values array.
- :return: bornagain.ScanResolution object
- """
- return ScanResolution.scanRelativeResolution(distribution, rel_dev)
-
- def ScanAbsoluteResolution(distribution, std_dev):
- """
- Creates a scan resolution from the given distribution and
- standard deviation values.
- :param distribution: bornagain.IRangedDistribution object
- :param std_dev: either single-valued or a numpy array.
- In the latter case should coinside in
- size with later used mean values array.
- :return: bornagain.ScanResolution object
- """
- return ScanResolution.scanAbsoluteResolution(distribution, std_dev)
-%}
diff --git a/auto/Wrap/libBornAgainSim.py b/auto/Wrap/libBornAgainSim.py
index b72ccc7ff87..a0467246511 100644
--- a/auto/Wrap/libBornAgainSim.py
+++ b/auto/Wrap/libBornAgainSim.py
@@ -4066,29 +4066,3 @@ class ObserverCallbackWrapper(PyObserverCallback):
return self.callback_(fit_objective)
-
-def ScanRelativeResolution(distribution, rel_dev):
- """
- Creates a scan resolution from the given distribution and
- relative deviation values (that is, the ratios of standard
- deviations and means).
- :param distribution: bornagain.IRangedDistribution object
- :param rel_dev: either single-valued or a numpy array.
- In the latter case should coinside in
- size with later used mean values array.
- :return: bornagain.ScanResolution object
- """
- return ScanResolution.scanRelativeResolution(distribution, rel_dev)
-
-def ScanAbsoluteResolution(distribution, std_dev):
- """
- Creates a scan resolution from the given distribution and
- standard deviation values.
- :param distribution: bornagain.IRangedDistribution object
- :param std_dev: either single-valued or a numpy array.
- In the latter case should coinside in
- size with later used mean values array.
- :return: bornagain.ScanResolution object
- """
- return ScanResolution.scanAbsoluteResolution(distribution, std_dev)
-
--
GitLab