Closedown

This commit is contained in:
gac-x11ma
2018-08-31 17:46:49 +02:00
parent 4f63149696
commit 156ec65782
2 changed files with 7 additions and 7 deletions

View File

@@ -1,6 +1,6 @@
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/NCA/sample07_NCA_discharge/"+file_prefix+"/"
input_path = "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/LMNO/sample08_LMNO_4_1V/"+file_prefix+"/"
#input_path = "/sls/X11MA/data/X11MA/slsbl/x11ma/e17174/Data1/Aug_2018/sample02-LMNO_pristine/"
output_path = input_path

View File

@@ -26,7 +26,7 @@ time.sleep(1.0)
Eset = 845
error = 10.0
caput("X11MA-PHS:E_SP",Eset)
while abs(error) > 1.1:
while (abs(error)) > 0.2:
time.sleep(1.0)
Ecurr = caget("X11MA-PGM:rbkenergy",'i')
error = Eset-Ecurr
@@ -37,7 +37,7 @@ run('EnergyMultiScan.py',E5) # Ni
Eset = 772
error = 10.0
caput("X11MA-PHS:E_SP",Eset)
while abs(error) > 1.1:
while (abs(error)) > 0.2:
time.sleep(1.0)
Ecurr = caget("X11MA-PGM:rbkenergy",'i')
error = Eset-Ecurr
@@ -51,7 +51,7 @@ caput("X11MA-KEI12:RANGE", 7)
Eset = 680
error = 10.0
caput("X11MA-PHS:E_SP",Eset)
while abs(error) > 1.1:
while (abs(error)) > 0.2:
time.sleep(1.0)
Ecurr = caget("X11MA-PGM:rbkenergy",'i')
error = Eset-Ecurr
@@ -65,7 +65,7 @@ caput("X11MA-KEI12:RANGE", 8)
Eset = 520
error = 10.0
caput("X11MA-PHS:E_SP",Eset)
while abs(error) > 1.1:
while (abs(error)) > 0.2:
time.sleep(1.0)
Ecurr = caget("X11MA-PGM:rbkenergy",'i')
error = Eset-Ecurr
@@ -79,7 +79,7 @@ caput("X11MA-KEI12:RANGE", 8)
Eset = 270
error = 10.0
caput("X11MA-PHS:E_SP",Eset)
while abs(error) > 1.1:
while (abs(error)) > 0.2:
time.sleep(1.0)
Ecurr = caget("X11MA-PGM:rbkenergy",'i')
error = Eset-Ecurr
@@ -93,7 +93,7 @@ caput("X11MA-KEI12:RANGE", 8)
Eset = 500
error = 10.0
caput("X11MA-PHS:E_SP",Eset)
while abs(error) > 1.1:
while (abs(error)) > 0.2:
time.sleep(1.0)
Ecurr = caget("X11MA-PGM:rbkenergy",'i')
error = Eset-Ecurr