From 2d90c71a7e74af28285ca1b22529b8826ce5652b Mon Sep 17 00:00:00 2001 From: x07maop Date: Mon, 24 Aug 2015 10:33:11 +0200 Subject: [PATCH] Script execution --- script/HystScan.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/script/HystScan.py b/script/HystScan.py index c98563a..11e9692 100644 --- a/script/HystScan.py +++ b/script/HystScan.py @@ -12,10 +12,7 @@ ENERGY_CHANGE_SLEEP = 0.5 #Pre-actions cawait('ACOAU-ACCU:OP-MODE', 'Light Available', type = 's') caput('X07MA-ID:MODE', 'CIRC +') -sleep(1.0) -cawait('X07MA-ID:DONE', 'DONE', type = 's') caput('X07MA-ID:ENERGY-OFFS', '-1.0') -cawait('X07MA-ID:DONE', 'DONE', type = 's') caputq('X07MA-PC:CSCALER.INPB', '1') caputq('X07MA-PC-PS2:SET:DMD:RAMPRATE:TPM', RAMP_RATE) #sleep(15.0) @@ -70,13 +67,15 @@ caput('X07MA-PC-PS2:M:GO.A', START_FIELD) #caputq('X07MA-PC-PS2:M:GO.A', START_FIELD) -caput("X07MA-PC-MAG:X:DMD", START_FIELD) -caput("X07MA-PC-MAG:STARTRAMP.PROC", 1) +#caput("X07MA-PC-MAG:X:DMD", START_FIELD) +#caput("X07MA-PC-MAG:STARTRAMP.PROC", 1) ramp_done.wait_for_value(1.0) print "Set end field" caput("X07MA-PC-MAG:X:DMD", END_FIELD) caputq("X07MA-PC-MAG:STARTRAMP.PROC", 1) +cawait('X07MA-ID:DONE', 'DONE', type = 's') + index = 0 while(True):