Changeset 7ad12e9f in sasview for src/sas/sascalc/fit

Timestamp:

Mar 26, 2019 3:24:25 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1094-headless

Children:

3f89c0e

Parents:

9cc1f49

Message:

fix handling of user-defined data uncertainty in headless fits

File:

• src/sas/sascalc/fit/fitstate.py (modified) (1 diff)

src/sas/sascalc/fit/fitstate.py

@@ -319 +319 @@
     weight = get_data_weight(state)
 
+    # Note: wx GUI makes a copy of the data and assigns weight to
+    # data.err_data/data.dy instead of using the err_data/dy keywords
+    # when creating the Fit object.
+
     # Make fit data object and set the data weights
     # TODO: check 2D masked data
     if state.enable2D:
         fitdata = FitData2D(sas_data2d=data, data=data.data,
-                            err_data=data.err_data)
-        fitdata.err_data = weight
+                            err_data=weight)
     else:
         data.mask = (np.isnan(data.y) if data.y is not None
                         else np.zeros_like(data.x, dtype='bool'))
         fitdata = FitData1D(x=data.x, y=data.y,
-                            dx=data.dx, dy=data.dy, smearer=smearer)
-        fitdata.dy = weight
+                            dx=data.dx, dy=weight, smearer=smearer)
         fitdata.set_fit_range(qmin=state.qmin, qmax=state.qmax)
     fitdata.sas_data = data