From d600f2e5b714c8ae39d2871b78aceef14e3ce5aa Mon Sep 17 00:00:00 2001
From: gac-x11ma <gac-x11ma@x11ma-cons-1.psi.ch>
Date: Mon, 5 Aug 2019 15:26:17 +0200
Subject: [PATCH] Startup

---
 config/devices.properties           |   1 +
 script/Mehdi/EnergyScan2.py         | 167 ++++++++++++++++++++++++++++
 script/Mehdi/Linear_XAS.py          |  18 +++
 script/Mehdi/OTF_scan.py            |  24 +++-
 script/Mehdi/OTF_scan2.py           |  45 ++++++++
 script/Mehdi/OTF_scan3.py           |   1 +
 script/Mehdi/OTF_scan_Mn.py         |  54 +++++++++
 script/Mehdi/OTF_scan_NEXAFS.py     |  62 +++++++++++
 script/Mehdi/OTF_scan_NEXAFS_G20.py |  63 +++++++++++
 script/Mehdi/OTF_scan_NEXAFS_G40.py |  62 +++++++++++
 script/Mehdi/OTF_scan_NEXAFS_G55.py |  62 +++++++++++
 script/Mehdi/OTF_scan_NEXAFS_G70.py |  62 +++++++++++
 script/Mehdi/OTF_scan_XACCIRC.py    |  62 +++++++++++
 script/Mehdi/OTF_scan_XAS_XMCD.py   |  75 +++++++++++++
 script/Mehdi/OTF_scan_XMCD.py       |  44 ++++++++
 script/local.py                     |  40 ++++++-
 script/local.py~                    | 125 +++++++++++++++++----
 script/some_user/e-user_test.py     |   1 -
 script/templates/EnergyScan.py      |   2 +-
 19 files changed, 944 insertions(+), 26 deletions(-)
 create mode 100644 script/Mehdi/EnergyScan2.py
 create mode 100644 script/Mehdi/Linear_XAS.py
 create mode 100644 script/Mehdi/OTF_scan2.py
 create mode 100644 script/Mehdi/OTF_scan3.py
 create mode 100644 script/Mehdi/OTF_scan_Mn.py
 create mode 100644 script/Mehdi/OTF_scan_NEXAFS.py
 create mode 100644 script/Mehdi/OTF_scan_NEXAFS_G20.py
 create mode 100644 script/Mehdi/OTF_scan_NEXAFS_G40.py
 create mode 100644 script/Mehdi/OTF_scan_NEXAFS_G55.py
 create mode 100644 script/Mehdi/OTF_scan_NEXAFS_G70.py
 create mode 100644 script/Mehdi/OTF_scan_XACCIRC.py
 create mode 100644 script/Mehdi/OTF_scan_XAS_XMCD.py
 create mode 100644 script/Mehdi/OTF_scan_XMCD.py
 delete mode 100644 script/some_user/e-user_test.py

diff --git a/config/devices.properties b/config/devices.properties
index f5eb7a9..f7038d2 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,3 +1,4 @@
+machine_cur=ch.psi.pshell.epics.ChannelDouble|ARIDI-PCT:CURRENT|Read||true
 field=ch.psi.pshell.epics.ChannelDouble|X11MA-XMCD:Ireadout|Read||true
 pol_mode=ch.psi.pshell.epics.DiscretePositioner|X11MA-ID2:MODE|||true
 pol_angle=ch.psi.pshell.epics.ChannelDouble|X11MA-ID2:ALPHA|||true
