Closedown

This commit is contained in:
gac-x10da
2022-08-08 12:05:47 +02:00
parent e872d6b9c3
commit 329362edf3
14 changed files with 30 additions and 36 deletions
+1 -11
View File
@@ -3,7 +3,6 @@
##################################################################################################
import ch.psi.fda.ProcessorFDA as ProcessorFDA
import ch.psi.pshell.crlogic.CrlogicPositioner as CrlogicPositioner
import ch.psi.pshell.crlogic.CrlogicSensor as CrlogicSensor
@@ -40,13 +39,4 @@ def setup_brag_plot(auto=True):
setup_plotting(range = [scan_start - offset, scan_stop - offset])
#add_device(bragg.getExtEncoder(), True)
def run_fda(file_name, arguments={}):
"""
Run FDA loop
"""
ProcessorFDA().execute(file_name,arguments)
#add_device(bragg.getExtEncoder(), True)
+1 -1
View File
@@ -8,5 +8,5 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2] )
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20170314_Andrey/Ni_EXAFS_fluo.xml")
xscan("users/20170314_Andrey/Ni_EXAFS_fluo.xml")
+1 -1
View File
@@ -15,5 +15,5 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2] )
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20170314_Andrey/Fe_EXAFS_fluo.xml")
xscan("users/20170314_Andrey/Fe_EXAFS_fluo.xml")
+1 -1
View File
@@ -7,6 +7,6 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2] )
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20170314_Andrey/Fe_EXAFS_fluo.xml")
xscan("users/20170314_Andrey/Fe_EXAFS_fluo.xml")
+1 -1
View File
@@ -13,4 +13,4 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2])
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20201127_Vogelin/Fe_test.xml")
xscan("users/20201127_Vogelin/Fe_test.xml")
+1 -1
View File
@@ -7,4 +7,4 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2])
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20201127_Vogelin/Fe_EXAFS_fluo.xml")
xscan("users/20201127_Vogelin/Fe_EXAFS_fluo.xml")
+1 -1
View File
@@ -21,4 +21,4 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2])
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20201127_Vogelin/Fe_EXAFS_transmission.xml")
xscan("users/20201127_Vogelin/Fe_EXAFS_transmission.xml")
+1 -1
View File
@@ -6,4 +6,4 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[1])
caput("X10DA-ES1-MA1:TRY", pos[2])
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20201127_Vogelin/SDD_EXAFS_fluo.xml")
xscan("users/20201127_Vogelin/SDD_EXAFS_fluo.xml")
+2 -2
View File
@@ -1,6 +1,6 @@
caput("X10DA-ES1-MA1:TRX", 5)
caput("X10DA-ES1-MA1:TRY", 11)
run_fda("users/20190827_Craig/RXES_sampleTest2.xml")
run_fda("users/20190827_Craig/XES_test.xml")
xscan("users/20190827_Craig/RXES_sampleTest2.xml")
xscan("users/20190827_Craig/XES_test.xml")
+3 -3
View File
@@ -21,10 +21,10 @@ for pos in positions:
caput("X10DA-ES1-MA1:TRX", pos[3])
caput("X10DA-ES1-MA1:TRY", pos[4] )
set_exec_pars(name = pos[0], reset = True)
run_fda("users/20190827_Craig/RXES_Nb_calib.xml")
xscan("users/20190827_Craig/RXES_Nb_calib.xml")
set_exec_pars(name = pos[1], reset = True)
run_fda("users/20190827_Craig/RXES_Nb_XAS.xml")
xscan("users/20190827_Craig/RXES_Nb_XAS.xml")
set_exec_pars(name = pos[2], reset = True)
run_fda("users/20190827_Craig/XES_Nb.xml")
xscan("users/20190827_Craig/XES_Nb.xml")