diff --git a/script/EnergyScan.py b/script/EnergyScan.py index aee4ced..8684849 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -220,7 +220,7 @@ def switchpol(activeID, runtype): else: raise Exception("Invalid parameter") - +mag_str = caget(MAG) pol_str = None polswitch = 1 @@ -314,7 +314,7 @@ for scan_no in range(number_of_scans): output_file = output_path + "os" + file_prefix + "_" + suffix + ".dat" print("Converting data file: " + output_file); - convert_file(input_file, output_file, pol_str) + convert_file(input_file, output_file, mag_str, pol_str) plot_file(output_file, file_prefix+"_" + suffix) #"Scan " + str(scan_no+1)) print "Finished scan " + str(scan_no+1) + " out of " + str(number_of_scans) diff --git a/script/EnergyScanID2only.py b/script/EnergyScanID2only.py index 4da967f..82902fa 100644 --- a/script/EnergyScanID2only.py +++ b/script/EnergyScanID2only.py @@ -144,7 +144,7 @@ for scan_no in range(number_of_scans): output_file = output_path + "os" + file_prefix + "_" + suffix + ".dat" print("Converting data file: " + output_file); - convert_file(input_file, output_file, pol_str) + convert_file(input_file, output_file, mag_str, pol_str) plot_file(output_file, file_prefix+"_" + suffix) #"Scan " + str(scan_no+1)) print "Finished scan " + str(scan_no+1) + " out of " + str(number_of_scans) @@ -163,7 +163,7 @@ for scan_no in range(number_of_scans): time.sleep(3.0) fid = fid + 1 - + mag_str = caget(MAG) caput(OTF_ESET, E1) close_vg13() diff --git a/script/local.py b/script/local.py index 47a9c52..b2a15f5 100644 --- a/script/local.py +++ b/script/local.py @@ -35,6 +35,7 @@ TIME_DELAY_VAL = "X11MA-ES2:Theta-Cur.VAL" TIME_DELAY_START = "X11MA-ES2:SCAN-START" TIME_DELAY_COMPLETE = "X11MA-ES2-scan1.SMSG" TBT_MAG = "X11MA-LSCI632:MFIELD" +MAG="X11MA-XMCD:Ireadout" FST = time.strftime("%y%m%d")