diff --git a/script/Mehdi/EnergyScan2.py b/script/Mehdi/EnergyScan2.py
new file mode 100644
index 0000000..3520d86
--- /dev/null
+++ b/script/Mehdi/EnergyScan2.py
@@ -0,0 +1,167 @@
+#Script imported and adopted from: XTREME beamline
+import time
+
+#Parameters
+"""
+E1 = 570
+E2 = 600
+TIME = 1 #min
+DELAY = 5.0 #s
+MODE = 'CIRC -'
+OFFSET = 0.0
+FOLDER = 'SIM_data'
+FILE = 'pshell-test'
+ALPHA=0
+"""
+
+
+count.initialize()
+data.initialize()
+fdata.initialize()
+idata.initialize()
+edata.initialize()
+
+p=None
+def start_plot():
+    global p
+    p = plot([None, None, None,None, None], ["TEY", "TFY", "TEYraw", "TFYraw", "I0"])
+
+def update_plot():
+    global p
+    c = count.take()
+    if c is None:
+        for i in range(len(p)):
+             p[i].getSeries(0).clear()
+    else:
+        data.setSize(c)
+        fdata.setSize(c)
+        idata.setSize(c)
+        edata.setSize(c)
+        teyr= idata.read()
+        tfyr= fdata.read()
+        i0 = data.read()
+        x = edata.read()
+        #from operator import truediv
+        l = lambda x,y: (0.0 if (y==0.0) else x/y)  #truediv
+        tey=map(l, teyr, i0)
+        tfy=map(l, tfyr, i0)
+        p[0].getSeries(0).setData(x, to_array(tey,'d'))
+        p[1].getSeries(0).setData(x, to_array(tfy,'d'))
+        p[2].getSeries(0).setData(x, to_array(teyr,'d'))
+        p[3].getSeries(0).setData(x, to_array(tfyr,'d'))
+        p[4].getSeries(0).setData(x, to_array(i0,'d'))
+
+
+print "\nStart energy scan..."
+
+if MODE == "LINEAR":
+    print E1,"eV ->",E2,"eV,",TIME,"min duration,",DELAY,"sec delay,",str(MODE),str(ALPHA),"deg" 
+else:
+    print E1,"eV ->",E2,"eV,",TIME,"min duration,",DELAY,"sec delay,",str(MODE)
+
+start = time.localtime()
+
+folder = os.path.expanduser("~/Data1/") + FOLDER + "/";
+
+#print "folder = ",folder
+
+def getNewestFile():
+    global folder
+    import glob
+    try:        
+        return max(glob.glob(folder+'/*.txt'), key=os.path.getctime)
+    except:
+        return None
+newest = getNewestFile()
+
+#Checking the beam
+if not has_beam():
+    print "Maintenence mode: end of scan"
+    sys.exit()
+    
+
+if MODE is not None:
+    pol_mode.write(MODE)     
+    if MODE == 'LINEAR':
+        if ALPHA is not None:
+            pol_angle.write(ALPHA)                                
+    
+if OFFSET is not None:    
+    pol_offset.write(OFFSET)                             
+     
+wait_device(pol_done, "DONE")
+
+#################
+energy.write(float(E1)) 
+wait_channel(ALL_DONE, 1, type = 'i')
+
+
+caput('E1', E1)
+caput('E2', E2)
+caput('TIME', TIME)
+caput('FOLDER', FOLDER)
+caput('FILE', FILE)
+time.sleep(0.1)
+
+time.sleep(DELAY)
+
+caput('START', '1')
+
+try:
+        
+    waiting = True
+    def plot_task():
+        global waiting
+        pos=count.take()
+        start_plot()
+        while waiting:
+            if count.take() != pos:
+                update_plot()
+                pos = count.take()
+                time.sleep(2.0)
+    
+    ret = fork(plot_task)
+    try:       
+        print "Scanning...",
+        #Post-actions
+        wait_channel('START', 'STOP', type = 's')          
+        after_sample() #To call check_id_error()
+        time.sleep(2.0)
+        print "Finished Energy scan."    
+    finally:    
+        waiting = False
+    join(ret)
+    
+    
+    #File convertion             
+    #newName = folder + time.strftime("%Y%m%d_%H%M_", start) + FILE + "_0000.txt";             
+    #newName = get_exec_pars().path + "/" + time.strftime("%Y%m%d_%H%M_", start) + FILE + ".txt";             
+
+    import time
+    try:
+        os.makedirs(get_exec_pars().path)    
+    except:
+        pass
+    newName = get_exec_pars().path + "/" + time.strftime("%Y%m%d_%H%M_", start) + FILE + ".txt";       
+
+    name = getNewestFile()
+
+    if name == newest:
+        print "Risk of overwriting. " + name + " same as " + newest    
+        raise Exception("Data file not created.")
+    
+    if not os.path.isfile(name):
+        raise Exception("Data file not found: " + name)
+    
+    convert_file_full(name, newName)
+
+    plot_file(newName)
+    print("Success")        
+
+except:   
+    print("Aborting...") 
+    while caget('START') == 'START':            
+        caput('START', '0')
+        time.sleep(0.1)
+    raise
+
diff --git a/script/Mehdi/Linear_XAS.py b/script/Mehdi/Linear_XAS.py
new file mode 100644
index 0000000..8c543a0
--- /dev/null
+++ b/script/Mehdi/Linear_XAS.py
@@ -0,0 +1,18 @@
+#B
+#otf(start=190, end=210, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe19_B_CP', folder = 'SIM_data')
+
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe19_C_li', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe19_N_Li', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe19_O_Li', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe19_Fe_Li', folder = 'SIM_data')
+
+
+
+
diff --git a/script/Mehdi/OTF_scan.py b/script/Mehdi/OTF_scan.py
index 1309ecd..2b17691 100644
--- a/script/Mehdi/OTF_scan.py
+++ b/script/Mehdi/OTF_scan.py
@@ -1 +1,23 @@
-otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Calixerin', folder = 'SIM_data')
\ No newline at end of file
+otf(start=570, end=600, time=4.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_3p8K_-10mT_4s_slit30_minus_0000', folder = 'SIM_data')
+otf(start=570, end=600, time=4.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_3p8K_-10mT_4s_slit30_plus_0000', folder = 'SIM_data')
+otf(start=570, end=600, time=4.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_3p8K_-10mT_4s_slit30_plus_0001', folder = 'SIM_data')
+otf(start=570, end=600, time=4.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_3p8K_-10mT_4s_slit30_minus_0001', folder = 'SIM_data')
+#otf(start=570, end=600, time=4.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NI_XMCD_3.8K_-70mT_2s_slit20_minus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=4.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NI_XMCD_3.8K_-70mT_2s_slit20_plus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NI_XMCD_3.8K_-70mT_2s_slit20_plus_0003', folder = 'SIM_data')
+#otf(start=570, end=600, time=2.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_3.8K_-70mT_2s_slit20_minus_0003', folder = 'SIM_data')
+#otf(start=570, end=600, time=2.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_3.8K_-70mT_2s_slit20_minus_0004', folder = 'SIM_data')
+#otf(start=570, end=600, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_3.8K_-70mT_2s_slit20_plus_0004', folder = 'SIM_data')
+#otf(start=570, end=600, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_3.8K_-70mT_2s_slit20_plus_0005', folder = 'SIM_data')
+#otf(start=570, end=600, time=2.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_3.8K_-70mT_2s_slit20_minus_0005', folder = 'SIM_data')
+
+
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_rem_3s_slit20_minus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_rem_3s_slit20_plus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_pristine_remanence+_3s_minus_0001', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_pristine_remanence+_3s_plus_0001', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_pristine_remanence+_3s_minus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_pristine_remanence+_3s_plus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_XMCD_pristine_remanence+_3s_minus_0002', folder = 'SIM_data')
+#otf(start=570, end=600, time=3.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='GI_XMCD_pristine_remanence+_3s_plus_0002', folder = 'SIM_data')
+
diff --git a/script/Mehdi/OTF_scan2.py b/script/Mehdi/OTF_scan2.py
new file mode 100644
index 0000000..83d4ada
--- /dev/null
+++ b/script/Mehdi/OTF_scan2.py
@@ -0,0 +1,45 @@
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha0_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=0
+otf(start=395, end=430, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_N_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_O_L_alpha0', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_alpha0', folder = 'SIM_data')
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_alpha0', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_O_L_alpha0', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha90_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_N_L_alpha0', folder = 'SIM_data')
+
+#C_edge - alpha=90
+#otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+
diff --git a/script/Mehdi/OTF_scan3.py b/script/Mehdi/OTF_scan3.py
new file mode 100644
index 0000000..695c18c
--- /dev/null
+++ b/script/Mehdi/OTF_scan3.py
@@ -0,0 +1 @@
+otf(start=570, end=600, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='GI_0000', folder = 'SIM_data')
\ No newline at end of file
diff --git a/script/Mehdi/OTF_scan_Mn.py b/script/Mehdi/OTF_scan_Mn.py
new file mode 100644
index 0000000..fc7de8d
--- /dev/null
+++ b/script/Mehdi/OTF_scan_Mn.py
@@ -0,0 +1,54 @@
+#C_edge - alpha=0
+#otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_C_L_CP', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha0_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=0
+otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn13_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_O_L_CP', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn13_C_L_CP', folder = 'SIM_data')
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn13_C_L_CP', folder = 'SIM_data')
+
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Mn13_C_L_CN', folder = 'SIM_data')
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Mn13_C_L_CN', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Fe20_O_L_CN', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha90_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=90
+otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Mn13_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+#otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Fe20_C_L_CN', folder = 'SIM_data')
diff --git a/script/Mehdi/OTF_scan_NEXAFS.py b/script/Mehdi/OTF_scan_NEXAFS.py
new file mode 100644
index 0000000..ab6b4d5
--- /dev/null
+++ b/script/Mehdi/OTF_scan_NEXAFS.py
@@ -0,0 +1,62 @@
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_C_Normal_alpha0_ES4N', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_N_Normal_alpha0_ES4N', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_O_Normal_alpha0_ES4N', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_O_Normal_alpha90_ES4N', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_N_Normal_alpha90_ES4N', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_C_Normal_alpha90_ES4N', folder = 'SIM_data')
+
+
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G20.py b/script/Mehdi/OTF_scan_NEXAFS_G20.py
new file mode 100644
index 0000000..c1dea71
--- /dev/null
+++ b/script/Mehdi/OTF_scan_NEXAFS_G20.py
@@ -0,0 +1,63 @@
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_C_G20_alpha0', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_N_G20_alpha0', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_O_G20_alpha0', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+otf(start=525, end=555, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_O_G20_alpha90', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_N_G20_alpha90', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_C_G20_alpha90', folder = 'SIM_data')
+
+
+
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G40.py b/script/Mehdi/OTF_scan_NEXAFS_G40.py
new file mode 100644
index 0000000..7667e18
--- /dev/null
+++ b/script/Mehdi/OTF_scan_NEXAFS_G40.py
@@ -0,0 +1,62 @@
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_C_G40_alpha0', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_N_G40_alpha0', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_O_G40_alpha0', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+otf(start=525, end=555, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_O_G40_alpha90', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_N_G40_alpha90', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_C_G40_alpha90', folder = 'SIM_data')
+
+
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G55.py b/script/Mehdi/OTF_scan_NEXAFS_G55.py
new file mode 100644
index 0000000..43ad402
--- /dev/null
+++ b/script/Mehdi/OTF_scan_NEXAFS_G55.py
@@ -0,0 +1,62 @@
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_C_G55_alpha0', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_N_G55_alpha0', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_O_G55_alpha0', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_O_G55_alpha90', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+otf(start=395, end=405, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_N_G55_alpha90', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_C_G55_alpha90', folder = 'SIM_data')
+
+
diff --git a/script/Mehdi/OTF_scan_NEXAFS_G70.py b/script/Mehdi/OTF_scan_NEXAFS_G70.py
new file mode 100644
index 0000000..bd59987
--- /dev/null
+++ b/script/Mehdi/OTF_scan_NEXAFS_G70.py
@@ -0,0 +1,62 @@
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_C_G70_alpha0', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_N_G70_alpha0', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='CN_PR15_O_G70_alpha0', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+otf(start=525, end=555, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_O_G70_alpha90', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+otf(start=395, end=405, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_N_G70_alpha90', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+otf(start=280, end=310, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='CN_PR15_C_G70_alpha90', folder = 'SIM_data')
+
+
diff --git a/script/Mehdi/OTF_scan_XACCIRC.py b/script/Mehdi/OTF_scan_XACCIRC.py
new file mode 100644
index 0000000..c551bfb
--- /dev/null
+++ b/script/Mehdi/OTF_scan_XACCIRC.py
@@ -0,0 +1,62 @@
+#C_edge - alpha=0
+#otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_C_L_CP', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha0_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_O_L_CP', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='NB10_Co_L_CP', folder = 'SIM_data')
+
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Co_L_CN', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='NB10_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Fe20_O_L_CN', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha90_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=90
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+#otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Fe20_C_L_CN', folder = 'SIM_data')
+
+
diff --git a/script/Mehdi/OTF_scan_XAS_XMCD.py b/script/Mehdi/OTF_scan_XAS_XMCD.py
new file mode 100644
index 0000000..8dffe99
--- /dev/null
+++ b/script/Mehdi/OTF_scan_XAS_XMCD.py
@@ -0,0 +1,75 @@
+# XAS_XMCD
+
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_C_CP', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_N_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+otf(start=525, end=555, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_O_CP', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CP', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CP', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+
+
+
+
+
+#C_edge - alpha=0
+otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_C_CP', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=0
+otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha0_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=0
+#otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn13_N_L_CP', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=0
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_O_L_CP', folder = 'SIM_data')
+
+#Mn Edge - alpha=0
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn13_C_L_CP', folder = 'SIM_data')
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn13_C_L_CP', folder = 'SIM_data')
+
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CP', folder = 'SIM_data')
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Mn30_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe20_Fe_L_CN', folder = 'SIM_data')
+
+#Mn Edge - alpha=90
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Mn13_C_L_CN', folder = 'SIM_data')
+otf(start=635, end=660, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Mn13_C_L_CN', folder = 'SIM_data')
+
+#O_edge_narrow - alpha=90
+#otf(start=525, end=555, time=2.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Fe20_O_L_CN', folder = 'SIM_data')
+
+#N_edge_narrow - alpha=90
+#otf(start=395, end=405, time=2.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_N_Nar_G70_alpha90_ES4', folder = 'SIM_data')
+
+#N_edge - alpha=90
+otf(start=395, end=430, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Mn13_N_L_CN', folder = 'SIM_data')
+
+#C_edge - alpha=90
+#otf(start=280, end=310, time=1.0, delay=5.0, mode='CIRC -', alpha = 90.0, offset=0.0, name='Fe20_C_L_CN', folder = 'SIM_data')
diff --git a/script/Mehdi/OTF_scan_XMCD.py b/script/Mehdi/OTF_scan_XMCD.py
new file mode 100644
index 0000000..7493519
--- /dev/null
+++ b/script/Mehdi/OTF_scan_XMCD.py
@@ -0,0 +1,44 @@
+
+#Mn Edge - alpha=0
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CP_minus', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CP_minus', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CP_before', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CP_before', folder = 'SIM_data')
+
+
+#Co_edge_ alpha=0
+otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CP_minus', folder = 'SIM_data')
+otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CP_minus', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CP_before', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC +', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CP_before', folder = 'SIM_data')
+
+#Ni edge -alpha=0
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='Glass_Gold_SAM_COOH_Mn_Ni_G70_alpha0_ES4', folder = 'SIM_data')
+
+
+
+#Ni edge - alpha=90
+#otf(start=845, end=880, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Glass_Gold_SAM_COOH_Ni_G70_alpha90_ES4', folder = 'SIM_data')
+
+#Co_edge_ alpha=0
+otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CN_minus', folder = 'SIM_data')
+otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CN_minus', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CN_before', folder = 'SIM_data')
+#otf(start=755, end=825, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Co_edge_CN_before', folder = 'SIM_data')
+
+
+#Fe_edge_ alpha=0
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CN_minus', folder = 'SIM_data')
+otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CN_minus', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CN_before', folder = 'SIM_data')
+#otf(start=700, end=740, time=1.0, delay=5.0, mode='CIRC -', alpha = 0.0, offset=0.0, name='Fe19_Co_Fe_edge_CN_before', folder = 'SIM_data')
+
+
+#Mn Edge - alpha=90
+#otf(start=635, end=660, time=1.0, delay=5.0, mode='LINEAR', alpha = 90.0, offset=0.0, name='Fe20_C_L_alpha0', folder = 'SIM_data')
+
+
+
diff --git a/script/local.py b/script/local.py
index 92f8985..bc8a9f0 100644
--- a/script/local.py
+++ b/script/local.py
@@ -31,7 +31,7 @@ VG13_SET = "X11MA-EPS-VG13:SET"
 VG13_GET = "X11MA-OP-VG13:OPEN"
 
 """
-MAG      ="X11MA-XMCD:Ireadout"
+
 LPP_DELAY = "X11MA-ES2-4CHT:SET2-DELAY"
 LPP_FINE_DELAY = "X11MA-ES2-4CHT:SET2-FINE"
 TIME_DELAY_SET = "X11MA-ES2:Theta-New.A"
@@ -171,8 +171,8 @@ def convert_file(input_file_name, output_file_name, pol = None):
         lines = inp.readlines()
         with open(output_file_name, "wb") as out:            
             (db, st) = ("java.lang.Double", "java.lang.String")
-            out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "NORMtey" + sep + "NORMdiode" + sep + "Pol" + line_sep)
-            out.write("#"+ db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + st + line_sep)
+            out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "NORMtey" + sep + "NORMdiode" + line_sep)
+            out.write("#"+ db + sep + db + sep + db + sep + db + sep + db + sep + db + line_sep)
             s = sep
             for line in lines[1:]:
                 line = line.strip()
@@ -182,7 +182,39 @@ def convert_file(input_file_name, output_file_name, pol = None):
                     normtey=repr( float(CADC2)/float(CADC1))
                     normdiode=repr(float(CADC3)/float(CADC1))
                     #field=caget(MAG)
-                    out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + normtey + s + normdiode + s + str(pol) + line_sep)
+                    out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + normtey + s + normdiode + line_sep)
+                except:
+                    traceback.print_exc() 
+    #os.rename(input_file_name, get_context().setup.expandPath("{data}/OTF/" + ntpath.basename(input_file_name)))
+
+def convert_file_full(input_file_name, output_file_name, pol = None):   
+    print "Converting data file: " + input_file_name + " to " + output_file_name
+    #print "File converted to: ",output_file_name
+    sep = "\t"
+    line_sep = "\n"
+    MODE = pol_mode.read()
+    if pol is None:
+        pol = pol_angle.read() if (MODE == "LINEAR") else pol_mode.readback.read()      
+    with open(input_file_name) as inp:
+        lines = inp.readlines()
+        with open(output_file_name, "wb") as out:            
+            (db, st) = ("java.lang.Double", "java.lang.String")
+            out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "CADC4" + sep + "CADC5" + sep + "MCurr" + sep + "Time"  + sep + "FieldX" + sep + "FieldZ" + sep + "Pol" + sep + "Temperature" + sep + "NORMtey" + sep + "NORMdiode" + line_sep)
+            out.write("#"+ db   + sep + db      + sep + db      + sep + db      + sep + db      + sep + db      + sep + db      + sep + db      + sep + db       + sep + db       + sep +  st   + sep +  db           + sep +  db       + sep +  db         + line_sep)
+            s = sep
+            for line in lines[1:]:
+                line = line.strip()
+                if line=="": break
+                try:              
+                    (Ecrbk, CADC1, CADC2, CADC3, CADC4, MCurr, cffrbk, IDErbk, time) = line.split(" ")                   
+                    normtey=repr( float(CADC2)/float(CADC1))
+                    normdiode=repr(float(CADC3)/float(CADC1))
+                    CADC5=repr(0.0)
+                    mcurr=repr(machine_cur.read())
+                    fieldx=repr(field.read())
+                    fieldz=repr(0.0)
+                    temp=repr(Temp.read())
+                    out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + CADC4 + s + CADC5 + s + mcurr + s + time + s + fieldx + s + fieldz + s + str(pol) + s + temp + s + normtey + s + normdiode + line_sep)
                 except:
                     traceback.print_exc() 
     #os.rename(input_file_name, get_context().setup.expandPath("{data}/OTF/" + ntpath.basename(input_file_name)))
diff --git a/script/local.py~ b/script/local.py~
index 0b7017d..89d5eb6 100644
--- a/script/local.py~
+++ b/script/local.py~
@@ -1,8 +1,9 @@
 ###################################################################################################
 #  Deployment specific global definitions - executed after startup.py
 ###################################################################################################
+import ntpath
+import traceback
 
-NO_BEAM_CHECK = False    # setting this to true disables the waiting for the beam before starting energy or hyst scan
 """
 OTF_START = "X11MA-OTF:GO"
 OTF_E1 = "X11MA-OTF:E1"
