Changeset 762 in ETALON

Timestamp:

May 23, 2018, 5:18:35 PM (6 years ago)

Author:

moutardier

Message:

Code written by Alexandre Moutardier

Location:

BPM

Files:

• bpm_constants.py (modified) (1 diff)
• initialise_motors.py (modified) (1 diff)
• motor_control (added)
• motor_control/bpm_constants.py (added)
• motor_control/initialise_motors.py (added)
• motor_control/motor_control.py (added)
• motor_control/position_test.py (added)
• motor_control/test.png (added)
• motor_control/test2.png (added)
• motor_control/write_to_motor_log_20180517.txt (added)
• motor_control/write_to_motor_log_20180518.txt (added)
• motor_control/writeclient.py (added)
• motor_control/writeclient_tmp_20180517.txt (added)
• scope_function.py (modified) (1 diff)
• writeclient.py (modified) (1 diff)

BPM/bpm_constants.py

@@ -1 +1 @@
 __author__ = 'delerue'
 
+import os
+
 global data_dir
-data_dir='/Users/delerue/Downloads/'
+if os.path.exists('home/alexandre/Bureau/stage/BPM/') :
+        data_dir='home/alexandre/Bureau/stage/BPM/'
+if os.path.exists('/Users/delerue/Downloads/'):
+        data_dir='/Users/delerue/Downloads/'
+else:
+        data_dir='./'
+
 
 #SCOPE_IP='192.168.197.145'

BPM/initialise_motors.py

@@ -218 +218 @@
     return ret
 
-controller_hello()
-move_motor_relative(1,1000,-1000)
-time.sleep(1)
-move_motor_relative(1,1000,1000)
+#controller_hello()
+#move_motor_relative(1,1000,-1000)
+#time.sleep(1)
+#move_motor_relative(1,1000,1000)

BPM/scope_function.py

@@ -6 +6 @@
 import urllib
 from datetime import datetime
-from sparc_constants import *
+#from sparc_constants import *
 from writeclient import writeclient
 
+global SCOPE_IP 
+SCOPE_IP = '10.0.1.112'
 scope_image_url="http://"+SCOPE_IP+"/crt_print.png"
 

BPM/writeclient.py

@@ -2 +2 @@
 __author__ = 'delerue'
 
+#import urllib
 import time
 from datetime import datetime