pshell_config/x10da
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Closedown

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.properties
View File

@@ -1,4 +1,4 @@
#Mon Aug 08 11:59:34 CEST 2022
#Mon Aug 08 12:00:10 CEST 2022
autoSaveScanData=true
simulation=false
commandExecutionEvents=false
@@ -12,7 +12,7 @@ dataScanSaveScript=false
dataScanSaveSetpoints=false
notifiedTasks=null
parallelInitialization=false
fdaSerialization=false
fdaSerialization=true
dataTransferPath=null
saveConsoleSessionFiles=false
versionTrackingManual=false

20
config/preferences.json
View File

@@ -34,7 +34,11 @@
"style" : 1,
"size" : 13
},
"fontTerminal" : null,
"fontTerminal" : {
"name" : "Monospaced",
"style" : 0,
"size" : 14
},
"tabSize" : 4,
"contentWidth" : 0,
"editorBackground" : null,
@@ -46,34 +50,34 @@
"dataPanelLocation" : null,
"openDataFilesInDocTab" : false,
"noVariableEvaluationPropagation" : false,
"processingScripts" : null,
"processingScripts" : [ ],
"asyncViewersUpdate" : false,
"scanPlotDisabled" : false,
"scanTableDisabled" : false,
"cachedDataPanel" : false,
"dataExtensions" : null,
"dataSubFiles" : null,
"dataExtensions" : "",
"dataSubFiles" : "",
"hideFileName" : false,
"showEmergencyStop" : false,
"showHomingButtons" : false,
"showJogButtons" : false,
"hideScanPanel" : false,
"hideOutputPanel" : false,
"showXScanFileBrowser" : false,
"showXScanFileBrowser" : true,
"showQueueBrowser" : false,
"backgroundRendering" : false,
"showImageStatusBar" : false,
"showImageStatusBar" : true,
"persistRendererWindows" : false,
"defaultRendererColormap" : "Grayscale",
"linePlot" : "ch.psi.pshell.plot.LinePlotJFree",
"matrixPlot" : "ch.psi.pshell.plot.MatrixPlotJFree",
"surfacePlot" : null,
"surfacePlot" : "null",
"timePlot" : "ch.psi.pshell.plot.TimePlotJFree",
"plotsDetached" : false,
"plotLayout" : "Vertical",
"quality" : "High",
"defaultPlotColormap" : "Temperature",
"markerSize" : 0,
"markerSize" : 2,
"plotBackground" : null,
"gridColor" : null,
"outlineColor" : null,

2
config/setup.properties
View File

@@ -2,7 +2,7 @@
sessionsPath={outp}/sessions
scriptPath={home}/script
configFileDevices={config}/devices.properties
xscanPath={script}
xscanPath=~/operation/fda/scans
queuePath={script}
extensionsPath={home}/extensions
configPath={home}/config

4
config/variables.properties
View File

@@ -1,4 +1,4 @@
#Fri Mar 25 18:15:42 CET 2022
#Mon Aug 08 12:00:10 CEST 2022
LastRunDate=220325
FileSequentialNumber=17
DaySequentialNumber=3
DaySequentialNumber=0

12
script/local.py
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)

2
script/test/MultipleFDAE-Fe-Patrick.py
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")

2
script/test/MultipleFDAE-Ni-Patrick.py
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")

2
script/test/MultipleFDAExemple.py
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")

2
script/test/MultipleXAS_Fluo.py
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")

2
script/test/MultipleXAS_fluo_Andreas.py
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")

2
script/test/MultipleXAS_trans_Andreas.py
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")

2
script/test/MultipleXAS_trans_Andreas_adj.py
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")

4
script/test/MultipleXES1.py
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")

6
script/test/MultipleXES2.py
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")