Changeset 600005c in sasview

Timestamp:

Nov 15, 2016 10:39:13 AM (8 years ago)

Author:

krzywon

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:

b4fc0f9

Parents:

64c7f39 (diff), 3d29f26b (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' into ticket-795

Files:

• test/sasdataloader/test/utest_ascii.py (modified) (1 diff)
• src/sas/sasgui/perspectives/fitting/basepage.py (modified) (3 diffs)
• src/sas/sasgui/perspectives/fitting/pagestate.py (modified) (1 diff)

test/sasdataloader/test/utest_ascii.py

@@ -92 +92 @@
         """
         # Test .ABS file loaded as ascii
-        f = self.loader.load("ascii_test_6.txt")
+        f = None
+        try:
+            f = self.loader.load("ascii_test_6.txt")
         # The length of the data is 5
-        self.assertEqual(f, None)
+        except:
+            self.assertEqual(f, None)
         
 if __name__ == '__main__':

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

@@ -1157 +1157 @@
             category_pos = int(state.categorycombobox)
         except:
-            state.formfactorcombobox = state.formfactorcombobox.lower()
-            state.formfactorcombobox = \
-                state.formfactorcombobox.replace('model', '')
-            state.formfactorcombobox = unicode(state.formfactorcombobox)
+            if state.formfactorcombobox is not None:
+                state._convert_to_sasmodels()
             state.categorycombobox = unicode(state.categorycombobox)
             if state.categorycombobox in self.categorybox.Items:
@@ -1528 +1526 @@
                         index_data = ((self.qmin_x <= self.data.x) &
                                       (self.data.x <= self.qmax_x))
-                        val = str(len(self.data.x[index_data is True]))
+                        val = str(len([index_data is True]))
                         self.Npts_fit.SetValue(val)
                     else:
@@ -1576 +1574 @@
         if len(statelist) != len(listtorestore):
             return
+
+        ordered_list = []
+        for i in range(len(listtorestore)) :
+            for param in statelist:
+                if param[1] == listtorestore[i][1]:
+                    ordered_list.append(param)
+                    break
+        statelist = ordered_list
 
         for j in range(len(listtorestore)):

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

@@ -355 +355 @@
             obj.saved_states[copy_name] = copy_state
         return obj
+
+    def _convert_to_sasmodels(self):
+        """
+        Convert parameters to a form usable by sasmodels converter
+
+        :return: None
+        """
+        from sasmodels import convert
+        import re
+        # Create conversion dictionary to send to sasmodels
+        p = dict()
+        for fittable, name, value, _, uncert, lower, upper, units in \
+                self.parameters:
+            if not value:
+                value = numpy.nan
+            if not uncert or uncert[1] == '':
+                uncert[0] = False
+                uncert[1] = numpy.nan
+            if not upper or upper[1] == '':
+                upper[0] = False
+                upper[1] = numpy.nan
+            if not lower or lower[1] == '':
+                lower[0] = False
+                lower[1] = numpy.nan
+            p[name] = float(value)
+            p[name + ".fittable"] = bool(fittable)
+            p[name + ".std"] = float(uncert[1])
+            p[name + ".upper"] = float(upper[1])
+            p[name + ".lower"] = float(lower[1])
+            p[name + ".units"] = units
+        name, params = convert.convert_model(self.formfactorcombobox, p)
+
+        # Only convert if old != new, otherwise all the same
+        if name != self.formfactorcombobox:
+            self.formfactorcombobox = name
+            self.parameters = []
+            for name, info in params.iteritems():
+                if ".fittable" in name or ".std" in name or ".upper" in name or\
+                        ".lower" in name or ".units" in name:
+                    pass
+                else:
+                    fittable = params.get(name + ".fittable")
+                    std = params.get(name + ".std")
+                    upper = params.get(name + ".upper")
+                    lower = params.get(name + ".lower")
+                    units = params.get(name + ".units")
+                    if std is not None:
+                        std = [True, str(std)]
+                    else:
+                        std = [False, '']
+                    if lower is not None:
+                        lower = [True, str(lower)]
+                    else:
+                        lower = [False, '']
+                    if upper is not None:
+                        upper = [True, str(upper)]
+                    else:
+                        upper = [False, '']
+                    param_list = [bool(fittable), str(name), str(info),
+                                  "+/-", std, lower, upper, str(units)]
+                    self.parameters.append(param_list)
+
 
     def _repr_helper(self, list, rep):