Changeset d8c53fa3 in sasview

Timestamp:

Oct 26, 2017 9:24:13 AM (7 years ago)

Author:

Adam Washington <adam.washington@…>

Branches:

ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

f582224

Parents:

73a24fa

Message:

More closely match unit test

File:

• src/sas/qtgui/Perspectives/PrInversion/dmax.py (modified) (2 diffs)

src/sas/qtgui/Perspectives/PrInversion/dmax.py

@@ -121 +121 @@
             self.pr_state.d_max = x
             try:
-                out, cov = self.pr_state.invert(self.nfunc)
+                out, cov = self.pr_state.invert(self.pr_state.nfunc)
 
                 iq0.append(self.pr_state.iq0(out))
@@ -174 +174 @@
     from sas.sascalc.dataloader.loader import Loader
 
-    data = Loader().load("../../../../../test/pr_inversion/test/sphere_80.txt")[0]
+    data = Loader().load("test/pr_inversion/test/sphere_80.txt")[0]
     pr_state = Invertor()
-    pr_state.d_max = 160.0
+    pr_state.d_max = 130.0
     pr_state.alpha = 0.0007
     pr_state.x = data.x
     pr_state.y = data.y
-    pr_state.err = 0.15*np.sqrt(data.y)
+    pr_state.err = 0.15*data.y
+    pr_state.nfunc = 15
+
+    print(data.x, data.y, 0.15*np.sqrt(data.y))
 
     DLG = DmaxWindow(pr_state, 15, reactor)