From 7f37e61c6cf4f8a55bfcf7447e4d95ece494a164 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 19 Dec 2022 14:19:49 +0100
Subject: [PATCH] update & fix Examples/fit/specular/Honeycomb_fit.py
---
Examples/fit/specular/Honeycomb_fit.py | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/Examples/fit/specular/Honeycomb_fit.py b/Examples/fit/specular/Honeycomb_fit.py
index f8755973fab..f45792f9b33 100755
--- a/Examples/fit/specular/Honeycomb_fit.py
+++ b/Examples/fit/specular/Honeycomb_fit.py
@@ -75,18 +75,16 @@ def get_sample(parameters, sign, ms150=1):
return sample
-def get_simulation(q_axis, fitParams, sign, ms150=False):
+def get_simulation(q_axis, parameters, sign, ms150=False):
n_points = 25
n_sig = 3.0
- parameters = dict(fitParams, **fixedParams)
-
q_distr = ba.RangedDistributionGaussian(n_points, n_sig)
dq = parameters["dq"]*q_axis
scan = ba.QzScan(q_axis)
- scan.setAbsoluteQResolution(q_distr, dq)
+ scan.setAbsoluteQVectorResolution(q_distr, dq)
if ms150:
@@ -97,15 +95,18 @@ def get_simulation(q_axis, fitParams, sign, ms150=False):
sample = get_sample(parameters=parameters, sign=sign, ms150=1)
simulation = ba.SpecularSimulation(scan, sample)
- simulation.beam().setIntensity(parameters["intensity"])
simulation.setBackground(ba.ConstantBackground(5e-7))
return simulation
def run_simulation(q_axis, fitParams, *, sign, ms150=False):
- simulation = get_simulation(q_axis, fitParams, sign, ms150)
- return simulation.simulate()
+ parameters = dict(fitParams, **fixedParams)
+
+ simulation = get_simulation(q_axis, parameters, sign, ms150)
+ result = simulation.simulate()
+ result.data_field().scale(parameters["intensity"])
+ return result
def qr(result):
--
GitLab