Changeset 0cc77d8 in sasview for src/sas/sascalc/pr

Timestamp:

May 1, 2017 3:00:53 PM (8 years ago)

Author:

GitHub <noreply@…>

Children:

733cdcd

Parents:

b9d74f3 (diff), c00a797a (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.

git-author:

Paul Kienzle <pkienzle@…> (05/01/17 15:00:53)

git-committer:

GitHub <noreply@…> (05/01/17 15:00:53)

Message:

Merge branch 'master' into raise

Location:

src/sas/sascalc/pr

Files:

• fit/AbstractFitEngine.py (modified) (2 diffs)
• fit/Loader.py (modified) (3 diffs)
• fit/expression.py (modified) (1 diff)
• num_term.py (modified) (2 diffs)
• invertor.py (modified) (8 diffs)

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

@@ +1 @@
+from __future__ import print_function
 
 import  copy
@@ -630 +631 @@
         """
         """
-        print str(self)
+        print(str(self))

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

@@ +1 @@
+from __future__ import print_function
+
 # class Loader  to load any king of file
 #import wx
@@ -54 +56 @@
                     self.dx = np.zeros(len(self.x))
                 except:
-                    print "READ ERROR", line
+                    print("READ ERROR", line)
             # Sanity check
             if not len(self.x) == len(self.dx):
@@ -80 +82 @@
     load = Load()
     load.set_filename("testdata_line.txt")
-    print load.get_filename() 
+    print(load.get_filename()) 
     load.set_values()
-    print load.get_values()
+    print(load.get_values())
     
             

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

@@ +1 @@
+from __future__ import print_function
+
 # This program is public domain
 """

src/sas/sascalc/pr/num_term.py

@@ +1 @@
+from __future__ import print_function
+
 import math
 import numpy as np
@@ -197 +199 @@
     # Testing estimator
     est = NTermEstimator(invert)
-    print est.num_terms()
+    print(est.num_terms())

src/sas/sascalc/pr/invertor.py

@@ -148 +148 @@
                 msg = "Invertor: one of your q-values is zero. "
                 msg += "Delete that entry before proceeding"
-                raise ValueError, msg
+                raise ValueError(msg)
             return self.set_x(value)
         elif name == 'y':
@@ -159 +159 @@
                 msg = "Invertor: d_max must be greater than zero."
                 msg += "Correct that entry before proceeding"
-                raise ValueError, msg
+                raise ValueError(msg)
             return self.set_dmax(value)
         elif name == 'q_min':
@@ -181 +181 @@
                 return self.set_has_bck(0)
             else:
-                raise ValueError, "Invertor: has_bck can only be True or False"
+                raise ValueError("Invertor: has_bck can only be True or False")
 
         return Cinvertor.__setattr__(self, name, value)
@@ -325 +325 @@
         if self.is_valid() <= 0:
             msg = "Invertor.invert: Data array are of different length"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         p = np.ones(nfunc)
@@ -358 +358 @@
         if self.is_valid() <= 0:
             msg = "Invertor.invert: Data arrays are of different length"
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         p = np.ones(nfunc)
@@ -442 +442 @@
         if self.is_valid() < 0:
             msg = "Invertor: invalid data; incompatible data lengths."
-            raise RuntimeError, msg
+            raise RuntimeError(msg)
 
         self.nfunc = nfunc
@@ -467 +467 @@
             self._get_matrix(nfunc, nq, a, b)
         except:
-            raise RuntimeError, "Invertor: could not invert I(Q)\n  %s" % sys.exc_value
+            raise RuntimeError("Invertor: could not invert I(Q)\n  %s" % sys.exc_value)
 
         # Perform the inversion (least square fit)
@@ -751 +751 @@
             except:
                 msg = "Invertor.from_file: corrupted file\n%s" % sys.exc_value
-                raise RuntimeError, msg
+                raise RuntimeError(msg)
         else:
             msg = "Invertor.from_file: '%s' is not a file" % str(path)
-            raise RuntimeError, msg
+            raise RuntimeError(msg)