pshell_config/dev
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Jun 2024

Browse Source
This commit is contained in:
gobbo_a
2024-06-10 10:44:16 +02:00
parent 9256184430
commit 3093557c99
79 changed files with 2747 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/config.properties
+4 -2
View File
@@ -1,4 +1,4 @@
#Tue Oct 31 13:01:30 CET 2023
#Mon Jun 10 10:43:14 CEST 2024
XScanAppendSuffix=true
XScanCrlogicAbortable=true
XScanCrlogicChannel=null
@@ -20,6 +20,7 @@ dataScanReleaseRecords=false
dataScanSaveOutput=false
dataScanSaveScript=false
dataScanSaveSetpoints=true
dataScanSaveTimestamps=false
dataServerPort=5573
dataTransferHost=
dataTransferMode=Off
@@ -46,10 +47,11 @@ noBytecodeFiles=false
notificationLevel=User
notifiedTasks=Test1,TestDate, xxx
parallelInitialization=false
pythonHome={home}/cpython
saveCommandStatistics=true
saveConsoleSessionFiles=false
scanStreamerPort=5563
serverEnabled=true
serverEnabled=false
serverPort=8080
sessionHandling=On
simulation=false
config/devices.properties
+3 -2
View File
@@ -23,7 +23,7 @@ pip=ch.psi.pshell.camserver.PipelineStream|localhost:8889 simulation_sp|||true
#rr=RotationReadback|TESTIOC:TESTCALCOUT:Output|||true
#rp=ch.psi.pshell.epics.Positioner|TESTIOC:TESTCALCOUT:Input null rr|||
#webcam=ch.psi.pshell.webcam.Webcam|:2|||true
deting=ch.psi.pshell.imaging.CameraSource|det||-500|
#deting=ch.psi.pshell.imaging.CameraSource|det||-500|
#PiezoRoll1=ch.psi.pshell.epics.ControlledVariable|"TESTIOC:TESTCALCOUT:Input" TESTIOC:TESTCALCOUT:Output false|||true
#$ser=ch.psi.pshell.serial.TcpDevice||||
#$beam_ok=ch.psi.pshell.epics.ChannelString|CHANNEL|||
@@ -92,6 +92,7 @@ slit=ch.psi.pshell.device.Slit|motor motor2|||
#$vhq4=ch.psi.pshell.epics.Vhq4|T-MMDV5|||
#$ps=PowerSupply|T-MMDV5|||
pe=ch.psi.pshell.epics.Positioner|"TESTIOC:TESTCALCOUT:Input" TESTIOC:TESTCALCOUT:Output|||true
pe2=ch.psi.pshell.device.DummyPositioner||||true
cv=ch.psi.pshell.epics.ControlledVariable|TESTIOC:TESTCALCOUT:Input TESTIOC:TESTCALCOUT:Output|||true
#detector=ch.psi.pshell.detector.DetectorBase|http://127.0.0.1:8090/|||
#serial=ch.psi.pshell.serial.SerialPortDevice||||
@@ -129,7 +130,7 @@ gamma=ch.psi.pshell.device.DummyMotor||||true
eta=ch.psi.pshell.device.DummyMotor||||true
chi=ch.psi.pshell.device.DummyMotor||||true
phi=ch.psi.pshell.device.DummyMotor||||true
#sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta chi phi|||
sixc=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta chi phi|||
#fivec=ch.psi.pshell.device.MotorGroupBase|delta gamma eta chi phi|||
#fourc=ch.psi.pshell.device.MotorGroupBase|delta eta chi phi|||
fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
config/diffcalc/test.json
+17 -12
View File
@@ -3,28 +3,33 @@
"crystal": "['cubic', 1, 1, 1, 90.0, 90.0, 90.0]",
"reflist": {
"1": {
"tag": null,
"hkl": "[1.0, 0.0, 0.0]",
"pos": "[0, 1.0, 0.0, 0.0, 0.0, 0.0]",
"energy": 12.39842,
"time": "2020-07-15T15:45:37.924000"
},
"2": {
"tag": null,
"tag": "None",
"hkl": "[0.0, 1.0, 0.0]",
"pos": "[0, 60, 0, 30, 0, 90]",
"energy": 12.39842,
"time": "2020-07-15T15:45:37.960000"
"time": "2023-11-03T14:09:46.383000"
},
"2": {
"tag": "None",
"hkl": "[1.0, 0.0, 0.0]",
"pos": "[0.0, 1.0, 0.0, 0.0, 0.0, 0.0]",
"energy": 20.0,
"time": "2023-11-03T14:09:46.375000"
}
},
"orientlist": {},
"tau": 0,
"sigma": 0,
"reference": {
"n_hkl_configured": null,
"n_phi_configured": "[0.0, 0.0, 1.0]"
},
"u": null,
"u": [
"1.0, 0.0, 0.0",
"0.0, 1.0, 0.0",
"0.0, 0.0, 1.0"
],
"ub": null,
"or0": 1,
"or1": 2
"or0": null,
"or1": null
}
config/plugins.properties
+4
View File
@@ -1,3 +1,7 @@
Scan.java=disabled
Redis.java=disabled
DemoScan.java=disabled
X.java=disabled
sc.java=disabled
Regine.java=disabled
ScreenPanel11.java=disabled
config/preferences.json
+3 -6
View File
@@ -65,10 +65,10 @@
"hideScanPanel" : false,
"hideOutputPanel" : false,
"showXScanFileBrowser" : true,
"showQueueBrowser" : true,
"showQueueBrowser" : false,
"backgroundRendering" : false,
"showImageStatusBar" : true,
"persistRendererWindows" : false,
"persistRendererWindows" : true,
"defaultRendererColormap" : "Grayscale",
"linePlot" : "ch.psi.pshell.plot.LinePlotJFree",
"matrixPlot" : "ch.psi.pshell.plot.MatrixPlotJFree",
@@ -127,10 +127,7 @@
"deviceClassName" : "ch.psi.pshell.camserver.CamServerService",
"panelClassName" : "ch.psi.pshell.swing.CamServerServicePanel"
}, {
"deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterArray",
"panelClassName" : "ch.psi.pshell.swing.DeviceValueChart"
}, {
"deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister$ReadonlyRegisterMatrix",
"deviceClassName" : "ch.psi.pshell.device.ReadonlyRegister",
"panelClassName" : "ch.psi.pshell.swing.DeviceValueChart"
} ],
"scriptPopupDialog" : "Exception"
config/sessions.properties
+1 -2
View File
@@ -1,3 +1,2 @@
#Mon Apr 03 15:43:39 CEST 2023
CurrentSession=177
#Fri Nov 03 13:49:20 CET 2023
SessionCounter=177
config/setup.properties
+23 -22
View File
@@ -1,27 +1,28 @@
#Fri Jun 10 11:48:34 CEST 2022
scriptPath={home}/script
sessionsPath={outp}/sessions
configFileDevices={config}/devices.properties
xscanPath={script}/test
queuePath={script}/queues
extensionsPath={home}/extensions
configFileUpdateStrategy={config}/update.properties
configPath={home}/config
configFileSessions={config}/sessions.properties
userSessionsPath={sessions}/user
dataPath={outp}/data
configFileVariables={config}/variables.properties
logPath={outp}/log
wwwPath={home}/www
#Wed Mar 20 10:42:57 CET 2024
cPythonPath={home}/cpython
configFile={config}/config.properties
configFileTasks={config}/tasks.properties
configFileDevices={config}/devices.properties
configFileImageSources={config}/imaging.properties
pluginsPath={home}/plugins
consoleSessionsPath={sessions}/console
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial; {script}/imaging
configFilePlugins={config}/plugins.properties
contextPath={outp}/context
devicesPath={home}/devices
configFileSessions={config}/sessions.properties
configFileSettings={config}/settings.properties
imagesPath={outp}/images
configFileTasks={config}/tasks.properties
configFileUpdateStrategy={config}/update.properties
configFileVariables={config}/variables.properties
configPath={home}/config
consoleSessionsPath={sessions}/console
contextPath={outp}/context
dataPath={outp}/data
devicesPath={home}/devices
extensionsPath={home}/extensions
imagesPath={data}
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial; {script}/imaging
logPath={outp}/log
pluginsPath={home}/plugins
queuePath={script}/queues
scriptPath={home}/script
scriptType=py
sessionsPath={outp}/sessions
userSessionsPath={sessions}/user
wwwPath={home}/www
xscanPath={script}/test
config/variables.properties
+4 -4
View File
@@ -1,7 +1,7 @@
#Fri Sep 29 09:45:06 CEST 2023
#Mon Jun 10 09:15:34 CEST 2024
CurrentSession=122
DaySequentialNumber=26
FileSequentialNumber=5986
LastRunDate=230929
DaySequentialNumber=1
FileSequentialNumber=6920
LastRunDate=240610
SessionCounter=127
xxx=[1, 2, 3, 4]