Convert from "print ..." to "print(...)"

[hooke.git] / hooke / plugin / curve.py

diff --git a/hooke/plugin/curve.py b/hooke/plugin/curve.py
index d9cda884842c45a7baef2e87bd6887e48e0baa89..6c13c6c76dfbc44ba187657ca102a4a818e91f23 100644 (file)
--- a/hooke/plugin/curve.py
+++ b/hooke/plugin/curve.py
@@ -813,21 +813,22 @@ class OldCruft (object):
             maxpoint=True
 
         if rebase:
-            print 'Select baseline'
+            print('Select baseline')
             self.basepoints=self._measure_N_points(N=2, whatset=whatset)
             self.basecurrent=self.current.path
 
         if maxpoint:
-            print 'Select two points'
+            print('Select two points')
             points=self._measure_N_points(N=2, whatset=whatset)
             boundpoints=[points[0].index, points[1].index]
             boundpoints.sort()
             try:
                 y=min(plot.vectors[whatset][1][boundpoints[0]:boundpoints[1]])
             except ValueError:
-                print 'Chosen interval not valid. Try picking it again. Did you pick the same point as begin and end of interval?'
+                print('Chosen interval not valid. Try picking it again. Did '
+                      'you pick the same point as begin and end of interval?')
         else:
-            print 'Select point to measure'
+            print('Select point to measure')
             points=self._measure_N_points(N=1, whatset=whatset)
             #whatplot=points[0].dest
             y=points[0].graph_coords[1]
@@ -839,7 +840,7 @@ class OldCruft (object):
 
         avg=np.mean(to_average)
         forcebase=abs(y-avg)
-        print str(forcebase*(10**12))+' pN'
+        print('{} pN'.format(forcebase * 10**12))
         to_dump='forcebase '+self.current.path+' '+str(forcebase*(10**12))+' pN'
         self.outlet.push(to_dump)
 
@@ -868,17 +869,17 @@ class OldCruft (object):
         # Decides between the two forms of user input, as per (args)
         if fitspan == 0:
             # Gets the Xs of two clicked points as indexes on the current curve vector
-            print 'Click twice to delimit chunk'
+            print('Click twice to delimit chunk')
             points=self._measure_N_points(N=2,whatset=1)
         else:
-            print 'Click once on the leftmost point of the chunk (i.e.usually the peak)'
+            print('Click once on the leftmost point of the chunk (i.e.usually the peak)')
             points=self._measure_N_points(N=1,whatset=1)
             
         slope=self._slope(points,fitspan)
 
         # Outputs the relevant slope parameter
-        print 'Slope:'
-        print str(slope)
+        print('Slope:')
+        print(str(slope))
         to_dump='slope '+self.current.path+' '+str(slope)
         self.outlet.push(to_dump)
 
@@ -894,12 +895,12 @@ class OldCruft (object):
         try:
             parameters=self.linefit_between(clickedpoints[0],clickedpoints[1])
         except:
-            print 'Cannot fit. Did you click twice the same point?'
+            print('Cannot fit. Did you click twice the same point?')
             return
              
         # Outputs the relevant slope parameter
-        print 'Slope:'
-        print str(parameters[0])
+        print('Slope:')
+        print(str(parameters[0]))
         to_dump='slope '+self.curve.path+' '+str(parameters[0])
         self.outlet.push(to_dump)