Closedown

This commit is contained in:
X11MA
2017-02-08 15:29:41 +01:00
parent 0e864e0680
commit fa89580dfe
3 changed files with 35 additions and 55 deletions
+11 -9
View File
@@ -13,16 +13,16 @@ if str(SET_OFFSETS) == "1":
elif RUNTYPE in ["LH/LV", "LH", "LV"]:
caput(OTF_MODE1,0)
caput(OTF_MODE2,0)
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
caput(OTF_ALPHA1, 0.0) # LH in ID1
caput(OTF_ALPHA2, 90.0) # LV in ID2
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
else:
raise Exception("Invalid run type: " + RUNTYPE)
caput(OTF_OFF1,OFFSET1)
caput(OTF_OFF2,OFFSET2-40) #detune ID2
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
print "Offsets are set"
import sys
sys.exit(0)
@@ -242,7 +242,7 @@ number_of_scans = 1
if RUNTYPE in ["+/-", "+", "-"]:
caput(OTF_MODE1,1) # circ + in ID1
caput(OTF_MODE2,2) # circ - in ID2
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
if RUNTYPE == "+/-":
number_of_scans = 2 * ROUNDS
else:
@@ -250,10 +250,10 @@ if RUNTYPE in ["+/-", "+", "-"]:
elif RUNTYPE in ["LH/LV", "LH", "LV"]:
caput(OTF_MODE1,0)
caput(OTF_MODE2,0)
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
caput(OTF_ALPHA1, 0.0) # LH in ID1
caput(OTF_ALPHA2, 90.0) # LV in ID2
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
if RUNTYPE == "LH/LV":
number_of_scans = 2 * ROUNDS
else:
@@ -268,7 +268,7 @@ elif RUNTYPE in ["+/-", "+", "LH/LV", "LH"]:
switchpol(1, RUNTYPE) # tune ID1 --> polarization: C+ or LH
time.sleep(1.0)
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
open_vg10()
time.sleep(0.5)
@@ -289,7 +289,7 @@ for scan_no in range(number_of_scans):
caput(OTF_FID,fid)
time.sleep(2.0)
caput(OTF_ESET, E1)
wait_channel(OTF_DONE, 1, type = 'i')
#wait_channel(OTF_DONE, 1, type = 'i')
time.sleep(DELAY)
time.sleep(2.0)
@@ -306,7 +306,9 @@ for scan_no in range(number_of_scans):
print "******** OTF STOP TIMEOUT **********"
otf_start.write(0)
finally:
stopPlot()tead of sleep
stopPlot()
time.sleep(5.0)
#Convert file
output_file = output_path + "os" + file_prefix + "_" + suffix + ".dat"