rename fct

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)
 

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)
 

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),

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)