From 329362edf3d1e1d9344c704eaec33c8023edb423 Mon Sep 17 00:00:00 2001 From: gac-x10da Date: Mon, 8 Aug 2022 12:05:47 +0200 Subject: [PATCH] Closedown --- config/config.properties | 4 ++-- config/preferences.json | 20 ++++++++++++-------- config/setup.properties | 2 +- config/variables.properties | 4 ++-- script/local.py | 12 +----------- script/test/MultipleFDAE-Fe-Patrick.py | 2 +- script/test/MultipleFDAE-Ni-Patrick.py | 2 +- script/test/MultipleFDAExemple.py | 2 +- script/test/MultipleXAS_Fluo.py | 2 +- script/test/MultipleXAS_fluo_Andreas.py | 2 +- script/test/MultipleXAS_trans_Andreas.py | 2 +- script/test/MultipleXAS_trans_Andreas_adj.py | 2 +- script/test/MultipleXES1.py | 4 ++-- script/test/MultipleXES2.py | 6 +++--- 14 files changed, 30 insertions(+), 36 deletions(-) diff --git a/config/config.properties b/config/config.properties index 29b4d87..c6e3f18 100644 --- a/config/config.properties +++ b/config/config.properties @@ -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 diff --git a/config/preferences.json b/config/preferences.json index 9463511..e91956c 100644 --- a/config/preferences.json +++ b/config/preferences.json @@ -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, diff --git a/config/setup.properties b/config/setup.properties index 2077d75..7d0f26d 100644 --- a/config/setup.properties +++ b/config/setup.properties @@ -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 diff --git a/config/variables.properties b/config/variables.properties index 5f14b7d..aa0deca 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -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 diff --git a/script/local.py b/script/local.py index aa4a4d3..51a3e18 100644 --- a/script/local.py +++ b/script/local.py @@ -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) \ No newline at end of file +#add_device(bragg.getExtEncoder(), True) \ No newline at end of file diff --git a/script/test/MultipleFDAE-Fe-Patrick.py b/script/test/MultipleFDAE-Fe-Patrick.py index b8f5412..0cdd6cb 100644 --- a/script/test/MultipleFDAE-Fe-Patrick.py +++ b/script/test/MultipleFDAE-Fe-Patrick.py @@ -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") diff --git a/script/test/MultipleFDAE-Ni-Patrick.py b/script/test/MultipleFDAE-Ni-Patrick.py index 7cac59f..ab71c12 100644 --- a/script/test/MultipleFDAE-Ni-Patrick.py +++ b/script/test/MultipleFDAE-Ni-Patrick.py @@ -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") diff --git a/script/test/MultipleFDAExemple.py b/script/test/MultipleFDAExemple.py index 4a45a71..6b91504 100644 --- a/script/test/MultipleFDAExemple.py +++ b/script/test/MultipleFDAExemple.py @@ -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") diff --git a/script/test/MultipleXAS_Fluo.py b/script/test/MultipleXAS_Fluo.py index 3529e30..2eeccde 100644 --- a/script/test/MultipleXAS_Fluo.py +++ b/script/test/MultipleXAS_Fluo.py @@ -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") diff --git a/script/test/MultipleXAS_fluo_Andreas.py b/script/test/MultipleXAS_fluo_Andreas.py index 364e8f0..cc46d99 100644 --- a/script/test/MultipleXAS_fluo_Andreas.py +++ b/script/test/MultipleXAS_fluo_Andreas.py @@ -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") diff --git a/script/test/MultipleXAS_trans_Andreas.py b/script/test/MultipleXAS_trans_Andreas.py index d91b466..cb2388c 100644 --- a/script/test/MultipleXAS_trans_Andreas.py +++ b/script/test/MultipleXAS_trans_Andreas.py @@ -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") diff --git a/script/test/MultipleXAS_trans_Andreas_adj.py b/script/test/MultipleXAS_trans_Andreas_adj.py index ddc30fe..3b43f8a 100644 --- a/script/test/MultipleXAS_trans_Andreas_adj.py +++ b/script/test/MultipleXAS_trans_Andreas_adj.py @@ -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") diff --git a/script/test/MultipleXES1.py b/script/test/MultipleXES1.py index a737d33..0a01562 100644 --- a/script/test/MultipleXES1.py +++ b/script/test/MultipleXES1.py @@ -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") diff --git a/script/test/MultipleXES2.py b/script/test/MultipleXES2.py index b05a70b..2c02510 100644 --- a/script/test/MultipleXES2.py +++ b/script/test/MultipleXES2.py @@ -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")