This commit is contained in:
2018-11-23 08:42:01 +01:00
parent c6cd6123b0
commit bf5d1b8d7c
32 changed files with 1961 additions and 20 deletions

View File

@@ -1,5 +1,6 @@
#Thu Aug 02 10:45:31 CEST 2018
#Tue Nov 06 14:31:07 CET 2018
autoSaveScanData=true
commandExecutionEvents=false
createSessionFiles=true
dataLayout=default
dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name}
@@ -9,6 +10,7 @@ dataScanPreserveTypes=false
dataScanReleaseRecords=false
dataServerPort=5573
depthDimension=0
generateCommandExecutionEvents=true
hostName=
instanceName=Dev
logDaysToLive=50
@@ -17,7 +19,7 @@ logLevelConsole=Off
logPath={logs}/{date}_{time}
notificationLevel=Off
scanStreamerPort=5563
serverEnabled=true
serverEnabled=false
serverPort=8080
simulation=false
terminalEnabled=false

View File

@@ -1,7 +1,9 @@
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
#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|||
#stream=ch.psi.pshell.bs.Stream|<dispatcher> #false:boolean|||
#scalar=ch.psi.pshell.bs.Scalar|stream Int8Scalar|||
#cam=ch.psi.pshell.bs.StreamCamera|"tcp://gfa-lc6-64:10100" 1|||true
@@ -9,7 +11,8 @@ cam_server=ch.psi.pshell.bs.PipelineServer|sf-daqsync-01:8889|||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
#det=ch.psi.pshell.epics.AreaDetector|13SIM1|||false
$det=ch.psi.pshell.epics.AreaDetector|13SIM1|||true
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|||
@@ -57,6 +60,11 @@ sin=ch.psi.pshell.epics.ChannelDouble|TESTIOC:TESTSINUS:SinCalc 3 true|||true
#average=ch.psi.pshell.device.Averager|sin||2000|
#isin=ch.psi.pshell.epics.ChannelInteger|TESTIOC:TESTSINUS:SinCalc|||true
arr=ch.psi.pshell.epics.ChannelDoubleArray|TESTIOC:TESTWF2:MyWF 6 -1 false|||true
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|||
as1=ch.psi.pshell.imaging.RegisterArraySource|arr1|||
cm1=ch.psi.pshell.epics.ChannelIntegerMatrix|TESTIOC:TESTWF2:MyWF 3 3 false|||
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

View File

@@ -1,7 +1,7 @@
#Fri Aug 24 11:15:23 CEST 2018
#Fri Nov 16 23:08:57 CET 2018
ch.psi.jcae.ContextFactory.addressList=127.0.0.1\:54321
ch.psi.jcae.ContextFactory.maxArrayBytes=10000000
ch.psi.jcae.ChannelFactory.timeout=100
ch.psi.jcae.ChannelFactory.timeout=200
ch.psi.jcae.ChannelFactory.retries=1
ch.psi.jcae.ContextFactory.serverPort=
ch.psi.jcae.impl.DefaultChannelService.retries=1

View File

@@ -1,3 +1,5 @@
PID.java=enabled
SpinnerLayoutTest.java=disabled
MXSC-1.10.0.jar=disabled
ScreenPanel3.java=disabled
Tomaz.java=disabled