2023-01-10 15:44:25 +01:00
parent 8ecc28a80c
commit c2b9b275c7
8 changed files with 202 additions and 47 deletions
--- a/config/config-sim.properties
+++ b/config/config-sim.properties
@@ -1,37 +1,50 @@
-#Fri Aug 14 10:03:39 CEST 2020
+#Wed Dec 15 12:15:02 CET 2021
+autoSaveScanData=true
+simulation=false
+commandExecutionEvents=false
+logDaysToLive=30
+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=
+parallelInitialization=false
+dataTransferPath=
+saveConsoleSessionFiles=false
+versionTrackingManual=true
+dataTransferMode=Off
 hostName=null
 userManagement=false
 instanceName=NanoXAS-SIM
-autoSaveScanData=true
-simulation=false
+disableEmbeddedAttributes=false
 dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
 dataPath={data}/{year}/NEXAFS/{year}_{month}/{date}/{seq}_{date}_{time}_{name}
 serverEnabled=false
-commandExecutionEvents=false
-logDaysToLive=30
 dataScanReleaseRecords=false
 depthDimension=0
 dataScanPreserveTypes=true
 logLevel=Fine
-dataScanSaveOutput=false
 dataScanFlushRecords=false
 logPath={logs}/{date}_{time}
+filePermissionsLogs=Default
 dataLayout=default
+disableDataFileLogs=false
+sessionHandling=Off
 terminalEnabled=false
 notificationLevel=Off
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\\\\\://d.psi.ch | d.psi.ch | users.psi
-logLevelConsole=Off
+filePermissionsScripts=Default
 terminalPort=3579
-scanStreamerPort=-1
-dataScanSaveScript=false
-dataScanSaveSetpoints=false
-parallelInitialization=false
+dataTransferUser=
+filePermissionsData=Default
 createSessionFiles=false
 versionTrackingLogin={context}/svcusr-hlapp_robot
-versionTrackingManual=true
+noBytecodeFiles=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x07db.git
 dataProvider=h5
 saveCommandStatistics=false
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,37 +1,51 @@
-#Fri Jan 22 10:38:55 CET 2021
+#Tue Aug 09 08:58:31 CEST 2022
+autoSaveScanData=true
+simulation=false
+commandExecutionEvents=false
+logDaysToLive=30
+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=
+parallelInitialization=false
+fdaSerialization=false
+dataTransferPath=
+saveConsoleSessionFiles=false
+versionTrackingManual=true
+dataTransferMode=Off
 hostName=null
 userManagement=false
 instanceName=NanoXAS
-autoSaveScanData=true
-simulation=false
+disableEmbeddedAttributes=false
 dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
 dataPath={data}/NEXAFS/{year}/{year}_{month}/{date}/{seq}_{date}_{time}_{name}
 serverEnabled=false
-commandExecutionEvents=false
-logDaysToLive=30
 dataScanReleaseRecords=false
 depthDimension=0
 dataScanPreserveTypes=true
 logLevel=Fine
-dataScanSaveOutput=false
 dataScanFlushRecords=false
 logPath={logs}/{date}_{time}
+filePermissionsLogs=Default
 dataLayout=default
+disableDataFileLogs=false
+sessionHandling=Off
 terminalEnabled=false
 notificationLevel=Off
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\\\\\://d.psi.ch | d.psi.ch | users.psi
-logLevelConsole=Off
+filePermissionsScripts=Default
 terminalPort=3579
-scanStreamerPort=-1
-dataScanSaveScript=false
-dataScanSaveSetpoints=false
-parallelInitialization=false
+dataTransferUser=
+filePermissionsData=Default
 createSessionFiles=false
 versionTrackingLogin={context}/svcusr-hlapp_robot
-versionTrackingManual=true
+noBytecodeFiles=false
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x07db.git
 dataProvider=h5
 saveCommandStatistics=false
--- a/config/devices-sim.properties
+++ b/config/devices-sim.properties
@@ -12,4 +12,4 @@ ElementSet=ch.psi.pshell.epics.ChannelString|NAPP-SCIENTA:cam1:ELEMENT_SET_RBV||
 StepSize=ch.psi.pshell.epics.ChannelDouble|NAPP-SCIENTA:cam1:STEP_SIZE_RBV|||
 NumIterations=ch.psi.pshell.epics.ChannelDouble|NAPP-SCIENTA:cam1:NumExposures_RBV|||
 $EntranceSlit=ch.psi.pshell.epics.ChannelDouble|X07DB-OP-SH1:TR1|||
