Changeset aed159f in sasview for src/sas

Timestamp:

Oct 26, 2018 5:58:45 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:

75906a1

Parents:

33812c3

Message:

Minor corrections to Inversion after PK's CR

Location:

src/sas

Files:

• qtgui/Perspectives/Inversion/InversionPerspective.py (modified) (1 diff)
• qtgui/Utilities/GuiUtils.py (modified) (2 diffs)
• sascalc/pr/fit/expression.py (modified) (1 diff)
• sascalc/pr/invertor.py (modified) (5 diffs)

src/sas/qtgui/Perspectives/Inversion/InversionPerspective.py

@@ -473 +473 @@
             self._calculator.set_qmax(qmax)
             if np.size(self.logic.data.dy) == 0 or np.all(self.logic.data.dy) == 0:
-                self.logic.data.dy = self._calculator.add_errors(self.logic.data.y)
+                self._calculator.add_errors()
             self.updateDataList(data)
             self.populateDataComboBox(self.logic.data.filename, data)

src/sas/qtgui/Utilities/GuiUtils.py

@@ -95 +95 @@
     except ImportError:
         pass
-        #logging.error("Error loading %s/%s: %s" % (path, confg_file, sys.exc_value))
     except ValueError:
         print("Value error")
@@ -102 +101 @@
         if fObj is not None:
             fObj.close()
-    #logging.info("GuiManager loaded %s/%s" % (path, confg_file))
     return config_module
 

src/sas/sascalc/pr/fit/expression.py

@@ -209 +209 @@
 """%("\n    ".join(assignments),"\n    ".join(code))
 
-    #print("Function: "+functiondef)
-    exec(functiondef) in globals, locals
+    exec(functiondef, globals, locals)
     retfn = locals['eval_expressions']
 

src/sas/sascalc/pr/invertor.py

@@ -227 +227 @@
         return None
 
-    def add_errors(self, yvalues):
-        """
-        Adds errors to data set is they are not avaialble
-        :return:
-        """
-        stats_errors = np.zeros(len(yvalues))
-        for i in range(len(yvalues)):
-            # Scale the error so that we can fit over several decades of Q
-            scale = 0.05 * np.sqrt(yvalues[i])
-            min_err = 0.01 * yvalues[i]
-            stats_errors[i] = scale * np.sqrt(np.fabs(yvalues[i])) + min_err
-        logger.warning("Simulated errors have been added to the data set\n")
-        return stats_errors
+    def add_errors(self, sigma=0.05):
+        """
+        Adds errors to data set is they are not available.
+        Uses  $\Delta y = \sigma | y |$.
+        """
+        self.dy = sigma * np.fabs(self.y)
 
     def clone(self):
@@ -514 +507 @@
             # We were not able to estimate the errors
             # Return an empty error matrix
-            logger.error(sys.exc_value)
+            logger.error(sys.exc_info()[1])
 
         # Keep a copy of the last output
@@ -559 +552 @@
             # number of terms
             best_alpha, _, _ = self.estimate_alpha(self.nfunc)
-            logger.warning("Invertor.estimate_numterms: %s" % sys.exc_value)
+            logger.warning("Invertor.estimate_numterms: %s" % sys.exc_info()[1])
             return self.nfunc, best_alpha, "Could not estimate number of terms"
 
@@ -646 +639 @@
 
         except:
-            message = "Invertor.estimate_alpha: %s" % sys.exc_value
+            message = "Invertor.estimate_alpha: %s" % sys.exc_info()[1]
             return 0, message, elapsed
 
@@ -763 +756 @@
 
             except:
-                msg = "Invertor.from_file: corrupted file\n%s" % sys.exc_value
+                msg = "Invertor.from_file: corrupted file\n%s" % sys.exc_info()[1]
                 raise RuntimeError(msg)
         else: