diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 024aa61..c9cfb4c 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -3,7 +3,7 @@ import traceback ############################PGM+ID1+ID2################################################### if str(SET_OFFSETS) == "1": print "Setting offsets" - if RUNTYPE in ["+/-", "+" ]: # , "-" + if RUNTYPE in ["+/-", "+" , "-"]: caput(OTF_MODE1,1) # circ + in ID1 caput(OTF_MODE2,2) # circ - in ID elif RUNTYPE in ["LH/LV", "LH", "LV"]: @@ -93,7 +93,7 @@ def stopPlot(): def switchpol(activeID, runtype): global pol_str if activeID == 1: - caput(OTF_OFF1,OFFSET1) + caput(OTF_OFF1,OFFSET2) caput(OTF_OFF2,OFFSET2-40) #detune ID2 if runtype in ["+/-", "+"]: pol_str = "circ +" @@ -102,7 +102,7 @@ def switchpol(activeID, runtype): elif activeID == 2: caput(OTF_OFF1,OFFSET1-40) #detune ID1 caput(OTF_OFF2,OFFSET2) - if runtype in ["+/-"]: #, "-" + if runtype in ["+/-", "-"]: pol_str = "circ -" elif runtype in ["LH/LV", "LV"]: pol_str = "Lin. Vertical" @@ -123,8 +123,8 @@ fid = get_next_fid(input_path, "o" + file_prefix) #caput ("X11PHS-E:OPT","PGM+ID1+ID2") number_of_scans = 1 -if RUNTYPE in ["+/-", "+"]:# , "-" - caput(OTF_MODE1,1) # circ + in ID1 +if RUNTYPE in ["+/-", "+", "-"]: + caput(OTF_MODE1,2) # circ + in ID1 caput(OTF_MODE2,2) # circ - in ID2 wait_channel(OTF_DONE, 1, type = 'i') if RUNTYPE == "+/-":