-$ExitSlit=ch.psi.pshell.epics.ChannelDouble|X07DB-OP-SH2:TR1|||
+$ExitSlit=ch.psi.pshell.epics.ChannelDouble|X11MA-OP2-SL:TRY.VAL|||
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,4 +1,4 @@
-#Thu Nov 21 14:08:40 CET 2019
+#Sat Jul 09 15:41:21 CEST 2022
 ch.psi.jcae.ContextFactory.maxArrayBytes=50000000
 ch.psi.jcae.impl.DefaultChannelService.timeout=1000
 ch.psi.jcae.ContextFactory.maxSendArrayBytes=
@@ -6,7 +6,7 @@ ch.psi.jcae.ChannelFactory.timeout=2000
 ch.psi.jcae.ChannelFactory.retries=2
 ch.psi.jcae.ContextFactory.useShellVariables=false
 ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
-ch.psi.jcae.ContextFactory.addressList=
+ch.psi.jcae.ContextFactory.addressList=129.129.113.255 129.129.131.255 129.129.121.73 sls-x07da-cagw.psi.ch\:5822
 ch.psi.jcae.ContextFactory.serverPort=
 ch.psi.jcae.impl.DefaultChannelService.retries=1
 ch.psi.jcae.ContextFactory.autoAddressList=false
--- a/config/preferences.json
+++ b/config/preferences.json
@@ -0,0 +1,120 @@
+{
+  "fontShellPanel" : {
+    "name" : "Lucida Console",
+    "style" : 0,
+    "size" : 11
+  },
+  "fontShellCommand" : {
+    "name" : "SansSerif",
+    "style" : 0,
+    "size" : 13
+  },
+  "fontOutput" : {
+    "name" : "Lucida Console",
+    "style" : 0,
+    "size" : 11
+  },
+  "fontEditor" : {
+    "name" : "Lucida Console",
+    "style" : 0,
+    "size" : 11
+  },
+  "fontPlotLabel" : {
+    "name" : "SansSerif",
+    "style" : 0,
+    "size" : 11
+  },
+  "fontPlotTick" : {
+    "name" : "SansSerif",
+    "style" : 0,
+    "size" : 10
+  },
+  "fontPlotTitle" : {
+    "name" : "SansSerif",
+    "style" : 1,
+    "size" : 13
+  },
+  "fontTerminal" : {
+    "name" : "Consolas",
+    "style" : 0,
+    "size" : 14
+  },
+  "tabSize" : 4,
+  "contentWidth" : 0,
+  "editorBackground" : null,
+  "editorForeground" : null,
+  "simpleEditor" : false,
+  "hideEditorLineNumbers" : false,
+  "hideEditorContextMenu" : false,
+  "consoleLocation" : "Left",
+  "dataPanelLocation" : null,
+  "openDataFilesInDocTab" : false,
+  "noVariableEvaluationPropagation" : false,
+  "processingScripts" : [ ],
+  "asyncViewersUpdate" : false,
+  "scanPlotDisabled" : false,
+  "scanTableDisabled" : false,
+  "cachedDataPanel" : false,
+  "dataExtensions" : "",
+  "dataSubFiles" : "",
+  "hideFileName" : false,
+  "showEmergencyStop" : false,
+  "showHomingButtons" : false,
+  "showJogButtons" : false,
+  "hideScanPanel" : false,
+  "hideOutputPanel" : false,
+  "showXScanFileBrowser" : true,
+  "showQueueBrowser" : true,
+  "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" : "Scienta",
+    "panelClassName" : "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" : "Exception"
+}
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -1,20 +1,25 @@
-#Wed Nov 20 10:53:39 CET 2019
-scriptPath={home}/script
+#Tue Aug 09 08:58:31 CEST 2022
 sessionsPath={outp}/sessions
-pluginsPath={home}/plugins
+scriptPath={home}/script
 configFileDevices={config}/devices.properties
+xscanPath=../fda_home/scans
+queuePath={script}/queues
+extensionsPath={home}/extensions
+configPath={home}/config
+configFileSessions={config}/sessions.properties
+userSessionsPath={sessions}/user
+dataPath=M\:SC 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=M:\SC 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
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,4 @@
-#Thu Aug 05 09:42:04 CEST 2021
-FileSequentialNumber=39
+#Thu Dec 15 00:41:53 CET 2022
+LastRunDate=221215
+FileSequentialNumber=73
+DaySequentialNumber=2
--- a/devices/energy.properties
+++ b/devices/energy.properties
@@ -1,10 +1,11 @@
-#Fri Aug 21 12:11:45 CEST 2020
+#Tue Aug 09 08:58:33 CEST 2022
+minValue=100.0
+unit=eV
 offset=0.0
 maxValue=1800.0
 rotation=false
 precision=4
-scale=1.0
-resolution=0.1
-minValue=100.0
-unit=eV
 sign_bit=0
+scale=1.0
+description=null
+resolution=0.1