Changeset 3d8c49a in sasview

Timestamp:

Nov 9, 2016 8:57:23 AM (7 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:

4ec7089

Parents:

8bd5840

Message:

#795: Start of the conversion of old save states to new.

Location:

src/sas/sasgui/perspectives/fitting

Files:

• basepage.py (modified) (1 diff)
• pagestate.py (modified) (1 diff)

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

@@ -1157 +1157 @@
             category_pos = int(state.categorycombobox)
         except:
-            import sasmodels.convert as convert
             if state.formfactorcombobox is not None:
-                state.formfactorcombobox, state.parameters = \
-                    convert.convert_model(state.formfactorcombobox,
-                                          state.parameters)
-            state.formfactorcombobox = state.formfactorcombobox.lower()
-            state.formfactorcombobox = \
-                state.formfactorcombobox.replace('model', '')
-            state.formfactorcombobox = unicode(state.formfactorcombobox)
+                state._convert_to_sasmodels()
             state.categorycombobox = unicode(state.categorycombobox)
             if state.categorycombobox in self.categorybox.Items:

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
+        # 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] = {
+                "fittable" : bool(fittable),
+                "value" : float(value),
+                "std" : float(uncert[1]),
+                "upper" : float(upper[1]),
+                "lower" : float(lower[1]),
+                "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 info.get("std") is not numpy.nan:
+                    std = ['True', str(info.get("std"))]
+                else:
+                    std = ['False', '']
+                if info.get("lower") is not numpy.nan:
+                    lower = ['True', str(info.get("lower"))]
+                else:
+                    lower = ['False', '']
+                if info.get("upper") is not numpy.nan:
+                    upper = ['True', str(info.get("upper"))]
+                else:
+                    upper = ['False', '']
+                param_list = [info.get("fittable"), name, info.get("value"),
+                              "+/-", std, lower, upper]
+                self.parameters.append(param_list)
+
 
     def _repr_helper(self, list, rep):