From 260502f6541df4d36f1fb6c50a4e4f4c123546e0 Mon Sep 17 00:00:00 2001 From: sfop Date: Tue, 23 Aug 2016 11:48:07 +0200 Subject: [PATCH] Closedown --- config/devices.properties | 4 ++-- config/jcae.properties | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/devices.properties b/config/devices.properties index 39b9577..2e7c7ba 100755 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,5 +1,5 @@ $gun_solenoid=ch.psi.pshell.epics.Positioner|SINEG01-MSOL130:I-SET SINEG01-MSOL130:I-READ|||true -gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true +$gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSYS:GET-BEAM-PHASE|||true #SINSB01_phase=ch.psi.pshell.epics.Positioner|VA-SINSB01-RSYS100:SET-BEAM-PHASE VA-SINSB01-RSYS100:GET-BEAM-PHASE|||true #BC1_energy=ch.psi.pshell.epics.ChannelDouble|VA-SINBC02-DBPM140:ENERGY|Read||true #SARUN02_MCRX080=ch.psi.pshell.epics.Positioner|VA-SARUN02-MCRX080:I-SET VA-SARUN02-MCRX080:I-READ|||true @@ -14,4 +14,4 @@ gun_phase=ch.psi.pshell.epics.Positioner|SINEG01-RSYS:SET-BEAM-PHASE SINEG01-RSY #rf_phase_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-PHASE|Read||true #rf_ampl_rb=ch.psi.pshell.epics.ChannelDouble|MINSB03-RSYS:GET-VSUM-AMPLT|Read||true image=ch.psi.pshell.imaging.FileSource|/afs/psi.ch/intranet/SF/Applications/config/pshell_op/context/beam.jpg||| -cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR190:FPICTURE Int16 1000000||| +cam=ch.psi.pshell.epics.ArraySource|SINEG01-DSCR190:FPICTURE Int16 306081||| diff --git a/config/jcae.properties b/config/jcae.properties index c9a440f..72d1666 100755 --- a/config/jcae.properties +++ b/config/jcae.properties @@ -1,8 +1,8 @@ -#Tue Aug 23 11:43:58 CEST 2016 +#Tue Aug 23 11:47:46 CEST 2016 ch.psi.jcae.ContextFactory.addressList=129.129.130.255 129.129.131.255 129.129.137.255 ch.psi.jcae.ContextFactory.maxArrayBytes=10000000 -ch.psi.jcae.ChannelFactory.retries=2 -ch.psi.jcae.ChannelFactory.timeout=10000 +ch.psi.jcae.ChannelFactory.retries=1 +ch.psi.jcae.ChannelFactory.timeout=30000 ch.psi.jcae.impl.DefaultChannelService.retries=4 ch.psi.jcae.impl.DefaultChannelService.timeout=1000 ch.psi.jcae.ContextFactory.serverPort=