@@ -19,7 +20,7 @@ ID1_OFF = "X11MA-ID1:ENERGY-OFFS"
 ID2_OFF = "X11MA-ID2:ENERGY-OFFS"
 ENERGY_SP = "X11MA-PHS:E_SP"
 """
-ALL_DONE = "X11MA-PHS:ALL-DONE"
+ALL_DONE = "X11PHS:alldone"
 VG10_SET = "X11MA-EPS-VG10:SET"
 VG10_GET = "X11MA-OP-VG10:OPEN"
 VG11_SET = "X11MA-EPS-VG11:SET"
@@ -28,7 +29,9 @@ VG12_SET = "X11MA-EPS-VG12:SET"
 VG12_GET = "X11MA-OP-VG12:OPEN"
 VG13_SET = "X11MA-EPS-VG13:SET"
 VG13_GET = "X11MA-OP-VG13:OPEN"
+
 """
+
 LPP_DELAY = "X11MA-ES2-4CHT:SET2-DELAY"
 LPP_FINE_DELAY = "X11MA-ES2-4CHT:SET2-FINE"
 TIME_DELAY_SET = "X11MA-ES2:Theta-New.A"
@@ -36,7 +39,7 @@ TIME_DELAY_VAL = "X11MA-ES2:Theta-Cur.VAL"
 TIME_DELAY_START = "X11MA-ES2:SCAN-START"
 TIME_DELAY_COMPLETE = "X11MA-ES2-scan1.SMSG"
 TBT_MAG = "X11MA-LSCI632:MFIELD"
