pshell_config/x11ma
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Startup

Browse Source
This commit is contained in:
X11MA
2016-08-18 10:20:53 +02:00
parent 1ed5a5980a
commit 9071c76786
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/energy_scan.properties
+2 -2
View File
@@ -8,5 +8,5 @@ Gd=1170.0;1240.0;2.0;10.0;-13.0;-11.5
Cr=560.0;610.0;2.0;10.0;-6.2;-7.2
Co=750.0;825.0;2.0;10.0;-8.8;-9.5
Mn=620.0;670.0;2.0;10.0;-6.7;-8.1
Fe=680.0;750.0;2.0;10.0;-10.0;-11.5
Fe Linear=680.0;750.0;2.0;10.0;-1.5;-1.0
Fe=680.0;750.0;0.5;10.0;-10.0;-11.5
Fe Linear=680.0;750.0;2.0;10.0;1.2;2.9
script/EnergyScan.py
+3 -2
View File
@@ -6,6 +6,7 @@ import thread
if str(SET_OFFSETS) == "1":
print "Setting offsets"
#print file_prefix
if RUNTYPE in ["+/-", "+" , "-"]:
caput(OTF_MODE1,1) # circ + in ID1
caput(OTF_MODE2,2) # circ - in ID2
@@ -29,7 +30,7 @@ else:
print "Running full script"
file_prefix = time.strftime("%y%m%d")
input_path = "/sls/X11MA/Data1/public/X11MA/temp/"+file_prefix+"/"
input_path = "/sls/X11MA/Data1/public/X11MA/temp/"#+file_prefix+"/"
output_path = input_path #+file_prefix+"/" #"/sls/X11MA/Data1/public/e10989/"+file_prefix+"/"
@@ -311,7 +312,7 @@ for scan_no in range(number_of_scans):
#Convert file
output_file = output_path + "os" + file_prefix + "_" + suffix + ".dat"
print("Converticonvert_file(input_file, output_file, pol_str)ng data file: " + output_file);
print("Converting data file: " + output_file);
convert_file(input_file, output_file, 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)