Changeset d744767 in sasview for src/sas/sascalc

Timestamp:

Mar 16, 2018 2:05:42 PM (7 years ago)

Author:

krzywon

Branches:

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

Children:

47bf906

Parents:

477c473 (diff), e4c475b7 (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' into ESS_GUI_Pr

Location:

src/sas/sascalc

Files:

• calculator/resolution_calculator.py (modified) (3 diffs)
• dataloader/data_info.py (modified) (1 diff)
• dataloader/readers/danse_reader.py (modified) (1 diff)
• fit/AbstractFitEngine.py (modified) (1 diff)
• fit/expression.py (modified) (1 diff)
• fit/models.py (modified) (1 diff)
• pr/invertor.py (modified) (5 diffs)
• pr/num_term.py (modified) (1 diff)

src/sas/sascalc/calculator/resolution_calculator.py

@@ -1007 +1007 @@
         try:
             detector_offset = self.sample2detector_distance[1]
-        except:
-            logger.error(sys.exc_value)
+        except Exception as ex:
+            logger.error(ex)
 
         # detector size in [no of pix_x,no of pix_y]
@@ -1057 +1057 @@
         # qx_value and qy_value values in array
         qx_value = qx_value.repeat(detector_pix_nums_y)
-        qx_value = qx_value.reshape(detector_pix_nums_x, detector_pix_nums_y)
+        qx_value = qx_value.reshape(int(detector_pix_nums_x), int(detector_pix_nums_y))
         qy_value = qy_value.repeat(detector_pix_nums_x)
-        qy_value = qy_value.reshape(detector_pix_nums_y, detector_pix_nums_x)
+        qy_value = qy_value.reshape(int(detector_pix_nums_y), int(detector_pix_nums_x))
         qy_value = qy_value.transpose()
 
@@ -1094 +1094 @@
             output.qx_data = qx_value
             output.qy_data = qy_value
-        except:
-            logger.error(sys.exc_value)
+        except Exception as ex:
+            logger.error(ex)
 
         return output

src/sas/sascalc/dataloader/data_info.py

@@ -775 +775 @@
         clone.meta_data = deepcopy(self.meta_data)
         clone.errors = deepcopy(self.errors)
+        clone.isSesans = self.isSesans
 
         return clone

src/sas/sascalc/dataloader/readers/danse_reader.py

@@ -191 +191 @@
         x_vals = np.tile(x_vals, (size_y, 1)).flatten()
         y_vals = np.tile(y_vals, (size_x, 1)).T.flatten()
-        if (np.all(self.current_dataset.err_data == None)
+        if (np.all(self.current_dataset.err_data is None)
                 or np.any(self.current_dataset.err_data <= 0)):
             new_err_data = np.sqrt(np.abs(self.current_dataset.data))

src/sas/sascalc/fit/AbstractFitEngine.py

@@ -300 +300 @@
             self.qmax = math.sqrt(x_max * x_max + y_max * y_max)
         ## new error image for fitting purpose
-        if self.err_data is None or self.err_data == []:
+        if self.err_data is None or not self.err_data:
             self.res_err_data = np.ones(len(self.data))
         else:

src/sas/sascalc/fit/expression.py

@@ -210 +210 @@
 
     #print("Function: "+functiondef)
-    exec functiondef in globals,locals
+    # Python 2.7
+    #exec (functiondef in globals,locals)
+    # Python 3.5
+    exec (functiondef, globals, locals)
+
     retfn = locals['eval_expressions']
 

src/sas/sascalc/fit/models.py

@@ -139 +139 @@
         if type is not None and issubclass(type, py_compile.PyCompileError):
             print("Problem with", repr(value))
-            raise type, value, tb
+            raise (type, value, tb)
         return 1
 

src/sas/sascalc/pr/invertor.py

@@ -481 +481 @@
             float(chi2)
         except:
-            chi2 = -1.0
+            chi2 = [-1.0]
         self.chi2 = chi2
 
@@ -500 +500 @@
             cov = np.linalg.pinv(inv_cov)
             err = math.fabs(chi2 / float(npts - nfunc)) * cov
-        except:
+        except Exception as ex:
             # We were not able to estimate the errors
             # Return an empty error matrix
-            logger.error(sys.exc_value)
+            logger.error(ex)
 
         # Keep a copy of the last output
@@ -540 +540 @@
 
         """
-        from num_term import NTermEstimator
+        from sas.sascalc.pr.num_term import NTermEstimator
         estimator = NTermEstimator(self.clone())
         try:
             return estimator.num_terms(isquit_func)
-        except:
+        except Exception as ex:
             # If we fail, estimate alpha and return the default
             # 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" % ex)
             return self.nfunc, best_alpha, "Could not estimate number of terms"
 
@@ -634 +634 @@
                 return best_alpha, message, elapsed
 
-        except:
-            message = "Invertor.estimate_alpha: %s" % sys.exc_value
+        except Exception as ex:
+            message = "Invertor.estimate_alpha: %s" % ex
             return 0, message, elapsed
 
@@ -754 +754 @@
                         self.cov[i][i] = float(toks2[1])
 
-            except:
-                msg = "Invertor.from_file: corrupted file\n%s" % sys.exc_value
+            except Exception as ex:
+                msg = "Invertor.from_file: corrupted file\n%s" % ex
                 raise RuntimeError(msg)
         else:

src/sas/sascalc/pr/num_term.py

@@ -183 +183 @@
                 data_y = np.append(data_y, test_y)
                 data_err = np.append(data_err, err)
-            except:
-                logger.error(sys.exc_value)
+            except Exception as ex:
+                logger.error(ex)
 
     return data_x, data_y, data_err