From 156ec65782eea3d5873e4064e801aa488dcbb4f9 Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Fri, 31 Aug 2018 17:46:49 +0200
Subject: [PATCH] Closedown

---
 script/EnergyMultiScan.py |  2 +-
 script/MultiScan.py       | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/script/EnergyMultiScan.py b/script/EnergyMultiScan.py
index 464a856..8162011 100644
--- a/script/EnergyMultiScan.py
+++ b/script/EnergyMultiScan.py
@@ -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 
diff --git a/script/MultiScan.py b/script/MultiScan.py
index 89e3c10..d0318bd 100644
--- a/script/MultiScan.py
+++ b/script/MultiScan.py
@@ -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