Changeset 765 in ETALON

Timestamp:

May 24, 2018, 11:16:13 AM (6 years ago)

Author:

moutardier

Message:

reorganisation

Location:

BPM

Files:

• initialise_motors.py (modified) (1 diff)
• scope_function.py (modified) (2 diffs)

BPM/initialise_motors.py

@@ -12 +12 @@
 
 global write_to_motor_dated_log
-write_to_motor_dated_log='/Users/delerue/Downloads/write_to_motor_log'
+write_to_motor_dated_log = data_dir + './write_to_motor_log'
 
 from writeclient import *

BPM/scope_function.py

@@ -6 +6 @@
 import urllib
 from datetime import datetime
-#from sparc_constants import *
+from bpm_constants import *
 from writeclient import writeclient
 
-global SCOPE_IP 
-SCOPE_IP = '10.0.1.112'
+#global SCOPE_IP 
+#SCOPE_IP = '10.0.1.112'
 scope_image_url="http://"+SCOPE_IP+"/crt_print.png"
 
@@ -37 +37 @@
 
 
-def scpi_command(command):
+
+def scpi_query(command):
     reply=writeclient(SCOPE_IP,5025,command+chr(10),1)
     print "SCPI: ",command," => ", reply
+    return reply
+
+def scpi_command(command):
+    writeclient(SCOPE_IP,5025,command+chr(10),1)
+    print "SCPI: ",command