diff --git a/config/config.properties b/config/config.properties index fd6dc84..b05a10c 100755 --- a/config/config.properties +++ b/config/config.properties @@ -1,37 +1,62 @@ -#Wed Apr 28 10:58:02 CEST 2021 +#Thu Sep 04 11:24:01 CEST 2025 autoSaveScanData=true simulation=false -commandExecutionEvents=false -logDaysToLive=50 +xscanCrlogicChannel=null dataScanSaveOutput=false userAuthenticator= -logLevelConsole=Off -scanStreamerPort=-1 dataScanSaveScript=false -dataScanSaveSetpoints=false +notifiedTasks=null parallelInitialization=false -versionTrackingManual=true +fdaSerialization=false +dataTransferPath=null +saveConsoleSessionFiles=false +xscanAppendSuffix=true hostName=null -userManagement=false -instanceName=MA -dataServerPort=-1 -hideServerMessages=false +disableEmbeddedAttributes=false serverPort=8080 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} 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/satese.git +dataScanLazyTableCreation=false +pythonHome= +xscanMoveTimeout=600 +commandExecutionEvents=false +logDaysToLive=50 +xscanCrlogicSimulated=false +logLevelConsole=Off +filePermissionsConfig=Default +scanStreamerPort=-1 +dataScanSaveSetpoints=false +versionTrackingManual=true +dataTransferMode=Off +userManagement=false +instanceName=MA +dataServerPort=-1 +hideServerMessages=false +dataScanReleaseRecords=false +dataScanPreserveTypes=false +dataScanFlushRecords=false +logPath={logs}/{date}_{time} +filePermissionsLogs=Default +filePermissionsScripts=Default +xscanCrlogicPrefix=null +filePermissionsData=Default +xscanCrlogicAbortable=true createSessionFiles=false -versionTrackingLogin={context}/svcusr-hlapp_robot -versionTrackingRemote=git@git.psi.ch\:pshell_config/satese.git dataProvider=h5 +xscanCrlogicIoc=null saveCommandStatistics=false diff --git a/config/preferences.json b/config/preferences.json new file mode 100644 index 0000000..e0b15b5 --- /dev/null +++ b/config/preferences.json @@ -0,0 +1,116 @@ +{ + "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" : { + "name" : "SansSerif", + "style" : 0, + "size" : 11 + }, + "fontPlotTick" : { + "name" : "SansSerif", + "style" : 0, + "size" : 10 + }, + "fontPlotTitle" : { + "name" : "SansSerif", + "style" : 1, + "size" : 13 + }, + "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.HistogramGenerator", + "panelClassName" : "ch.psi.pshell.swing.HistogramGeneratorPanel" + }, { + "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 2426815..7675177 100755 --- a/config/setup.properties +++ b/config/setup.properties @@ -1,20 +1,25 @@ -#Tue Jun 16 14:28:19 CEST 2020 -scriptPath={home}/script +#Tue Aug 16 17:05:11 CEST 2022 sessionsPath={outp}/sessions -pluginsPath={home}/plugins +scriptPath={home}/script configFileDevices={config}/devices.properties +xscanPath={script} +queuePath={script} +extensionsPath={home}/extensions +configPath={home}/config +configFileSessions={config}/sessions.properties +userSessionsPath={sessions}/user +dataPath={outp}/data +configFileVariables={config}/variables.properties +wwwPath={home}/www +logPath={outp}/log +configFile={config}/config.properties +configFileTasks={config}/tasks.properties +pluginsPath={home}/plugins +consoleSessionsPath={sessions}/console libraryPath={script}; {script}/Lib contextPath={outp}/context configFilePlugins={config}/plugins.properties -extensionsPath={home}/extensions -configPath={home}/config -dataPath={outp}/data devicesPath={home}/devices -configFileVariables={config}/variables.properties configFileSettings={config}/settings.properties -wwwPath={home}/www -logPath={outp}/log imagesPath={outp}/images -configFile={config}/config.properties scriptType=py -configFileTasks={config}/tasks.properties diff --git a/config/variables.properties b/config/variables.properties new file mode 100755 index 0000000..28c4fb7 --- /dev/null +++ b/config/variables.properties @@ -0,0 +1,2 @@ +#Mon Jul 14 17:53:47 CEST 2025 +DaySequentialNumber=0 diff --git a/devices/CamServer.properties b/devices/CamServer.properties old mode 100644 new mode 100755 diff --git a/devices/CameraServer.properties b/devices/CameraServer.properties new file mode 100644 index 0000000..8e7a3c6 --- /dev/null +++ b/devices/CameraServer.properties @@ -0,0 +1,25 @@ +#Thu May 25 10:33:56 CEST 2023 +spatialCalOffsetY=NaN +spatialCalOffsetX=NaN +colormapLogarithmic=false +scale=1.0 +grayscale=false +spatialCalScaleX=NaN +spatialCalScaleY=NaN +colormapMax=NaN +rescaleOffset=0.0 +roiWidth=-1 +colormap=Grayscale +invert=false +colormapMin=NaN +rotation=0.0 +rotationCrop=false +rescaleFactor=1.0 +spatialCalUnits=mm +flipVertically=false +roiHeight=-1 +flipHorizontally=false +colormapAutomatic=false +roiY=0 +roiX=0 +transpose=false diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index 9c5476d..ede21e4 100755 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,15 +1,18 @@ -#Thu May 06 18:10:24 CEST 2021 -spatialCalOffsetY=932.325 -spatialCalOffsetX=1476.316715542522 +#Wed Aug 27 23:04:10 CEST 2025 +\u0000\u0000= +\u0000\u0000\u0000= +=0 +spatialCalOffsetY=0.0 +spatialCalOffsetX=0.0 colormapLogarithmic=false scale=1.0 grayscale=false -spatialCalScaleX=-1.0 -spatialCalScaleY=-1.0 -colormapMax=250.0 +spatialCalScaleX=1.0 +spatialCalScaleY=1.0 +colormapMax=50.0 rescaleOffset=0.0 roiWidth=-1 -colormap=Rainbow +colormap=Grayscale imageWidth=2592 invert=false colormapMin=0.0 @@ -18,6 +21,8 @@ rotationCrop=false rescaleFactor=1.0 imageHeight=2048 spatialCalUnits=mm +0= +1= flipVertically=false roiHeight=-1 flipHorizontally=false diff --git a/devices/dispatcher.properties b/devices/dispatcher.properties index 6e8f337..354c588 100755 --- a/devices/dispatcher.properties +++ b/devices/dispatcher.properties @@ -1,12 +1,14 @@ -#Tue Jun 16 14:32:33 CEST 2020 +#Wed Dec 13 12:49:27 CET 2023 sendStrategy=complete_all -socketType=DEFAULT -validationInconsistency=keep_as_is disableCompression=false keepListeningOnStop=false -byteBufferAllocator=false sendBuildChannelConfig=at_startup parallelHandlerProcessing=true +analizeHeader=false +sendAwaitFirstMessage=false +headerReservingAllocator=false +socketType=DEFAULT +validationInconsistency=keep_as_is +byteBufferAllocator=false mappingIncomplete=fill_null sendSyncTimeout=0 -sendAwaitFirstMessage=false diff --git a/script/test/TestCamBsread.py b/script/test/TestCamBsread.py new file mode 100644 index 0000000..a88ca70 --- /dev/null +++ b/script/test/TestCamBsread.py @@ -0,0 +1,29 @@ +import ch.psi.pshell.bs.Provider as Provider + + +CAMS154 = "tcp://daqsf-sioc-cs-c1a:9010" +PATT= "tcp://daqsf-sioc-cs-c3:9010" +CAMS161= "tcp://daqsf-sioc-cs-c1b:9020" + + +url=CAMS154 +#url= "tcp://SIN-CVME-DBPM0421:9000" +p=Provider("provider", url, True) +p.config.keepListeningOnStop = True +p.config.parallelHandlerProcessing = False +p.config.byteBufferAllocator = True +st1 = Stream("st1", p) +st1.initialize() +st1.start() +st1.waitCacheChange(20000) + + +#try: +# bscan (st1, 5, 5, save=False) +#finally: +# st1.close() + +try: + print st1.getValues() +finally: + st1.close()