V2
This commit is contained in:
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -6,7 +6,7 @@ if get_exec_pars().debug:
|
||||
FILE = None
|
||||
|
||||
if FILE:
|
||||
FILE = get_context().setup.expandPath("{home}/parameters/" + FILE)
|
||||
FILE = Setup.expandPath("{home}/parameters/" + FILE)
|
||||
import json
|
||||
with open(FILE) as json_file:
|
||||
cfg = json.load(json_file)
|
||||
|
||||
@@ -6,7 +6,7 @@ if get_exec_pars().debug:
|
||||
FILE = None
|
||||
|
||||
if FILE:
|
||||
FILE = get_context().setup.expandPath("{home}/parameters/" + FILE)
|
||||
FILE = Setup.expandPath("{home}/parameters/" + FILE)
|
||||
import json
|
||||
with open(FILE) as json_file:
|
||||
cfg = json.load(json_file)
|
||||
|
||||
@@ -24,7 +24,7 @@ if get_exec_pars().debug:
|
||||
REGIONS = [["R1", R1]]
|
||||
|
||||
if FILE:
|
||||
FILE = get_context().setup.expandPath("{home}/parameters/" + FILE)
|
||||
FILE = Setup.expandPath("{home}/parameters/" + FILE)
|
||||
with open(FILE) as json_file:
|
||||
cfg = json.load(json_file)
|
||||
NAME , REGIONS, PASSES= cfg[0][0][0], cfg[1], cfg[2]
|
||||
|
||||
@@ -24,7 +24,7 @@ if get_exec_pars().debug:
|
||||
REGIONS = [["R1", R1]]
|
||||
|
||||
if FILE:
|
||||
FILE = get_context().setup.expandPath("{home}/parameters/" + FILE)
|
||||
FILE = Setup.expandPath("{home}/parameters/" + FILE)
|
||||
with open(FILE) as json_file:
|
||||
cfg = json.load(json_file)
|
||||
NAME , REGIONS, PASSES= cfg[0][0][0], cfg[1], cfg[2]
|
||||
|
||||
@@ -1 +1 @@
|
||||
[ [ [ true, "", "energy.move(1001.0)", "Resume", "Success" ], [ true, "", "energy.move(1000.0)", "Resume", "Success" ], [ true, "", "scienta.setAcquisitionMode(scienta.AcquisitionMode.Fixed)", "Resume", "" ] ] ]
|
||||
[ [ [ true, "", "energy.move(1001.0)", "Resume", "" ], [ true, "", "energy.move(1000.0)", "Resume", "" ], [ true, "", "scienta.setAcquisitionMode(scienta.AcquisitionMode.Fixed)", "Resume", "" ] ] ]
|
||||
+80
-1
@@ -1 +1,80 @@
|
||||
time.sleep(5.0)
|
||||
time.sleep(5.0)
|
||||
|
||||
PSHELL_LAF=dark
|
||||
PSHELL_CONSOLE_LOG=WARNING
|
||||
PSHELL_PARALLEL_INIT=true
|
||||
PSHELL_SIDEBAR=true
|
||||
PSHELL_ARCHIVER=https://data-api.psi.ch/api/4
|
||||
PSHELL_BACKEND=sls-archiver
|
||||
PSHELL_PIPELINE_SERVER=sls-daqsync-01:8889
|
||||
PSHELL_CAMERA_SERVER=sls-daqsync-01:8888
|
||||
|
||||
|
||||
|
||||
|
||||
PSHELL_JVM_OPTIONS
|
||||
PSHELL_ARGS
|
||||
APP_ARCHIVERVIEWER_JVM_OPTIONS
|
||||
APP_ARCHIVERVIEWER_ARGS
|
||||
|
||||
|
||||
|
||||
- Update startup arg fermat
|
||||
- -e -> -k
|
||||
-k -> -pers
|
||||
- config.dataProvider -> config.dataFormat
|
||||
- config.hideServerMessages -> config.serverCommandsHidden
|
||||
- config.disableDataFileLogs -> ! dataScanSaveLogs
|
||||
- config.hostName -> config.serverHostName
|
||||
- config.scanStreamer* -> config.dataScanStreamer*
|
||||
- config.depthDimension -> dataDepthDimension
|
||||
- config.notifiedTasks -> notificationTasks
|
||||
- config.autoSaveScanData -> dataScanAutoSave
|
||||
- config.noBytecodeFiles -> pythonNoBytecodeFiles
|
||||
|
||||
- ch.psi.pshell.bs.PipelineServer -> ch.psi.pshell.camserver.PipelineSource
|
||||
- ch.psi.pshell.bs.CameraServer -> ch.psi.pshell.camserver.CameraSource
|
||||
|
||||
- Scripts:
|
||||
- ContextListener -> InterpreterListener
|
||||
onContextStateChanged -> onStateChanged
|
||||
|
||||
- get_context() ->
|
||||
Context
|
||||
Setup
|
||||
get_app()
|
||||
get_view()
|
||||
get_interpreter()
|
||||
get_data_manager()
|
||||
get_versioning_manager()
|
||||
get_device_pool()
|
||||
get_session_manager()
|
||||
get_plugin_manager()
|
||||
get_state()
|
||||
- FormatCSV
|
||||
-> get_data_manager().format
|
||||
- provider=. -> format=
|
||||
|
||||
-Plugins:
|
||||
ch.psi.pshell.ui.PanelProcessor -> ch.psi.pshell.framework.PanelProcessor
|
||||
ch.psi.pshell.ui.QueueProcessor -> ch.psi.pshell.framework.QueueProcessor
|
||||
import ch.psi.pshell.core.Plugin -> import ch.psi.pshell.framework.Plugin;
|
||||
ch.psi.pshell.core.Context -> ch.psi.pshell.framework.Context
|
||||
ch.psi.pshell.ui.Panel -> ch.psi.pshell.framework.Panel
|
||||
|
||||
import ch.psi.pshell.swing.MainFrame -> import ch.psi.pshell.app.MainFrame;
|
||||
ch.psi.utils.swing -> ch.psi.pshell.swing
|
||||
|
||||
ch.psi.utils -> ch.psi.pshell.utils
|
||||
Context.ContextStateException -> Interpreter.InterpreterStateException
|
||||
ch.psi.pshell.imaging.Renderer -> ch.psi.pshell.imaging.DeviceRenderer
|
||||
|
||||
getContext().getSetup() -> Setup
|
||||
getContext() => Context
|
||||
ch.psi.pshell.core.JsonSerializer -> ch.psi.pshell.utils.EncoderJson;
|
||||
*Adapter -> *Listener
|
||||
Setup.getScriptPath() -> Setup.getScriptsPath()
|
||||
|
||||
|
||||
debug --args="-home ~/dev/pshell/config/home --parallel true -laf=dark -archiver default -pipeline_server localhost:8889 -camera_server localhost:8888 -b -p XPSSpectrum.java -d -pers -sbar lala lele lili"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user