From 6f0bd5af118fac97a655fabfaaead5e956df0f14 Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Wed, 13 Aug 2025 10:02:58 +0200 Subject: [PATCH] Startup --- config/config.properties | 55 +++++++++++++-------- config/preferences.json | 101 +++++++++++++++++++++++++++++++++++++++ config/setup.properties | 22 +++++---- devices/pos.properties | 17 +++---- 4 files changed, 158 insertions(+), 37 deletions(-) create mode 100644 config/preferences.json diff --git a/config/config.properties b/config/config.properties index 2f93076..8d6dce5 100755 --- a/config/config.properties +++ b/config/config.properties @@ -1,45 +1,62 @@ -#Mon May 10 15:50:57 CEST 2021 +#Wed Aug 13 10:02:50 CEST 2025 +xscanMoveTimeout=600 +autoSaveScanData=true +simulation=false +commandExecutionEvents=false +logDaysToLive=50 +xscanCrlogicChannel=null +dataScanSaveOutput=false +xscanCrlogicSimulated=false +userAuthenticator= +logLevelConsole=Off +filePermissionsConfig=Default +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +notifiedTasks=null +parallelInitialization=false +fdaSerialization=false +dataTransferPath=null +saveConsoleSessionFiles=false +xscanAppendSuffix=true +versionTrackingManual=false +dataTransferMode=Off hostName=null userManagement=false instanceName=RF disableEmbeddedAttributes=false -autoSaveScanData=true -simulation=false dataServerPort=-1 hideServerMessages=false serverPort=8090 versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} serverEnabled=true -commandExecutionEvents=false -logDaysToLive=50 dataScanReleaseRecords=false depthDimension=0 dataScanPreserveTypes=false logLevel=Fine -dataScanSaveOutput=false dataScanFlushRecords=false logPath={logs}/{date}_{time} +filePermissionsLogs=Default dataLayout=default disableDataFileLogs=false -sessionHandling=null +dataScanSaveTimestamps=false +sessionHandling=Off terminalEnabled=false -notificationLevel=null -userAuthenticator= -logLevelConsole=Off +notificationLevel=Off +filePermissionsScripts=Default terminalPort=3579 -scanStreamerPort=-1 -dataScanSaveScript=false +xscanCrlogicPrefix=null dataTransferUser=null -dataScanSaveSetpoints=false -notifiedTasks=null -parallelInitialization=false -dataTransferPath=null +filePermissionsData=Default +xscanCrlogicAbortable=true +xscanContinuousUpdate=false createSessionFiles=false -saveConsoleSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot -versionTrackingManual=false +noBytecodeFiles=false versionTrackingRemote=git@git.psi.ch\:pshell_config/sf-rf.git dataProvider=h5 +xscanCrlogicIoc=null +dataScanLazyTableCreation=false saveCommandStatistics=false -dataTransferMode=null +pythonHome= diff --git a/config/preferences.json b/config/preferences.json new file mode 100644 index 0000000..7117a47 --- /dev/null +++ b/config/preferences.json @@ -0,0 +1,101 @@ +{ + "fontShellPanel" : { + "name" : "Monospaced", + "style" : 0, + "size" : 13 + }, + "fontShellCommand" : { + "name" : "SansSerif", + "style" : 0, + "size" : 13 + }, + "fontOutput" : { + "name" : "Monospaced", + "style" : 0, + "size" : 13 + }, + "fontEditor" : { + "name" : "Monospaced", + "style" : 0, + "size" : 13 + }, + "fontPlotLabel" : null, + "fontPlotTick" : null, + "fontPlotTitle" : null, + "fontTerminal" : null, + "tabSize" : 4, + "contentWidth" : 0, + "editorBackground" : null, + "editorForeground" : null, + "simpleEditor" : false, + "hideEditorLineNumbers" : false, + "hideEditorContextMenu" : false, + "consoleLocation" : "Document", + "dataPanelLocation" : null, + "openDataFilesInDocTab" : false, + "noVariableEvaluationPropagation" : false, + "processingScripts" : null, + "asyncViewersUpdate" : false, + "scanPlotDisabled" : false, + "scanTableDisabled" : false, + "cachedDataPanel" : false, + "dataExtensions" : null, + "dataSubFiles" : null, + "hideFileName" : false, + "showEmergencyStop" : false, + "showHomingButtons" : false, + "showJogButtons" : false, + "hideScanPanel" : false, + "hideOutputPanel" : false, + "showXScanFileBrowser" : false, + "showQueueBrowser" : false, + "backgroundRendering" : false, + "showImageStatusBar" : true, + "persistRendererWindows" : true, + "defaultRendererColormap" : "Grayscale", + "linePlot" : "ch.psi.pshell.plot.LinePlotJFree", + "matrixPlot" : "ch.psi.pshell.plot.MatrixPlotJFree", + "surfacePlot" : "null", + "timePlot" : "ch.psi.pshell.plot.TimePlotJFree", + "plotsDetached" : false, + "plotLayout" : "Vertical", + "quality" : "High", + "defaultPlotColormap" : "Temperature", + "markerSize" : 2, + "plotBackground" : null, + "gridColor" : null, + "outlineColor" : null, + "disableOffscreenBuffer" : false, + "defaultPanels" : [ { + "deviceClassName" : "ch.psi.pshell.epics.Scaler", + "panelClassName" : "ch.psi.pshell.swing.ScalerPanel" + }, { + "deviceClassName" : "ch.psi.pshell.epics.Scienta", + "panelClassName" : "ch.psi.pshell.swing.ScientaPanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.Motor", + "panelClassName" : "ch.psi.pshell.swing.MotorPanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.ProcessVariable", + "panelClassName" : "ch.psi.pshell.swing.ProcessVariablePanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.MotorGroup", + "panelClassName" : "ch.psi.pshell.swing.MotorGroupPanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.DiscretePositioner", + "panelClassName" : "ch.psi.pshell.swing.DiscretePositionerPanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.Camera", + "panelClassName" : "ch.psi.pshell.swing.CameraPanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.Slit", + "panelClassName" : "ch.psi.pshell.swing.SlitPanel" + }, { + "deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterArray", + "panelClassName" : "ch.psi.pshell.swing.DeviceValueChart" + }, { + "deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterMatrix", + "panelClassName" : "ch.psi.pshell.swing.DeviceValueChart" + } ], + "scriptPopupDialog" : "None" +} \ No newline at end of file diff --git a/config/setup.properties b/config/setup.properties index c2fb2d8..75b4a31 100755 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,23 +1,25 @@ -#Mon May 10 15:50:56 CEST 2021 +#Thu Sep 29 09:51:31 CEST 2022 sessionsPath={outp}/sessions scriptPath={home}/script -pluginsPath={home}/plugins configFileDevices={config}/devices.properties -consoleSessionsPath={sessions}/console -libraryPath={script}; {script}/Lib -configFilePlugins={config}/plugins.properties -contextPath={outp}/context +xscanPath={script} +queuePath={script} extensionsPath={home}/extensions configPath={home}/config configFileSessions={config}/sessions.properties userSessionsPath={sessions}/user dataPath={outp}/data -devicesPath={home}/devices configFileVariables={config}/variables.properties -configFileSettings={config}/settings.properties logPath={outp}/log wwwPath={home}/www -imagesPath={outp}/images configFile={config}/config.properties -scriptType=py configFileTasks={config}/tasks.properties +pluginsPath={home}/plugins +consoleSessionsPath={sessions}/console +libraryPath={script}; {script}/Lib +configFilePlugins={config}/plugins.properties +contextPath={outp}/context +devicesPath={home}/devices +configFileSettings={config}/settings.properties +imagesPath={outp}/images +scriptType=py diff --git a/devices/pos.properties b/devices/pos.properties index fd46695..dadc34c 100755 --- a/devices/pos.properties +++ b/devices/pos.properties @@ -1,10 +1,11 @@ -#Mon Mar 04 14:20:45 CET 2019 -maxValue=180.0 +#Thu Sep 29 09:51:34 CEST 2022 minValue=-180.0 -offset=0.0 -precision=1 -resolution=NaN -rotation=false -scale=1.0 -sign_bit=0 unit=null +offset=0.0 +maxValue=180.0 +precision=1 +rotation=false +sign_bit=0 +scale=1.0 +description=null +resolution=NaN