Changeset 2385397 in sasview for src/sas/sascalc

Timestamp:

Sep 13, 2018 8:17:46 AM (6 years ago)

Author:

wojciech

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:

eeea6a3

Parents:

13da5f5 (diff), 1a15ada (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 'ESS_GUI' of ​https://github.com/SasView/sasview into ESS_GUI_Pr_fixes

File:

• src/sas/sascalc/pr/invertor.py (modified) (6 diffs)

src/sas/sascalc/pr/invertor.py

@@ -71 +71 @@
         A[j][i] = (Fourier transformed base function for point j)
 
-    We them choose a number of r-points, n_r, to evaluate the second
+    We then choose a number of r-points, n_r, to evaluate the second
     derivative of P(r) at. This is used as our regularization term.
     For a vector r of length n_r, the following n_r rows are set to ::
@@ -144 +144 @@
         x, y, err, d_max, q_min, q_max and alpha
         """
-        if   name == 'x':
+        if name == 'x':
             if 0.0 in value:
                 msg = "Invertor: one of your q-values is zero. "
@@ -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 clone(self):
         """
@@ -244 +258 @@
         invertor.x = self.x
         invertor.y = self.y
-        invertor.err = self.err
+        if np.size(self.err) == 0 or np.all(self.err) == 0:
+            invertor.err = self.add_errors(self.y)
+        else:
+            invertor.err = self.err
         invertor.est_bck = self.est_bck
         invertor.background = self.background
@@ -268 +285 @@
             A[i][j] = (Fourier transformed base function for point j)
 
-        We them choose a number of r-points, n_r, to evaluate the second
+        We then choose a number of r-points, n_r, to evaluate the second
         derivative of P(r) at. This is used as our regularization term.
         For a vector r of length n_r, the following n_r rows are set to ::
@@ -289 +306 @@
         # Reset the background value before proceeding
         # self.background = 0.0
+        if np.size(self.err) == 0 or np.all(self.err) == 0:
+            self.err = self.add_errors(self.y)
         if not self.est_bck:
             self.y -= self.background