From 1cb01df479f10a5e577e25d04bdcac197580c5cd Mon Sep 17 00:00:00 2001 From: gobbo_a Date: Fri, 9 Jan 2026 10:24:43 +0100 Subject: [PATCH] Startup --- config/config.properties | 119 ++++++++++++++++++----------------- config/devices.properties | 2 +- devices/apu44x.properties | 2 +- devices/apu44y.properties | 2 +- devices/m1ba.properties | 2 +- devices/m1bb.properties | 2 +- devices/m2rx.properties | 2 +- devices/pbpg_mx.properties | 2 +- devices/pbpg_my.properties | 2 +- devices/pbps53_mx.properties | 2 +- devices/pbps53_my.properties | 2 +- devices/posi.properties | 2 +- script/local.py | 2 +- 13 files changed, 75 insertions(+), 68 deletions(-) diff --git a/config/config.properties b/config/config.properties index 4244409..97e0f8a 100755 --- a/config/config.properties +++ b/config/config.properties @@ -1,62 +1,69 @@ -#Wed Aug 13 10:36:33 CEST 2025 -autoSaveScanData=true -simulation=false -xscanCrlogicChannel=null -dataScanSaveOutput=false -userAuthenticator= -dataScanSaveScript=false -notifiedTasks=null -parallelInitialization=false -fdaSerialization=false -dataTransferPath=null -xscanAppendSuffix=true -saveConsoleSessionFiles=false -hostName= -disableEmbeddedAttributes=false -serverPort=8095 -versionTrackingEnabled=true -dataPath={data}/{year}/{month}/{day}/{date}_{time}_{name} -serverEnabled=false -depthDimension=0 -logLevel=Fine -dataLayout=default -disableDataFileLogs=false -dataScanSaveTimestamps=false -sessionHandling=Off -terminalEnabled=false -notificationLevel=Off -terminalPort=3579 -dataTransferUser=null -xscanContinuousUpdate=false -versionTrackingLogin=auto -noBytecodeFiles=false -versionTrackingRemote=https\://gitea.psi.ch/pshell_config/sf-ph.git -dataScanLazyTableCreation=false -pythonHome= -xscanMoveTimeout=600 +#Fri Jan 09 10:24:33 CET 2026 commandExecutionEvents=false -logDaysToLive=50 -xscanCrlogicSimulated=false -logLevelConsole=Off -filePermissionsConfig=Default -scanStreamerPort=-1 -dataScanSaveSetpoints=false -versionTrackingManual=false -dataTransferMode=Off -userManagement=false -instanceName=PH +commandQueueSize=-1 +commandStatistics=false +commandTimeToLive=600000 +consoleJournal=false +createSessionFiles=false +dataDepthDimension=0 +dataEmbeddedAttributes=false +dataFormat=h5 +dataLayout=default +dataPath={data}/{year}/{month}/{day}/{date}_{time}_{name} dataServerPort=-1 -hideServerMessages=false -dataScanReleaseRecords=false -dataScanPreserveTypes=false -dataScanFlushRecords=false -logPath={logs}/{date}_{time} +dataTransferMode=Off +dataTransferPath=null +dataTransferUser=null +dataTruncate=true +disableEmbeddedAttributes=false +fdaSerialization=false +filePermissionsConfig=Default +filePermissionsData=Default filePermissionsLogs=Default filePermissionsScripts=Default -xscanCrlogicPrefix=null -filePermissionsData=Default +instanceName=PH +logDaysToLive=50 +logLevel=Fine +logLevelConsole=Off +logPath={logs}/{date}_{time}.{mode} +notificationLevel=Off +notificationTasks=null +parallelInitialization=false +pythonHome= +pythonNoBytecodeFiles=false +scanAutoSave=true +scanDefaultTag="scan_{index}%d" +scanFlushRecords=false +scanLazyTableCreation=false +scanPreserveTypes=false +scanReleaseRecords=false +scanSaveLogs=true +scanSaveMeta=true +scanSaveOutput=false +scanSaveScript=false +scanSaveSetpoints=false +scanSaveTimestamps=false +scanStreamerPort=-1 +serverCommandsHidden=false +serverEnabled=false +serverHostName= +serverHttps=false +serverPort=8095 +sessionHandling=Off +simulation=false +terminalEnabled=false +terminalPort=3579 +userAuthenticator= +userManagement=false +versionTrackingEnabled=true +versionTrackingLogin=auto +versionTrackingManual=false +versionTrackingRemote=https\://gitea.psi.ch/pshell_config/sf-ph.git +xscanAppendSuffix=true +xscanContinuousUpdate=false xscanCrlogicAbortable=true -createSessionFiles=false -dataProvider=h5 +xscanCrlogicChannel=null xscanCrlogicIoc=null -saveCommandStatistics=false +xscanCrlogicPrefix=null +xscanCrlogicSimulated=false +xscanMoveTimeout=600 diff --git a/config/devices.properties b/config/devices.properties index 27393e3..d262d14 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,7 +1,7 @@ pbpg_slow_x=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:SLOW-X|Read||true pbpg_slow_y=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPG050:SLOW-Y|Read||true dispatcher=ch.psi.pshell.bs.Dispatcher|https://dispatcher-api.psi.ch/sf||| -cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889||| +cam_server=ch.psi.pshell.camserver.PipelineSource|sf-daqsync-01:8889||| pbps53_mx=ch.psi.pshell.epics.Motor|SARFE10-PBPS053:MOTOR_X1|||true apu44x=ch.psi.pshell.epics.Motor|SARFE10-OAPU044:MOTOR_X|||true pbps53_ypos=ch.psi.pshell.epics.ChannelDouble|SARFE10-PBPS053:YPOS|Read||true diff --git a/devices/apu44x.properties b/devices/apu44x.properties index eb95f86..39b63de 100755 --- a/devices/apu44x.properties +++ b/devices/apu44x.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=1 maxSpeed=1.0 -resolution=0.01 +deadband=0.01 homingType=None startRetries=1 minValue=-1000.0 diff --git a/devices/apu44y.properties b/devices/apu44y.properties index aaa391d..48e596a 100755 --- a/devices/apu44y.properties +++ b/devices/apu44y.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=1 maxSpeed=1.0 -resolution=0.1 +deadband=0.1 homingType=None startRetries=1 minValue=-1.0E10 diff --git a/devices/m1ba.properties b/devices/m1ba.properties index c933e6e..e391a68 100755 --- a/devices/m1ba.properties +++ b/devices/m1ba.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=0.1 -resolution=1.0E-6 +deadband=1.0E-6 homingType=None startRetries=1 minValue=-2.0 diff --git a/devices/m1bb.properties b/devices/m1bb.properties index c933e6e..e391a68 100755 --- a/devices/m1bb.properties +++ b/devices/m1bb.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=0.1 -resolution=1.0E-6 +deadband=1.0E-6 homingType=None startRetries=1 minValue=-2.0 diff --git a/devices/m2rx.properties b/devices/m2rx.properties index 68d7b52..c847ea1 100755 --- a/devices/m2rx.properties +++ b/devices/m2rx.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=NaN -resolution=0.001 +deadband=0.001 homingType=None startRetries=1 minValue=-100.0 diff --git a/devices/pbpg_mx.properties b/devices/pbpg_mx.properties index 9eaddcf..5cc8632 100755 --- a/devices/pbpg_mx.properties +++ b/devices/pbpg_mx.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=10.0 -resolution=0.01 +deadband=0.01 homingType=None startRetries=1 minValue=-1.6 diff --git a/devices/pbpg_my.properties b/devices/pbpg_my.properties index 9eaddcf..5cc8632 100755 --- a/devices/pbpg_my.properties +++ b/devices/pbpg_my.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=10.0 -resolution=0.01 +deadband=0.01 homingType=None startRetries=1 minValue=-1.6 diff --git a/devices/pbps53_mx.properties b/devices/pbps53_mx.properties index 71f8d8d..c5d0191 100755 --- a/devices/pbps53_mx.properties +++ b/devices/pbps53_mx.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=NaN -resolution=1.953125E-5 +deadband=1.953125E-5 homingType=None startRetries=1 minValue=-1.0 diff --git a/devices/pbps53_my.properties b/devices/pbps53_my.properties index 71f8d8d..c5d0191 100755 --- a/devices/pbps53_my.properties +++ b/devices/pbps53_my.properties @@ -7,7 +7,7 @@ scale=1.0 description=null estbilizationDelay=0 maxSpeed=NaN -resolution=1.953125E-5 +deadband=1.953125E-5 homingType=None startRetries=1 minValue=-1.0 diff --git a/devices/posi.properties b/devices/posi.properties index 259c87a..b3d18a2 100755 --- a/devices/posi.properties +++ b/devices/posi.properties @@ -3,7 +3,7 @@ maxValue=NaN minValue=NaN offset=0.0 precision=-1 -resolution=NaN +deadband=NaN rotation=false scale=1.0 unit=null diff --git a/script/local.py b/script/local.py index 15daea0..8cbeb1b 100755 --- a/script/local.py +++ b/script/local.py @@ -54,7 +54,7 @@ def elog(title, message, attachments = [], author = None, category = "Info", dom Add entry to ELOG. """ if author is None: - author = "pshell" #get_context().user.name + author = "pshell" #Context.user.name typ = "pshell" entry = ""