From 300e9dfff1c1ea2ee8aa3b50edc8f19f6e942b39 Mon Sep 17 00:00:00 2001 From: X11MA Date: Wed, 2 Dec 2015 19:53:30 +0100 Subject: [PATCH] Script execution --- script/EnergyScan.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 954a874..8e32bae 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -42,9 +42,6 @@ polswitch = 1 fid = get_next_fid(input_path, "o" + file_prefix) -suffix = ("%03d" % fid) -input_file = input_path + "o" + file_prefix + "_" + suffix + ".dat" - #Prepare scan @@ -68,10 +65,14 @@ time.sleep(1.0) wait_channel(OTF_DONE, 1, type = 'i') -open_vg10() -open_vg13() +#open_vg10() +#open_vg13() for scan_no in range(number_of_scans): + suffix = ("%03d" % fid) + input_file = input_path + "o" + file_prefix + "_" + suffix + ".dat" + fid = fid + 1 + caput(OTF_E1, E1) caput(OTF_E2, E2) caput(OTF_TIME, TIME) @@ -96,7 +97,7 @@ for scan_no in range(number_of_scans): print("Converting data file: " + output_file); convert_file(input_file, output_file, pol_str) - plot_file(output_file, "Scan " + str(scan_no+1)) + plot_file(output_file, file_prefix+"_" + suffix) #"Scan " + str(scan_no+1)) if polswitch == 1: switchpol(2) # tune ID2 --> polarization:C- @@ -106,7 +107,7 @@ for scan_no in range(number_of_scans): time.sleep(3.0) -close_vg13() +#close_vg13() print "Finished Energy scan"