Changeset e3ae090 in sasview for src/sas/sasgui/perspectives/fitting/models.py

Timestamp:

Jul 12, 2016 9:12:24 AM (8 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

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:

4b71e91

Parents:

8cb6cd6

git-author:

wpotrzebowski <Wojciech.Potrzebowski@…> (07/05/16 04:00:02)

git-committer:

Piotr Rozyczko <piotr.rozyczko@…> (07/12/16 09:12:24)

Message:

Merge master

see issue #590. fix error in q.rg and uncertainties in Rg and I0.
Uncertainty calculation for slope and intercept are still wrong I
believe.

references #205 - Removed Kratky plot choice from linearized plots for
now since it doesn't currently work.

close #590. A lot of problems were caused by LineModel? and LinerFit?
having different equations (ax+b vs a+bx). Further errors in
calculations, particularly of uncertainties were fixed. The fact that
the fits to not account for smearing was verified and a warning added.
Code was also modified to update the qmin and qmax to match changes in
the transformed xmin xmax. Lots of documentation was added and the
fitdialog layout was cleaned up considerably. This is now usable though
the design of the user interface (and the whole design of linear fits)
could use a rethink.

File:

• src/sas/sasgui/perspectives/fitting/models.py (modified) (2 diffs)

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

@@ -181 +181 @@
             try:
                 model = load_custom_model(path)
+                plugins[model.name] = model
             except Exception:
                 msg = traceback.format_exc()
@@ -187 +188 @@
                 logging.warning("Failed to load plugin %r. See %s for details"
                                 % (path, PLUGIN_LOG))
-            plugins[model.name] = model
-
+            
     return plugins