Update
This commit is contained in:
@@ -1,19 +1,26 @@
|
||||
#Tue Oct 13 10:42:18 CEST 2020
|
||||
#Tue Mar 30 11:55:18 CEST 2021
|
||||
autoSaveScanData=true
|
||||
simulation=true
|
||||
simulation=false
|
||||
commandExecutionEvents=true
|
||||
logDaysToLive=50
|
||||
dataScanSaveOutput=false
|
||||
handleSessions=true
|
||||
userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\://d.psi.ch | d.psi.ch | users.psi
|
||||
logLevelConsole=Off
|
||||
scanStreamerPort=5563
|
||||
dataScanSaveScript=false
|
||||
dataScanSaveSetpoints=false
|
||||
notifiedTasks=Test1,TestDate, xxx
|
||||
parallelInitialization=false
|
||||
dataTransferPath=~/test/transfer
|
||||
saveConsoleSessionFiles=false
|
||||
dataTransferHost=
|
||||
versionTrackingManual=true
|
||||
dataTransferMode=Off
|
||||
hostName=
|
||||
userManagement=true
|
||||
instanceName=Dev
|
||||
disableEmbeddedAttributes=true
|
||||
dataServerPort=5573
|
||||
hideServerMessages=false
|
||||
serverPort=8080
|
||||
@@ -22,15 +29,18 @@ dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
|
||||
serverEnabled=false
|
||||
dataScanReleaseRecords=false
|
||||
depthDimension=0
|
||||
dataScanPreserveTypes=true
|
||||
dataScanPreserveTypes=false
|
||||
logLevel=Fine
|
||||
dataScanFlushRecords=false
|
||||
logPath={logs}/{date}_{time}
|
||||
dataLayout=default
|
||||
disableDataFileLogs=false
|
||||
sessionHandling=On
|
||||
generateCommandExecutionEvents=true
|
||||
terminalEnabled=false
|
||||
notificationLevel=Off
|
||||
terminalPort=0
|
||||
dataTransferUser=gobbo_a
|
||||
createSessionFiles=false
|
||||
versionTrackingLogin={context}/svcusr-hlapp_robot
|
||||
versionTrackingRemote=git@git.psi.ch\:pshell_config/dev.git
|
||||
|
||||
@@ -37,10 +37,10 @@ deting=ch.psi.pshell.imaging.CameraSource|det||-500|
|
||||
#marco=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3||5000|false
|
||||
#ts=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3 true|||true
|
||||
#tsa=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF 2 -1 true|||
|
||||
m1=ch.psi.pshell.epics.Motor|MTEST-HW3:MOT1|||true
|
||||
ai1=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_01|||true
|
||||
ai2=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_05|||true
|
||||
$mb=ch.psi.pshell.modbus.ModbusTCP|MTEST-CWAG-OFF:502|||
|
||||
#m1=ch.psi.pshell.epics.Motor|MTEST-HW3:MOT1|||true
|
||||
#ai1=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_01|||true
|
||||
#ai2=ch.psi.pshell.epics.ChannelDouble|MTEST-HW3-AI1:AI_05|||true
|
||||
#$mb=ch.psi.pshell.modbus.ModbusTCP|MTEST-CWAG-OFF:502|||
|
||||
#mbs=ch.psi.pshell.modbus.ModbusSerial||||
|
||||
#mb_delay=ch.psi.pshell.modbus.Register|mb 0x1037|||
|
||||
#mbdo=ch.psi.pshell.modbus.DigitalOutput|mb 4||50|
|
||||
@@ -67,7 +67,7 @@ sin=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3 true|||true
|
||||
#isin=ch.psi.pshell.epics.ChannelInteger|TESTIOC:TESTSINUS:SinCalc|||true
|
||||
arr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF 6 -1 false|||true
|
||||
histo=ch.psi.pshell.device.HistogramGenerator|sin|||false
|
||||
histo2=ch.psi.pshell.device.HistogramGenerator|sin 200 NaN NaN 100||3000|false
|
||||
histo2=ch.psi.pshell.device.HistogramGenerator|sin 200 NaN NaN 100|||false
|
||||
arr1=ch.psi.pshell.epics.ChannelIntegerArray|TESTIOC:TESTWF2:MyWF -1 false|||
|
||||
mt=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 2 3 false|||
|
||||
mt1=ch.psi.pshell.epics.GenericMatrix|TESTIOC:TESTWF2:MyWF 3 2 False None [i|||
|
||||
@@ -125,7 +125,10 @@ 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|||
|
||||
fivec=ch.psi.pshell.device.MotorGroupBase|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|||
|
||||
fourcv=ch.psi.pshell.device.MotorGroupBase|mu delta gamma eta|||
|
||||
energy=ch.psi.pshell.device.DummyPositioner||||true
|
||||
gch=ch.psi.pshell.epics.GenericChannel|TESTIOC:TESTSINUS:SinCalc|||
|
||||
garr=ch.psi.pshell.epics.GenericArray|TESTIOC:TESTWF2:MyWF -1 False|||
|
||||
darr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF|||
|
||||
|
||||
@@ -1,12 +1,12 @@
|
||||
#Mon Oct 12 15:07:30 CEST 2020
|
||||
#Mon Mar 08 09:04:03 CET 2021
|
||||
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
|
||||
ch.psi.jcae.impl.DefaultChannelService.timeout=500
|
||||
ch.psi.jcae.ChannelFactory.timeout=200
|
||||
ch.psi.jcae.ContextFactory.maxSendArrayBytes=
|
||||
ch.psi.jcae.ChannelFactory.timeout=500
|
||||
ch.psi.jcae.ContextFactory.maxSendArrayBytes=1000000
|
||||
ch.psi.jcae.ChannelFactory.retries=1
|
||||
ch.psi.jcae.ContextFactory.useShellVariables=false
|
||||
ch.psi.jcae.ContextFactory.addLocalBroadcastInterfaces=false
|
||||
ch.psi.jcae.ContextFactory.addressList=127.0.0.1\:54321
|
||||
ch.psi.jcae.ContextFactory.addressList=127.0.0.1 127.0.0.1\:54321
|
||||
ch.psi.jcae.ContextFactory.serverPort=
|
||||
ch.psi.jcae.impl.DefaultChannelService.retries=1
|
||||
ch.psi.jcae.ContextFactory.autoAddressList=true
|
||||
|
||||
@@ -1,10 +1,9 @@
|
||||
#Wed Oct 18 15:31:18 CEST 2017
|
||||
auth=None
|
||||
from=pshell.dev@psi.ch
|
||||
host=smtpint.psi.ch
|
||||
port=0
|
||||
pwd=
|
||||
smsSuffix=@sms.switch.ch
|
||||
to=alexandre.gobbo@psi.ch;0774526821
|
||||
usr=
|
||||
|
||||
#Wed Jan 13 17:08:33 CET 2021
|
||||
auth=None
|
||||
port=0
|
||||
usr=
|
||||
smsSuffix=@sms.switch.ch
|
||||
host=smtpint.psi.ch
|
||||
from=pshell.dev@psi.ch
|
||||
to=alexandre.gobbo@psi.ch;0774526821@sms.switch.ch
|
||||
pwd=
|
||||
|
||||
11
config/scicat.properties
Normal file
11
config/scicat.properties
Normal file
@@ -0,0 +1,11 @@
|
||||
#Wed Feb 03 15:17:53 CET 2021
|
||||
environment=test
|
||||
testParameters=-testenv -user slssim\:4DMGBarXmr
|
||||
sourceFolder=/Users/gobbo_a/dev/pshell/config/home/data
|
||||
prodParameters=\ -user slssim\:4DMGBarXmr
|
||||
devParameters=-devenv -user slssim slssim
|
||||
ownerGroup=p00001
|
||||
type=raw
|
||||
parameters=-ingest -allowexistingsource -noninteractive
|
||||
creationLocation=/PSI/SLS/SIM
|
||||
principalInvestigator=
|
||||
12
config/session_metadata.properties
Normal file
12
config/session_metadata.properties
Normal file
@@ -0,0 +1,12 @@
|
||||
#Thu Mar 04 12:05:11 CET 2021
|
||||
Proposer=String;Alex
|
||||
Proposal=String;Test
|
||||
P-group=String;P001
|
||||
Sample=String;MySample
|
||||
Authors=List;[]
|
||||
Real=Double;3.14
|
||||
Int=Integer;3
|
||||
Bool=Boolean;true
|
||||
scientificMetadata=Map;{}
|
||||
beamlineState=Map;{}
|
||||
x=String
|
||||
3
config/sessions.properties
Normal file
3
config/sessions.properties
Normal file
@@ -0,0 +1,3 @@
|
||||
#Mon Mar 08 08:50:39 CET 2021
|
||||
SessionCounter=161
|
||||
CurrentSession=161
|
||||
@@ -1,5 +1,6 @@
|
||||
#Tue Oct 13 10:42:09 CEST 2020
|
||||
#Wed Apr 28 09:28:40 CEST 2021
|
||||
test=1
|
||||
geometry=fourcv
|
||||
ScanIndex=5
|
||||
RSYNC_PATH=~/test/transfer
|
||||
FdaBrowser=true
|
||||
|
||||
@@ -1,22 +1,25 @@
|
||||
#Fri Sep 06 09:47:35 CEST 2019
|
||||
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
|
||||
configFileVariables={config}/variables.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
|
||||
#Thu Feb 11 17:17:34 CET 2021
|
||||
scriptPath={home}/script
|
||||
scriptType=py
|
||||
sessionsPath={outp}/sessions
|
||||
configFileDevices={config}/devices.properties
|
||||
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
|
||||
configFile={config}/config.properties
|
||||
configFileTasks={config}/tasks.properties
|
||||
configFileImageSources={config}/imaging.properties
|
||||
pluginsPath={home}/plugins
|
||||
consoleSessionsPath={sessions}/console
|
||||
libraryPath={script}; {script}/Lib; src/main/assembly/script/tutorial
|
||||
configFilePlugins={config}/plugins.properties
|
||||
contextPath={outp}/context
|
||||
devicesPath={home}/devices
|
||||
configFileSettings={config}/settings.properties
|
||||
imagesPath={outp}/images
|
||||
scriptType=py
|
||||
|
||||
@@ -1,2 +1,6 @@
|
||||
#Mon Oct 12 14:39:17 CEST 2020
|
||||
FileSequentialNumber=1183
|
||||
#Mon Apr 12 12:26:10 CEST 2021
|
||||
LastRunDate=210412
|
||||
SessionCounter=127
|
||||
CurrentSession=122
|
||||
FileSequentialNumber=1859
|
||||
DaySequentialNumber=1
|
||||
|
||||
Reference in New Issue
Block a user