Changeset 8f83719f in sasview for src/sas/sascalc

Timestamp:

Nov 24, 2017 9:57:08 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

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:

f4480f0

Parents:

cb4d219

Message:

More inversion work on details in validation, UI design and such

Location:

src/sas/sascalc

Files:

• calculator/resolution_calculator.py (modified) (1 diff)
• pr/invertor.py (modified) (4 diffs)
• pr/num_term.py (modified) (1 diff)

src/sas/sascalc/calculator/resolution_calculator.py

@@ -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/pr/invertor.py

@@ -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
@@ -544 +544 @@
         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