diff --git a/script/EnergyScan.py b/script/EnergyScan.py index 719fa25..5090282 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -10,22 +10,23 @@ MODE = 'CIRC +' OFFSET = -9.0 FOLDER = '2015_04/20150417' FILE = 'MgE_plus' +ALPHA=0 """ -""" -E1 = 690 -E2 = 755 -TIME = 3 #min +E1 = 710 +E2 = 720 +TIME = 1 #min DELAY = 10.0 #s MODE = 'CIRC +' OFFSET = -9.0 FOLDER = '2015_04/20150417' FILE = 'Fe_plus' -""" +ALPHA=0 print "\Starting energy scan - Parameters: ", print E1,E2,TIME,DELAY,MODE ,OFFSET ,FOLDER ,FILE ,ALPHA +start = time.localtime def wait_channel(name, value, type): print "Waiting " + str(name) + " = " + str(value) @@ -60,4 +61,21 @@ caput('START', '1') wait_channel('START', 'STOP', type = 's') time.sleep(2.0) -print "Finished Energy scan" \ No newline at end of file +print "Finished Energy scan" + + + +cmd = "/sls/X07MA/data/x07maop/bin/modify_otf.pl " +folder = "~/Data1/" + FOLDER + "/"; +name = caget("MSG").split(' ')[0] +name = folder + name; +newName = folder + "/" + time.strftime("/%Y%m%d_%H%M_", start) + FILE + "_0000.txt"; +cmd = cmd + name + " " + newName; +System.out.println("Converting data file: " + cmd); +import os +os.system(cmd) + +#~/Data1/2015_06/20150623/23Jun_11_08_Fe_plus.txt +#~/Data1/2015_06/20150623/20150623_1144_Fe_plus_0000.txt + +