diff --git a/script/EnergyMultiScan.py b/script/EnergyMultiScan.py index 9adb58a..fca1040 100644 --- a/script/EnergyMultiScan.py +++ b/script/EnergyMultiScan.py @@ -1,6 +1,7 @@ -file_prefix = time.strftime("%Y%m%d") +#file_prefix = time.strftime("%Y%m%d") # CHANGE THE PATH IN THE OTH -input_path = "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/sample02-LMNO_pristine/"+file_prefix+"/" +#input_path = "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/sample02-LMNO_pristine/"+file_prefix+"/" +input_path = "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/sample02-LMNO_pristine/" output_path = input_path @@ -186,7 +187,7 @@ for scan_no in range(number_of_scans): otf_start.write(0) finally: stopPlot() - caput(OTF_ESET, E1) +# caput(OTF_ESET, E1) T_end = Temp.getValue() time.sleep(5.0) #Convert file diff --git a/script/MultiScan.py b/script/MultiScan.py index 2a970b6..0ef5b6d 100644 --- a/script/MultiScan.py +++ b/script/MultiScan.py @@ -11,6 +11,7 @@ E4 = [680, 720, 6, 0] E5 = [845, 885, 6, 0] E6 = [772, 805, 6, 0] E7 = [845, 885, 6, 0] +E8 = [700, 740, 6, 0] E = [E1,E2,E3,E4,E5] #run('EnergyMultiScan.py',E) @@ -18,6 +19,6 @@ E = [E1,E2,E3,E4,E5] n_scans=1 for i in range(0,n_scans): - run('EnergyMultiScan.py',E7) + run('EnergyMultiScan.py',E8) close_vg13() \ No newline at end of file