-MAG="X11MA-XMCD:Ireadout"
+"
 """
 def get_next_fid(folder, prefix):
     try:
@@ -51,7 +54,11 @@ def get_next_fid(folder, prefix):
 def wait_channel(name, value, timeout =None, type='s'):
     print "Waiting " + str(name) + " = " + str(value)
     cawait(name, value, timeout = timeout, type=type)
-    print "Done"          
+    print "Done"
+
+def wait_device(dev, value, timeout=-1):
+    timeout = int(timeout *1000) if timeout>0 else timeout
+    dev.waitValue(value,timeout)
 
 def open_vg10():
     if caget (VG10_GET,'i') != 1:
@@ -101,28 +108,19 @@ def close_vg13():
         time.sleep(0.1)
         caput(VG13_SET, 1)
 
-def plot_file(file, ctxt = None):
+def plot_file(file_name, ctxt = None):
     """
     """
     sep = "\t"
-    table = Table.load(file, sep, '#')
+    with open(file_name) as f:
+        header = f.readline()[1:].split(sep)
+    table = Table.loadRaw(file_name, sep, '#',header)
     plots = plot(table, title = ctxt)
-
+    
 def has_beam():
     """
     """
-    return beam_status.readback.read() !="Machine Down"
-
-def wait_beam():
-    """
-    """
-    print "Waiting for beam... ",            
-    while not has_beam():
-        if maintenance_mode:
-            print "Maintenence mode: disregarding beam state"
-            return
-        sleep(0.1)
-    print "Beam OK."
+    return beam_status.readback.read() == "Light Available"
 
 def is_id_error():
     return (id_error.read()==0)
@@ -141,4 +139,93 @@ def before_sample():
 def after_sample():
     check_id_error()
 
+##################### Convert_File function #############################
+"""
+def convert_file(input_file_name, output_file_name):   
+    sep = "\t"
+    line_sep = "\r\n"
+    field = caget('X11MA-XMCD:Ireadout')
+    with open(input_file_name) as inp:
+        lines = inp.readlines()
+        with open(output_file_name, "wb") as out:
+            out.write("Energy" + sep + "Io" + sep + "CADC2" + sep + "CADC3" + sep + "Mag" + line_sep)
+            s = sep + " "    #File format has a space before numeric values
+            for line in lines[1:]:
+                line = line.strip()
+                if line=="": break
+                try:                   
+                    (Ecrbk,CADC1, CADC2, NORM, CADC3, CADC4, MCurr, cffrbk, ID1Erbk, ID2Erbk, vTime) = line.split(" ")                 
+                    out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + str(field) +line_sep)
+                except:
+                    traceback.print_exc() 
+"""
+def convert_file(input_file_name, output_file_name, pol = None):   
+    print "Converting data file: " + input_file_name + " to " + output_file_name
+    #print "File converted to: ",output_file_name
+    sep = "\t"
+    line_sep = "\n"
+    MODE = pol_mode.read()
+    if pol is None:
+        pol = pol_angle.read() if (MODE == "LINEAR") else pol_mode.readback.read()      
+    with open(input_file_name) as inp:
+        lines = inp.readlines()
+        with open(output_file_name, "wb") as out:            
+            (db, st) = ("java.lang.Double", "java.lang.String")
+            out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "NORMtey" + sep + "NORMdiode" + sep + "Pol" + line_sep)
+            out.write("#"+ db + sep + db + sep + db + sep + db + sep + db + sep + db + sep + st + line_sep)
+            s = sep
+            for line in lines[1:]:
+                line = line.strip()
+                if line=="": break
+                try:              
+                    (Ecrbk, CADC1, CADC2, CADC3, CADC4, MCurr, cffrbk, IDErbk, time) = line.split(" ")                   
+                    normtey=repr( float(CADC2)/float(CADC1))
+                    normdiode=repr(float(CADC3)/float(CADC1))
+                    #field=caget(MAG)
+                    out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + normtey + s + normdiode + s + str(pol) + line_sep)
+                except:
+                    traceback.print_exc() 
+    #os.rename(input_file_name, get_context().setup.expandPath("{data}/OTF/" + ntpath.basename(input_file_name)))
+
+def convert_file_full(input_file_name, output_file_name, pol = None):   
+    print "Converting data file: " + input_file_name + " to " + output_file_name
+    sep = "\t"
+    line_sep = "\n"
+    MODE = pol_mode.read()
+    if pol is None:
+        pol = pol_angle.read() if (MODE == "LINEAR") else pol_mode.readback.read()      
+    with open(input_file_name) as inp:
+        lines = inp.readlines()
+        with open(output_file_name, "wb") as out:            
+            (db, st) = ("java.lang.Double", "java.lang.String")
+            out.write("#Energy" + sep + "CADC1" + sep + "CADC2" + sep + "CADC3" + sep + "CADC4" + sep + "CADC5" + sep + "MCurr" + sep + "Time" + sep + "FieldX" + sep + "FieldZ" + sep + "Pol" + sep + "Temperature" + sep + "NORMtey" + sep + "NORMdiode"  + line_sep)
+            out.write("#"+ db   + sep + db      + sep + db      + sep + db      + sep + db      + sep + db      + sep + db      + sep + db     + sep + db       + sep + db       + sep + st    + sep + db            + sep + db        + sep + db           + line_sep)
+            s = sep
+            for line in lines[1:]:
+                line = line.strip()
+                if line=="": break
+                try:              
+                    (Ecrbk, CADC1, CADC2, CADC3, CADC4, MCurr, cffrbk, IDErbk, time) = line.split(" ")                   
+                    normtey=repr( float(CADC2)/float(CADC1))
+                    normdiode=repr(float(CADC3)/float(CADC1))
+                    CADC5 = 0
+                    mcur=machine_cur.read()
+                    fieldx= field.read()
+                    fieldz=0
+                    temp=Temp.read()
+                    out.write(Ecrbk + s + CADC1 + s + CADC2 + s + CADC3 + s + CADC4 + s + CADC5 + s + mcur + s + time + s + fieldx + s + fieldz + s + str(pol) + s + temp + s + normtey + s + normdiode + s  + line_sep)
+                except:
+                    traceback.print_exc() 
+
+###################################################################################################
+#OTF function
+###################################################################################################
+def otf(start, end, time, delay = 0.0, mode = None, offset = None, alpha = None, name = None, folder = 'TEST'):
+    """
+    """    
+    if name is None:
+        name = get_exec_pars().name
+    #folder = get_context().setup.expandPath("{year}_{month}/{date}");    
+    run("templates/EnergyScan", {"E1":start, "E2":end, "TIME":time, "DELAY":float(delay), "MODE":mode, "OFFSET":(offset), "FOLDER":folder, "FILE":name, "ALPHA":float(alpha) if alpha is not None else None})    
+
 
diff --git a/script/some_user/e-user_test.py b/script/some_user/e-user_test.py
deleted file mode 100644
index b78fe06..0000000
--- a/script/some_user/e-user_test.py
+++ /dev/null
@@ -1 +0,0 @@
-otf(start=800, end=810, time=2.5, delay=5.0, mode='LINEAR', alpha = 0.0, offset=0.0, name='pshell-test')
\ No newline at end of file
diff --git a/script/templates/EnergyScan.py b/script/templates/EnergyScan.py
index 53e29cd..3967f10 100644
--- a/script/templates/EnergyScan.py
+++ b/script/templates/EnergyScan.py
@@ -153,7 +153,7 @@ try:
     if not os.path.isfile(name):
         raise Exception("Data file not found: " + name)
     
-    convert_file(name, newName)
+    convert_file_full(name, newName)
 
     plot_file(newName)
     print("Success")