optimized parameters

python/MXTuning.py

@@ -24,6 +24,9 @@ bit 9=512: generate observer code (after files generated with matlab)
         phase gathering -> not yet compiling: /home/zamofing_t/Documents/prj/SwissFEL/PowerBrickInspector/ppmac/fast_gather
      BUT data acquired and stored in: /media/zamofing_t/DataUbuHD/VirtualBox/shared/data
 '''
+from __future__ import print_function
+try: raw_input;input=raw_input
+except NameError: pass
 
 import os, sys, json, time
 import numpy as np
@@ -503,7 +506,7 @@ EXPORT_SYMBOL(obsvr_servo_ctrl_{motid});'''.format(motid=motid)
       #hl+=ax1.plot(p,c,'b.',label='vel<0')
       #FfricLut=np.array([p,c]).T
       Ffric=np.array([c1.mean(),c2.mean()])
-      print 'Avg current forward:',Ffric[0],'Avg current backward:',Ffric[1]
+      print('Avg current forward:',Ffric[0],'Avg current backward:',Ffric[1])
       #print 'FfricLut',FfricLut
       #print '//positions '+'%g,%g,%g'%tuple(p[0:3]),'...%g,%g,%g'%tuple(p[-3:])
       #print 'float lutCur[%d]={'%len(p)
@@ -742,9 +745,9 @@ EXPORT_SYMBOL(obsvr_servo_ctrl_{motid});'''.format(motid=motid)
             bm+=32 #amplitude linear (not dB)
           self.bode_plot(data, mode=bm, kwargs=meta)
           plt.show(block=False)
-          #save_figs(fn)
+          save_figs(fn)
           #wait_key()
-          raw_input('press return')
+          input('press return')
 
 
       if mode&256: #custom plots
@@ -770,7 +773,7 @@ EXPORT_SYMBOL(obsvr_servo_ctrl_{motid});'''.format(motid=motid)
         ax.plot(t,y)
         ax.grid(True)
         plt.show(block=False)
-        raw_input('press return')
+        input('press return')
 
         plt.close('all')
         fn=os.path.join(self.baseDir,'chirp_all_1a.npz')
@@ -833,7 +836,7 @@ EXPORT_SYMBOL(obsvr_servo_ctrl_{motid});'''.format(motid=motid)
 
       if mode&~512: # show and block only if not code generation
         plt.show(block=False)
-        raw_input('press return')
+        input('press return')
 
 
 def save_figs(fn):
@@ -910,9 +913,14 @@ Examples:'''+''.join(map(lambda s:cmd+s, exampleCmd))+'\n '
     args=parser.parse_args()
 
     #plt.ion()
-    #args.host='MOTTEST-CPPM-CRM0573'
-    args.host=None
-    if args.host is None:
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  # create an INET, STREAMing socket
+    s.settimeout(.1)
+    try:
+      port=22 #ssh port
+      s.connect((args.host, port))  # try to connect to port
+      s.close()
+    except (socket.error, socket.gaierror) as e:
       comm=gt=None
     else:
       comm = PPComm(host=args.host)

python/ShapePathAnalyser/MAxyPlot.py

@@ -339,7 +339,7 @@ class MPLCanvasImg(FigureCanvas):
 
     M=np.mat(trf0).I
     trfPtsImgI=M*np.vstack((trfPts[:,(0,1)].T,np.ones((1,n))))
-    trfPtsImgO=M*np.vstack((trfPts[:,(02,3)].T,np.ones((1,n))))
+    trfPtsImgO=M*np.vstack((trfPts[:,(2,3)].T,np.ones((1,n))))
     trfPtsImg=np.hstack((trfPtsImgI[0:2,:].T,trfPtsImgO[0:2,:].T))
 
     A=np.zeros((n*2, 6))

python/helicalscan.py

@@ -64,6 +64,9 @@ verbose bits:
 #dx,dz,w,fy -> pb coord. be aware of inverted dx,dz signs
 from __future__ import print_function
 #from __future__ import absolute_import,division,generators,nested_scopes,print_function,unicode_literals,with_statement
+try: raw_input;input=raw_input
+except NameError: pass
+
 import os, sys, json,re
 import numpy as np
 import matplotlib as mpl
@@ -76,8 +79,6 @@ from utilities import *
 import telnetlib
 
 sys.path.insert(0,os.path.expanduser('~/Documents/prj/SwissFEL/PBTools/'))
-#sys.path.insert(0,'/sf/bernina/config/swissmx/zamofing_t')
-#sys.path.insert(0,'/sf/bernina/config/swissmx/zamofing_t/pbtools/misc/')
 from  pbtools.misc.pp_comm import PPComm
 from  pbtools.misc.gather import Gather
 from MXMotion import MotionBase
@@ -1207,14 +1208,23 @@ close
 if __name__=='__main__':
   def run_test(args):
     mode=args.mode
-    #args.host=None
-
-    if args.host is None or mode in(3,4):
+    if mode in(3,4):
       comm=gather=None
     else:
-      comm = PPComm(host=args.host)
-      gather = Gather(comm)
-      gpascii = comm.gpascii
+      import socket
+      s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  # create an INET, STREAMing socket
+      s.settimeout(.1)
+      try:
+        port=22 #ssh port
+        s.connect((args.host, port))  # try to connect to port
+        s.close()
+      except (socket.error, socket.gaierror) as e:
+        comm=gather=None
+      else:
+        comm = PPComm(host=args.host)
+        gather = Gather(comm)
+
+
 
     # direct start
     #hs=HelicalScan(comm, gather, args.verbose,sync_mode=0,pt2pt_time=20)

python/shapepath.py

@@ -42,6 +42,9 @@ Enc 7: Interferometer X
 '''
 from __future__ import print_function
 #from __future__ import absolute_import,division,generators,nested_scopes,print_function,unicode_literals,with_statement
+try: raw_input;input=raw_input
+except NameError: pass
+
 import os, sys, time
 import numpy as np
 import matplotlib as mpl
@@ -49,8 +52,6 @@ import matplotlib.pyplot as plt
 import subprocess as sprc
 
 sys.path.insert(0,os.path.expanduser('~/Documents/prj/SwissFEL/PBTools/'))
-#sys.path.insert(0,'/sf/bernina/config/swissmx/zamofing_t')
-#sys.path.insert(0,'/sf/bernina/config/swissmx/zamofing_t/pbtools/misc/')
 from  pbtools.misc.pp_comm import PPComm
 from  pbtools.misc.gather import Gather
 from MXMotion import MotionBase
@@ -802,8 +803,14 @@ if __name__=='__main__':
 
   def run_test(args):
     #dp=DebugPlot();dp.plot_gather();return
-    #args.host=None
-    if args.host is None:
+    import socket
+    s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)  # create an INET, STREAMing socket
+    s.settimeout(.1)
+    try:
+      port=22 #ssh port
+      s.connect((args.host, port))  # try to connect to port
+      s.close()
+    except (socket.error, socket.gaierror) as e:
       comm=gather=None
     else:
       comm = PPComm(host=args.host)
@@ -879,7 +886,7 @@ if __name__=='__main__':
 
     print('done')
     plt.show(block=False)
-    raw_input('press return')
+    input('press return')
 
 
     #sp.plot_points(sp.points);plt.show()