From 42beb9ecfe328ac7692eb243a059f17ab5488478 Mon Sep 17 00:00:00 2001 From: gac-x04sa Date: Mon, 8 Aug 2022 11:32:26 +0200 Subject: [PATCH] Startup --- config/config.properties | 43 +++++++-------- config/preferences.json | 101 +++++++++++++++++++++++++++++++++++ config/setup.properties | 22 ++++---- devices/otr.properties | 3 +- devices/otx.properties | 3 +- devices/oty.properties | 3 +- devices/otz.properties | 3 +- devices/piholeroy.properties | 21 ++++---- devices/scdx.properties | 3 +- devices/scr.properties | 3 +- devices/scx.properties | 3 +- devices/scy.properties | 3 +- devices/scz.properties | 3 +- 13 files changed, 164 insertions(+), 50 deletions(-) create mode 100644 config/preferences.json diff --git a/config/config.properties b/config/config.properties index 86a732b..10addf7 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,50 +1,51 @@ -#Tue Oct 26 10:11:40 CEST 2021 +#Mon Aug 08 11:23:58 CEST 2022 autoSaveScanData=true simulation=false +commandExecutionEvents=false +logDaysToLive=-1 dataScanSaveOutput=false userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi +logLevelConsole=Off +filePermissionsConfig=Default +scanStreamerPort=-1 dataScanSaveScript=false +dataScanSaveSetpoints=false notifiedTasks=null parallelInitialization=false +fdaSerialization=false dataTransferPath=null saveConsoleSessionFiles=false +versionTrackingManual=false +dataTransferMode=Off hostName=null +userManagement=false disableEmbeddedAttributes=false +instanceName=ES2 +dataServerPort=-1 serverPort=8080 +hideServerMessages=false versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} serverEnabled=false depthDimension=0 +dataScanReleaseRecords=false +dataScanPreserveTypes=false logLevel=Info +dataScanFlushRecords=false +logPath={logs}/{date}_{time} +filePermissionsLogs=Default dataLayout=default disableDataFileLogs=false sessionHandling=Off terminalEnabled=false notificationLevel=Off +filePermissionsScripts=Default terminalPort=3579 dataTransferUser=null +filePermissionsData=Default +createSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot noBytecodeFiles=false versionTrackingRemote=git@git.psi.ch\:pshell_config/x04sa-es2.git -commandExecutionEvents=false -logDaysToLive=-1 -logLevelConsole=Off -filePermissionsConfig=Default -scanStreamerPort=-1 -dataScanSaveSetpoints=false -versionTrackingManual=false -dataTransferMode=Off -userManagement=false -instanceName=ES2 -dataServerPort=-1 -hideServerMessages=false -dataScanReleaseRecords=false -dataScanPreserveTypes=false -dataScanFlushRecords=false -logPath={logs}/{date}_{time} -filePermissionsLogs=Default -filePermissionsScripts=Default -filePermissionsData=Default -createSessionFiles=false dataProvider=h5 saveCommandStatistics=false diff --git a/config/preferences.json b/config/preferences.json new file mode 100644 index 0000000..36a6256 --- /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" : "Status", + "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" : "ch.psi.pshell.plot.SurfacePlotJzy3d", + "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 673d50f..4658419 100644 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,23 +1,25 @@ -#Wed May 19 15:22:39 CEST 2021 +#Mon Aug 08 11:23:58 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/otr.properties b/devices/otr.properties index c1db5aa..8de05bb 100644 --- a/devices/otr.properties +++ b/devices/otr.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=-5.42 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=6.25E-5 diff --git a/devices/otx.properties b/devices/otx.properties index d12b742..02d69e9 100644 --- a/devices/otx.properties +++ b/devices/otx.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=80.0 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=4.16666E-4 diff --git a/devices/oty.properties b/devices/oty.properties index 939ed8e..c1b2af6 100644 --- a/devices/oty.properties +++ b/devices/oty.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=835.0 precision=3 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=1.25E-4 diff --git a/devices/otz.properties b/devices/otz.properties index c0e49a7..5185138 100644 --- a/devices/otz.properties +++ b/devices/otz.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=874.2 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=0.0375 diff --git a/devices/piholeroy.properties b/devices/piholeroy.properties index 9a48158..d55ce41 100644 --- a/devices/piholeroy.properties +++ b/devices/piholeroy.properties @@ -1,18 +1,19 @@ -#Mon Oct 14 14:11:25 CEST 2019 -precision=-1 -scale=1.0 -estbilizationDelay=0 -resolution=NaN -minValue=0.0 -defaultSpeed=0.02 -sign_bit=0 -monitorByPosition=false -minSpeed=1.0 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=1.0 +precision=-1 rotation=true +scale=1.0 +description=null +estbilizationDelay=0 maxSpeed=1.0 +resolution=NaN homingType=None startRetries=1 +minValue=0.0 unit=mm +defaultSpeed=0.02 +sign_bit=0 hasEnable=false +monitorByPosition=false +minSpeed=1.0 diff --git a/devices/scdx.properties b/devices/scdx.properties index a2e7379..79be77b 100644 --- a/devices/scdx.properties +++ b/devices/scdx.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=0.0 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=0.00423 diff --git a/devices/scr.properties b/devices/scr.properties index 159a024..fb0645e 100644 --- a/devices/scr.properties +++ b/devices/scr.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=360.0 precision=5 rotation=true scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=0.001 diff --git a/devices/scx.properties b/devices/scx.properties index 0bc2791..614b420 100644 --- a/devices/scx.properties +++ b/devices/scx.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=6.0 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=1.0E-4 diff --git a/devices/scy.properties b/devices/scy.properties index 70ad6d8..1038d1d 100644 --- a/devices/scy.properties +++ b/devices/scy.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=2.9 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=1.0E-4 diff --git a/devices/scz.properties b/devices/scz.properties index 0bc2791..614b420 100644 --- a/devices/scz.properties +++ b/devices/scz.properties @@ -1,9 +1,10 @@ -#Fri Sep 20 17:12:43 CEST 2019 +#Mon Aug 08 11:32:18 CEST 2022 offset=0.0 maxValue=6.0 precision=5 rotation=false scale=1.0 +description=null estbilizationDelay=0 maxSpeed=NaN resolution=1.0E-4