no need for fct qr

auto/Examples/fit/specular/Pt_layer_fit.py

@@ -60,16 +60,6 @@ def get_simulation(q_axis, fitParams):
 
     return simulation
 
-
-def qr(result):
-    """
-    Return q and reflectivity arrays from simulation result.
-    """
-    q = np.array(result.axis(0).binCenters())
-    r = np.array(result.npArray())
-
-    return q, r
-
 ####################################################################
 #  Experimental data
 ####################################################################
@@ -162,8 +152,8 @@ if __name__ == '__main__':
 
     # Plot data with initial model
 
-    q, r = qr(get_simulation(qzs, PInitial).simulate())
-    plot(q, r, data, "PtLayerFit_initial.pdf", PInitial | fixedP)
+    r = get_simulation(qzs, PInitial).simulate().npArray()
+    plot(qzs, r, data, "PtLayerFit_initial.pdf", PInitial | fixedP)
 
     # Fit
 
@@ -189,7 +179,7 @@ if __name__ == '__main__':
     print("Fit Result:")
     print(fitResult)
 
-    q, r = qr(get_simulation(qzs, fitParams=fitResult).simulate())
-    plot(q, r, data, "PtLayerFit_fit.pdf", fitResult | fixedP)
+    r = get_simulation(qzs, fitParams=fitResult).simulate().npArray()
+    plot(qzs, r, data, "PtLayerFit_fit.pdf", fitResult | fixedP)
 
     plt.show()

auto/MiniExamples/fit/specular/Pt_layer_fit.py

@@ -60,16 +60,6 @@ def get_simulation(q_axis, fitParams):
 
     return simulation
 
-
-def qr(result):
-    """
-    Return q and reflectivity arrays from simulation result.
-    """
-    q = np.array(result.axis(0).binCenters())
-    r = np.array(result.npArray())
-
-    return q, r
-
 ####################################################################
 #  Experimental data
 ####################################################################
@@ -162,8 +152,8 @@ if __name__ == '__main__':
 
     # Plot data with initial model
 
-    q, r = qr(get_simulation(qzs, PInitial).simulate())
-    plot(q, r, data, "PtLayerFit_initial.pdf", PInitial | fixedP)
+    r = get_simulation(qzs, PInitial).simulate().npArray()
+    plot(qzs, r, data, "PtLayerFit_initial.pdf", PInitial | fixedP)
 
     # Fit
 
@@ -189,7 +179,7 @@ if __name__ == '__main__':
     print("Fit Result:")
     print(fitResult)
 
-    q, r = qr(get_simulation(qzs, fitParams=fitResult).simulate())
-    plot(q, r, data, "PtLayerFit_fit.pdf", fitResult | fixedP)
+    r = get_simulation(qzs, fitParams=fitResult).simulate().npArray()
+    plot(qzs, r, data, "PtLayerFit_fit.pdf", fitResult | fixedP)
 
     plt.show()

rawEx/fit/specular/Pt_layer_fit.py

@@ -60,16 +60,6 @@ def get_simulation(q_axis, fitParams):
 
     return simulation
 
-
-def qr(result):
-    """
-    Return q and reflectivity arrays from simulation result.
-    """
-    q = np.array(result.axis(0).binCenters())
-    r = np.array(result.npArray())
-
-    return q, r
-
 ####################################################################
 #  Experimental data
 ####################################################################
@@ -162,8 +152,8 @@ if __name__ == '__main__':
 
     # Plot data with initial model
 
-    q, r = qr(get_simulation(qzs, PInitial).simulate())
-    plot(q, r, data, "PtLayerFit_initial.pdf", PInitial | fixedP)
+    r = get_simulation(qzs, PInitial).simulate().npArray()
+    plot(qzs, r, data, "PtLayerFit_initial.pdf", PInitial | fixedP)
 
     # Fit
 
@@ -189,7 +179,7 @@ if __name__ == '__main__':
     print("Fit Result:")
     print(fitResult)
 
-    q, r = qr(get_simulation(qzs, fitParams=fitResult).simulate())
-    plot(q, r, data, "PtLayerFit_fit.pdf", fitResult | fixedP)
+    r = get_simulation(qzs, fitParams=fitResult).simulate().npArray()
+    plot(qzs, r, data, "PtLayerFit_fit.pdf", fitResult | fixedP)
 
     plt.show()