Changeset 4e373ab in sasview for src/sas/sasgui/perspectives

Timestamp:

Nov 16, 2018 5:46:47 PM (6 years ago)

Author:

GitHub <noreply@…>

Branches:

master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249

Children:

1752f38, 175b83f, 1342f6a

Parents:

f560e23 (diff), a5cffe5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Paul Butler <butlerpd@…> (11/16/18 17:46:47)

git-committer:

GitHub <noreply@…> (11/16/18 17:46:47)

Message:

Merge pull request #199 from SasView?/ticket-1205-fit-weights

Ticket 1205: use data weights from the GUI in the fit. Closes #1205

quick testing looks fine so going to merge.

File:

• src/sas/sasgui/perspectives/fitting/fitting.py (modified) (1 diff)

src/sas/sasgui/perspectives/fitting/fitting.py

@@ -776 +776 @@
         :param weight: current dy data
         """
-        # If we are not dealing with a specific fit problem, then
-        # there is no point setting the weights.
-        if fid is None:
-            return
+        # Note: this is used to set the data weights for the fit based on
+        # the weight selection in the GUI.
         if uid in self.page_finder.keys():
             self.page_finder[uid].set_weight(flag=flag, is2d=is2d)