Startup
This commit is contained in:
BIN
config/.DS_Store
vendored
BIN
config/.DS_Store
vendored
Binary file not shown.
@@ -1,7 +1,7 @@
|
||||
#Tue Nov 06 14:31:07 CET 2018
|
||||
#Wed Mar 20 13:51:54 CET 2019
|
||||
autoSaveScanData=true
|
||||
commandExecutionEvents=false
|
||||
createSessionFiles=true
|
||||
createSessionFiles=false
|
||||
dataLayout=default
|
||||
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
|
||||
dataProvider=h5
|
||||
@@ -11,6 +11,7 @@ dataScanReleaseRecords=false
|
||||
dataServerPort=5573
|
||||
depthDimension=0
|
||||
generateCommandExecutionEvents=true
|
||||
hideServerMessages=false
|
||||
hostName=
|
||||
instanceName=Dev
|
||||
logDaysToLive=50
|
||||
@@ -18,8 +19,9 @@ logLevel=Fine
|
||||
logLevelConsole=Off
|
||||
logPath={logs}/{date}_{time}
|
||||
notificationLevel=Off
|
||||
saveCommandStatistics=true
|
||||
scanStreamerPort=5563
|
||||
serverEnabled=false
|
||||
serverEnabled=true
|
||||
serverPort=8080
|
||||
simulation=false
|
||||
terminalEnabled=false
|
||||
@@ -28,5 +30,5 @@ userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch |
|
||||
userManagement=true
|
||||
versionTrackingEnabled=true
|
||||
versionTrackingLogin={context}/svcusr-hlapp_robot
|
||||
versionTrackingManual=true
|
||||
versionTrackingManual=false
|
||||
versionTrackingRemote=git@git.psi.ch\:pshell_config/dev.git
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
dispatcher=ch.psi.pshell.bs.Provider|tcp://localhost:9999|||
|
||||
cam_server_local=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true
|
||||
cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889|||true
|
||||
#cam_server_local=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true
|
||||
cam_server=ch.psi.pshell.bs.PipelineServer|localhost:8889|||true
|
||||
#ts1=ch.psi.pshell.epics.GenericArray|TESTIOC:TESTWF2:MyWF|||
|
||||
#monit_cam=ch.psi.pshell.imaging.MjpegSource|http://axis-accc8e9cc87b.psi.ch/axis-cgi/mjpg/video.cgi?camera=2 reopen||-200|false
|
||||
#tststr=ch.psi.pshell.epics.ChannelString|TESTIOC:TESTSINUS:SinCalc|||
|
||||
@@ -69,7 +69,7 @@ pv=ch.psi.pshell.epics.ProcessVariable|TESTIOC:TESTCALCOUT:Input|||true
|
||||
shutter=ch.psi.pshell.epics.BinaryPositioner|TESTIOC:TESTBO:MyBO TESTIOC:TESTBO:MyBO|||true
|
||||
$motor=ch.psi.pshell.epics.Motor|MTEST-GOBBO:MOT1|||true
|
||||
$motor2=ch.psi.pshell.epics.Motor|MTEST-GOBBO:MOT2|||true
|
||||
table=ch.psi.pshell.device.MotorGroupBase|motor motor2|||
|
||||
table=ch.psi.pshell.device.MotorGroupBase|motor motor2|||true
|
||||
$manip=ch.psi.pshell.epics.Manipulator||||
|
||||
tab=ch.psi.pshell.device.MotorGroupDiscretePositioner|table|||
|
||||
#tab2=ch.psi.pshell.device.MotorGroupDiscretePositioner|table|||
|
||||
|
||||
38
config/diffcalc/test1.json
Normal file
38
config/diffcalc/test1.json
Normal file
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"name": "test1",
|
||||
"crystal": "['cubic', 'Triclinic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0]",
|
||||
"reflist": {
|
||||
"1": {
|
||||
"tag": null,
|
||||
"hkl": "[0.0, 1.0, 2.0]",
|
||||
"pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-26T18:02:19.132000"
|
||||
},
|
||||
"2": {
|
||||
"tag": null,
|
||||
"hkl": "[2.0, 0.0, 2.0]",
|
||||
"pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-26T18:02:19.148000"
|
||||
},
|
||||
"3": {
|
||||
"tag": null,
|
||||
"hkl": "[2.0, 2.0, 2.0]",
|
||||
"pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-26T18:02:19.213000"
|
||||
}
|
||||
},
|
||||
"orientlist": {},
|
||||
"tau": 0,
|
||||
"sigma": 0,
|
||||
"reference": {
|
||||
"n_hkl_configured": null,
|
||||
"n_phi_configured": "[0.0, 0.0, 1.0]"
|
||||
},
|
||||
"u": null,
|
||||
"ub": null,
|
||||
"or0": null,
|
||||
"or1": null
|
||||
}
|
||||
38
config/diffcalc/test2.json
Normal file
38
config/diffcalc/test2.json
Normal file
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"name": "test2",
|
||||
"crystal": "['cubic', 'Triclinic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0]",
|
||||
"reflist": {
|
||||
"1": {
|
||||
"tag": "None",
|
||||
"hkl": "[0.0, 1.0, 2.0]",
|
||||
"pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-15T11:11:34.710000"
|
||||
},
|
||||
"2": {
|
||||
"tag": "None",
|
||||
"hkl": "[2.0, 0.0, 2.0]",
|
||||
"pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-15T11:11:34.772000"
|
||||
},
|
||||
"3": {
|
||||
"tag": "None",
|
||||
"hkl": "[2.0, 2.0, 2.0]",
|
||||
"pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-15T11:11:34.864000"
|
||||
}
|
||||
},
|
||||
"orientlist": {},
|
||||
"tau": 0,
|
||||
"sigma": 0,
|
||||
"reference": {
|
||||
"n_hkl_configured": null,
|
||||
"n_phi_configured": "[0.0, 0.0, 1.0]"
|
||||
},
|
||||
"u": null,
|
||||
"ub": null,
|
||||
"or0": null,
|
||||
"or1": null
|
||||
}
|
||||
38
config/diffcalc/x.json
Normal file
38
config/diffcalc/x.json
Normal file
@@ -0,0 +1,38 @@
|
||||
{
|
||||
"name": "x",
|
||||
"crystal": "['cubic', 'Triclinic', 7.723, 7.707, 7.723, 90.0, 89.265, 90.0]",
|
||||
"reflist": {
|
||||
"1": {
|
||||
"tag": "None",
|
||||
"hkl": "[0.0, 1.0, 2.0]",
|
||||
"pos": "[5.0, 9.379, 19.7895, 102.6162, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-15T10:46:33.012000"
|
||||
},
|
||||
"2": {
|
||||
"tag": "None",
|
||||
"hkl": "[2.0, 0.0, 2.0]",
|
||||
"pos": "[5.0, 19.0754, 20.1865, 11.9693, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-15T10:46:33.094000"
|
||||
},
|
||||
"3": {
|
||||
"tag": "None",
|
||||
"hkl": "[2.0, 2.0, 2.0]",
|
||||
"pos": "[5.0, 27.1234, 21.2368, 60.0354, 0, 0]",
|
||||
"energy": 9.5,
|
||||
"time": "2019-02-15T10:46:33.292000"
|
||||
}
|
||||
},
|
||||
"orientlist": {},
|
||||
"tau": 0,
|
||||
"sigma": 0,
|
||||
"reference": {
|
||||
"n_hkl_configured": null,
|
||||
"n_phi_configured": "[0.0, 0.0, 1.0]"
|
||||
},
|
||||
"u": null,
|
||||
"ub": null,
|
||||
"or0": null,
|
||||
"or1": null
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
#Fri Nov 16 23:08:57 CET 2018
|
||||
ch.psi.jcae.ContextFactory.addressList=127.0.0.1\:54321
|
||||
#Mon Feb 25 08:48:20 CET 2019
|
||||
ch.psi.jcae.ContextFactory.addressList=127.0.0.1\:54321 129.129.144.112
|
||||
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
|
||||
ch.psi.jcae.ChannelFactory.timeout=200
|
||||
ch.psi.jcae.ChannelFactory.retries=1
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
PID.java=enabled
|
||||
MiniPID.java=enabled
|
||||
SpinnerLayoutTest.java=disabled
|
||||
MXSC-1.10.0.jar=disabled
|
||||
ScreenPanel3.java=disabled
|
||||
|
||||
3
config/settings.properties
Normal file
3
config/settings.properties
Normal file
@@ -0,0 +1,3 @@
|
||||
#Tue Feb 26 18:02:18 CET 2019
|
||||
geometry=fourcv
|
||||
test=1
|
||||
@@ -1,21 +1,21 @@
|
||||
#Wed Jan 10 09:07:30 CET 2018
|
||||
configFile={config}/config.properties
|
||||
configFileDevices={config}/devices.properties
|
||||
configFileImageSources={config}/imaging.properties
|
||||
configFilePlugins={config}/plugins.properties
|
||||
configFileTasks={config}/tasks.properties
|
||||
configFileUpdateStrategy={config}/update.properties
|
||||
configPath={home}/config
|
||||
contextPath={outp}/context
|
||||
dataPath={outp}/data
|
||||
devicesPath={home}/devices
|
||||
extensionsPath={home}/extensions
|
||||
imagesPath={outp}/images
|
||||
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
|
||||
#libraryPath={extensions}/JyNI.jar;{extensions};/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/lib-dynload;/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7;/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/site-packages;{script}; {script}/Lib; src/main/assembly/script/tutorial
|
||||
logPath={outp}/log
|
||||
pluginsPath={home}/plugins
|
||||
scriptPath={home}/script
|
||||
scriptType=py
|
||||
sessionsPath={outp}/sessions
|
||||
wwwPath={home}/www
|
||||
#Mon Dec 17 16:37:23 CET 2018
|
||||
configFile={config}/config.properties
|
||||
configFileDevices={config}/devices.properties
|
||||
configFileImageSources={config}/imaging.properties
|
||||
configFilePlugins={config}/plugins.properties
|
||||
configFileSettings={config}/settings.properties
|
||||
configFileTasks={config}/tasks.properties
|
||||
configFileUpdateStrategy={config}/update.properties
|
||||
configPath={home}/config
|
||||
contextPath={outp}/context
|
||||
dataPath={outp}/data
|
||||
devicesPath={home}/devices
|
||||
extensionsPath={home}/extensions
|
||||
imagesPath={outp}/images
|
||||
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
|
||||
logPath={outp}/log
|
||||
pluginsPath={home}/plugins
|
||||
scriptPath={home}/script
|
||||
scriptType=py
|
||||
sessionsPath={outp}/sessions
|
||||
wwwPath={home}/www
|
||||
|
||||
Reference in New Issue
Block a user