From 85115f29f3efbe99aadacb2d2139478c26e725a1 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 22 Sep 2023 09:41:58 +0200
Subject: [PATCH] convert fit example find_background to using addFitPair
---
auto/Examples/fit/scatter2d/find_background.py | 10 +++++-----
auto/MiniExamples/fit/scatter2d/find_background.py | 10 +++++-----
rawEx/fit/scatter2d/find_background.py | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/auto/Examples/fit/scatter2d/find_background.py b/auto/Examples/fit/scatter2d/find_background.py
index 2edcbe882b6..a6d19c9b75e 100755
--- a/auto/Examples/fit/scatter2d/find_background.py
+++ b/auto/Examples/fit/scatter2d/find_background.py
@@ -24,7 +24,7 @@ def get_simulation(P):
return simulation
-def create_real_data():
+def fake_data():
"""
Generating "real" data by adding noise, background and scale
to the simulated data.
@@ -43,17 +43,17 @@ def create_real_data():
result = simulation.simulate()
# retrieving simulated data in the form of numpy array
- return result.npArray()
+ return result
if __name__ == '__main__':
- real_data = create_real_data()
+ data = fake_data()
fit_objective = ba.FitObjective()
- fit_objective.addSimulationAndData(get_simulation, real_data, 1)
+ fit_objective.addFitPair(get_simulation, data, 1)
fit_objective.initPrint(10)
- observer = ba_fitmonitor.PlotterGISAS()
+ observer = ba_fitmonitor.PlotterGISAS()
fit_objective.initPlot(10, observer)
P = ba.Parameters()
diff --git a/auto/MiniExamples/fit/scatter2d/find_background.py b/auto/MiniExamples/fit/scatter2d/find_background.py
index 8d68baa690b..c70267287c3 100755
--- a/auto/MiniExamples/fit/scatter2d/find_background.py
+++ b/auto/MiniExamples/fit/scatter2d/find_background.py
@@ -24,7 +24,7 @@ def get_simulation(P):
return simulation
-def create_real_data():
+def fake_data():
"""
Generating "real" data by adding noise, background and scale
to the simulated data.
@@ -43,17 +43,17 @@ def create_real_data():
result = simulation.simulate()
# retrieving simulated data in the form of numpy array
- return result.npArray()
+ return result
if __name__ == '__main__':
- real_data = create_real_data()
+ data = fake_data()
fit_objective = ba.FitObjective()
- fit_objective.addSimulationAndData(get_simulation, real_data, 1)
+ fit_objective.addFitPair(get_simulation, data, 1)
fit_objective.initPrint(10)
- observer = ba_fitmonitor.PlotterGISAS()
+ observer = ba_fitmonitor.PlotterGISAS()
plt.close() # (hide plot) fit_objective.initPlot(10, observer)
P = ba.Parameters()
diff --git a/rawEx/fit/scatter2d/find_background.py b/rawEx/fit/scatter2d/find_background.py
index f864ec53d2d..788d5f60015 100755
--- a/rawEx/fit/scatter2d/find_background.py
+++ b/rawEx/fit/scatter2d/find_background.py
@@ -24,7 +24,7 @@ def get_simulation(P):
return simulation
-def create_real_data():
+def fake_data():
"""
Generating "real" data by adding noise, background and scale
to the simulated data.
@@ -43,17 +43,17 @@ def create_real_data():
result = simulation.simulate()
# retrieving simulated data in the form of numpy array
- return result.npArray()
+ return result
if __name__ == '__main__':
- real_data = create_real_data()
+ data = fake_data()
fit_objective = ba.FitObjective()
- fit_objective.addSimulationAndData(get_simulation, real_data, 1)
+ fit_objective.addFitPair(get_simulation, data, 1)
fit_objective.initPrint(10)
- observer = ba_fitmonitor.PlotterGISAS()
+ observer = ba_fitmonitor.PlotterGISAS()
<%= sm ? "plt.close() # (hide plot) " :"" %>fit_objective.initPlot(10, observer)
P = ba.Parameters()
--
GitLab