Changeset 4396300 in sasview for src

Timestamp:

Oct 31, 2018 10:27:23 AM (6 years ago)

Author:

Piotr Rozyczko <piotr.rozyczko@…>

Branches:

ESS_GUI, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc

Children:

17e2d502

Parents:

48df831

Message:

Finalize backward compatibility mode for project read for simple fitting

Location:

src/sas/qtgui

Files:

• MainWindow/DataExplorer.py (modified) (1 diff)
• Utilities/GuiUtils.py (modified) (3 diffs)

src/sas/qtgui/MainWindow/DataExplorer.py

@@ -402 +402 @@
 
             # Convert fitpage properties and update the dict
-            all_data = GuiUtils.convertFromSVS(datasets)
+            try:
+                all_data = GuiUtils.convertFromSVS(datasets)
+            except Exception as ex:
+                # disregard malformed SVS and try to recover regardless
+                msg = "Error while reading the project file: "+str(ex)
+                logging.error(msg)
+                pass
         else:
             with open(filename, 'r') as infile:

src/sas/qtgui/Utilities/GuiUtils.py

@@ -1345 +1345 @@
                 w = 0
             param_dict['smearing'] = [str(w)]
-        # weighting is a bit trickier. 4.x has multiple keywords,
+        # weighting is also tricky. 4.x has multiple keywords,
         # one for each radio box.
         if params.dI_noweight:
@@ -1376 +1376 @@
             for p in params.orientation_params:
                 p_name = p[1]
-                param_dict[p_name] = [str(p[0]), str(p[2]), None, str(p[5][1]), str(p[6][1])]
+                p_min = "-360.0"
+                p_max = "360.0"
+                if p[5][1] != "":
+                    p_min = p[5][1]
+                if p[6][1] != "":
+                    p_max = p[6][1]
+                param_dict[p_name] = [str(p[0]), str(p[2]), None, p_min, p_max]
 
         # disperse parameters
@@ -1382 +1388 @@
             for p in params.fittable_param:
                 p_name = p[1]
-                param_dict[p_name] = [str(p[0]), str(p[2]), None, str(35), str(3)]
-
-        # magnetic parameters
+                p_opt = str(p[0])
+                p_err = "0"
+                p_width = str(p[2])
+                p_min = str(0)
+                p_max = "inf"
+                param_npts = p_name.replace('.width','.npts')
+                param_nsigmas = p_name.replace('.width', '.nsigmas')
+                if params.is_2D and p_name in params.disp_obj_dict:
+                    lookup = params.orientation_params_disp
+                    p_min = "-360.0"
+                    p_max = "360.0"
+                else:
+                    lookup = params.fixed_param
+                p_npts = [s[2] for s in lookup if s[1] == param_npts][0]
+                p_nsigmas = [s[2] for s in lookup if s[1] == param_nsigmas][0]
+                if p_name in params.disp_obj_dict:
+                    p_disp = params.disp_obj_dict[p_name]
+                else:
+                    p_disp = "gaussian"
+                param_dict[p_name] = [p_opt, p_width, p_min, p_max, p_npts, p_nsigmas, p_disp]
 
         content[params.data_id]['fit_params'] = param_dict