Changeset ff11b21 in sasview for src/sas/sascalc/corfunc

Timestamp:

Aug 22, 2016 7:34:56 AM (8 years ago)

Author:

lewis

Branches:

master, 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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

caeb382

Parents:

93b145a

Message:

Show extrapolation parameters in GUI

Also change I_obs label to I_obs - Bg and correct Guinier equation in the
docs.

File:

• src/sas/sascalc/corfunc/corfunc_calculator.py (modified) (3 diffs)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -115 +115 @@
         iq = self._data.y
 
-        s2 = self._fit_data(q, iq)
+        params, s2 = self._fit_data(q, iq)
         qs = np.arange(0, q[-1]*100, (q[1]-q[0]))
         iqs = s2(qs)
@@ -121 +121 @@
         extrapolation = Data1D(qs, iqs)
 
-        return extrapolation
+        return params, extrapolation
 
     def compute_transform(self, extrapolation, trans_type, background=None,
@@ -271 +271 @@
             self.lowerq)
 
-        return s2
+        params = {'A': g[1], 'B': g[0], 'K': k, 'sigma': sigma}
+
+        return params, s2