Changeset cf31fd9 in sasview for src/sas

Timestamp:

Jul 5, 2016 10:22:57 AM (9 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:

c68b8b5

Parents:

ee73af7 (diff), eccbf14 (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.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview into corfunc

Location:

src/sas

Files:

• sascalc/dataloader/readers/anton_paar_saxs_reader.py (added)
• sascalc/dataloader/readers/defaults.json (modified) (1 diff)
• sasgui/perspectives/fitting/models.py (modified) (2 diffs)
• sasgui/plottools/fitDialog.py (modified) (2 diffs)
• sasgui/guiframe/local_perspectives/plotting/Plotter1D.py (modified) (1 diff)
• sasgui/perspectives/corfunc/__init__.py (added)
• sasgui/perspectives/corfunc/corfunc.py (added)
• sasgui/perspectives/corfunc/corfunc_panel.py (added)

src/sas/sascalc/dataloader/readers/defaults.json

@@ -41 +41 @@
             "-extension":".nxs",
             "-reader":"nexus_reader"
+         },
+         {
+            "-extension":".pdh",
+            "-reader":"anton_paar_saxs_reader"
          }
       ]

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
 

src/sas/sasgui/plottools/fitDialog.py

@@ -516 +516 @@
             if self.Rgerr_tctr.IsShown():
                 if rg != None and rg != 0:
-                    value = format_number(3 * float(cstA) / (2 * rg))
+                    value = format_number(3 * float(errA) / (2 * rg))
                 else:
                     value = ''
                 self.Rgerr_tctr.SetValue(value)
                 if self.I0err_tctr.IsShown():
-                    val = numpy.abs(numpy.exp(cstB) - numpy.exp(cstB + errB))
+                    val = numpy.abs(numpy.exp(cstB) * errB)
                     self.I0err_tctr.SetValue(format_number(val))
             if self.Diameter_tctr.IsShown():
@@ -534 +534 @@
                 self.Diametererr_tctr.SetValue(value)
             if self.RgQmin_tctr.IsShown():
-                value = format_number(rg * self.mini)
+                value = format_number(rg * self.floatInvTransform(self.mini))
                 self.RgQmin_tctr.SetValue(value)
             if self.RgQmax_tctr.IsShown():
-                value = format_number(rg * self.maxi)
+                value = format_number(rg * self.floatInvTransform(self.maxi))
                 self.RgQmax_tctr.SetValue(value)
 

src/sas/sasgui/guiframe/local_perspectives/plotting/Plotter1D.py

@@ -222 +222 @@
             values = [max(x_data.min(), float(ctrl[0].GetValue())),
                       min(x_data.max(), float(ctrl[1].GetValue()))]
+            if len(ctrl) == 3:
+                colors.append('purple')
+                values.append(min(x_data.max(), float(ctrl[2].GetValue())))
             if self.ly == None:
                 self.ly = []