From 39875f2ef071d3ced6f396131d2a7ff249981a5b Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Fri, 22 Sep 2023 10:22:44 +0200
Subject: [PATCH] rename fct
---
auto/Examples/fit/specular/Pt_layer_fit.py | 4 ++--
auto/MiniExamples/fit/specular/Pt_layer_fit.py | 4 ++--
rawEx/fit/specular/Honeycomb_fit.py | 10 +++++-----
rawEx/fit/specular/Pt_layer_fit.py | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/auto/Examples/fit/specular/Pt_layer_fit.py b/auto/Examples/fit/specular/Pt_layer_fit.py
index ccbcd4f5139..a9b82577a8b 100755
--- a/auto/Examples/fit/specular/Pt_layer_fit.py
+++ b/auto/Examples/fit/specular/Pt_layer_fit.py
@@ -60,7 +60,7 @@ def get_simulation(q_axis, P):
# Experimental data
####################################################################
-def get_experimental_data(filename, qmin, qmax):
+def load_data(filename, qmin, qmax):
filepath = os.path.join(datadir, filename)
data = np.genfromtxt(filepath, unpack=True)
@@ -144,7 +144,7 @@ if __name__ == '__main__':
qmin = 0.18
qmax = 2.4
- data = get_experimental_data("specular/RvsQ_36563_36662.dat.gz", qmin, qmax)
+ data = load_data("specular/RvsQ_36563_36662.dat.gz", qmin, qmax)
qzs = np.linspace(qmin, qmax, 1500)
diff --git a/auto/MiniExamples/fit/specular/Pt_layer_fit.py b/auto/MiniExamples/fit/specular/Pt_layer_fit.py
index 8e0063aa196..b64d78e7e08 100755
--- a/auto/MiniExamples/fit/specular/Pt_layer_fit.py
+++ b/auto/MiniExamples/fit/specular/Pt_layer_fit.py
@@ -60,7 +60,7 @@ def get_simulation(q_axis, P):
# Experimental data
####################################################################
-def get_experimental_data(filename, qmin, qmax):
+def load_data(filename, qmin, qmax):
filepath = os.path.join(datadir, filename)
data = np.genfromtxt(filepath, unpack=True)
@@ -144,7 +144,7 @@ if __name__ == '__main__':
qmin = 0.18
qmax = 2.4
- data = get_experimental_data("specular/RvsQ_36563_36662.dat.gz", qmin, qmax)
+ data = load_data("specular/RvsQ_36563_36662.dat.gz", qmin, qmax)
qzs = np.linspace(qmin, qmax, 1500)
diff --git a/rawEx/fit/specular/Honeycomb_fit.py b/rawEx/fit/specular/Honeycomb_fit.py
index 8664da50637..bcb413ac4e6 100755
--- a/rawEx/fit/specular/Honeycomb_fit.py
+++ b/rawEx/fit/specular/Honeycomb_fit.py
@@ -88,7 +88,7 @@ def run_simulation(qaxis, P, *, sign, T):
# Experimental data
####################################################################
-def get_experimental_data(filename, qmin, qmax):
+def load_data(filename, qmin, qmax):
# Load from disk.
filepath = os.path.join(datadir, filename)
with open(filepath, 'r') as f:
@@ -218,10 +218,10 @@ if __name__ == '__main__':
qmax = 1.4
data = [
- get_experimental_data("specular/honeycomb300p.dat", qmin, qmax),
- get_experimental_data("specular/honeycomb300m.dat", qmin, qmax),
- get_experimental_data("specular/honeycomb150p.dat", qmin, qmax),
- get_experimental_data("specular/honeycomb150m.dat", qmin, qmax)]
+ load_data("specular/honeycomb300p.dat", qmin, qmax),
+ load_data("specular/honeycomb300m.dat", qmin, qmax),
+ load_data("specular/honeycomb150p.dat", qmin, qmax),
+ load_data("specular/honeycomb150m.dat", qmin, qmax)]
simFunctions = [
lambda q, P: run_simulation(q, P, sign=+1, T=300),
diff --git a/rawEx/fit/specular/Pt_layer_fit.py b/rawEx/fit/specular/Pt_layer_fit.py
index 17f91023a53..0d0b68d4383 100755
--- a/rawEx/fit/specular/Pt_layer_fit.py
+++ b/rawEx/fit/specular/Pt_layer_fit.py
@@ -60,7 +60,7 @@ def get_simulation(q_axis, P):
# Experimental data
####################################################################
-def get_experimental_data(filename, qmin, qmax):
+def load_data(filename, qmin, qmax):
filepath = os.path.join(datadir, filename)
data = np.genfromtxt(filepath, unpack=True)
@@ -144,7 +144,7 @@ if __name__ == '__main__':
qmin = 0.18
qmax = 2.4
- data = get_experimental_data("specular/RvsQ_36563_36662.dat.gz", qmin, qmax)
+ data = load_data("specular/RvsQ_36563_36662.dat.gz", qmin, qmax)
qzs = np.linspace(qmin, qmax, 1500)
--
GitLab