From 56a9392b57ab79dde01b57d2c4c2e17e98ff843e Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 27 Apr 2017 11:25:14 +0200 Subject: [PATCH] Script execution --- script/Diagnostics/WireScan.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/script/Diagnostics/WireScan.py b/script/Diagnostics/WireScan.py index 17a12a7..0ff5721 100644 --- a/script/Diagnostics/WireScan.py +++ b/script/Diagnostics/WireScan.py @@ -8,7 +8,7 @@ BPM_SENSORS = [("x","X1"), ("y","Y1"), ("q","Q1")] #(logic name sufix, channel s #Paramter parsing prefix = args[0] if is_panel else "SINDI01-DWSC090" #"S30CB09-DWSC440" scan_type = args[1] if is_panel else WireScanner.WireX1 -scan_range = args[2] if is_panel else [-200, 200, -400, 400] +scan_range = args[2] if is_panel else [-2000, 2000, -2000, 2000] cycles = args[3] if is_panel else 5 velocity = args[4] if is_panel else 200 bpms = args[5] if is_panel else get_wire_scans_bpms(prefix) @@ -49,8 +49,8 @@ st.waitCacheChange(10000) #Wait stream be running before starting scan #Pseudo-device returning the wire position class w_pos(Readable): def read(self): - #return scanner.get_sel_wire_pos(st.getChildren()[0].take()) - return scanner.get_sel_wire_pos(scanner.motor_bs_readback.read()) + return scanner.get_sel_wire_pos(st.getChildren()[0].take()) + #return scanner.get_sel_wire_pos(scanner.motor_bs_readback.read()) #End of scan checking scan_complete = None