From b58cb61ffcf7b775bef4ead12917718dba7d76a2 Mon Sep 17 00:00:00 2001 From: x07maop Date: Wed, 27 May 2015 15:35:43 +0200 Subject: [PATCH] Closedown --- config/jcae.properties | 14 ++++++++++++++ script/EnergyScan.py | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 config/jcae.properties diff --git a/config/jcae.properties b/config/jcae.properties new file mode 100644 index 0000000..84cfba5 --- /dev/null +++ b/config/jcae.properties @@ -0,0 +1,14 @@ +ch.psi.jcae.ContextFactory.maxArrayBytes=10000000 + +ch.psi.jcae.ChannelFactory.timeout=2000 +ch.psi.jcae.ChannelFactory.retries=2 +ch.psi.jcae.ChannelBeanFactory.timeout=10000 +ch.psi.jcae.ChannelBeanFactory.waitTimeout=1800000 +ch.psi.jcae.ChannelBeanFactory.waitRetryPeriod=30000 +ch.psi.jcae.ChannelBeanFactory.retries=4 + + +ch.psi.jcae.impl.DefaultChannelService.timeout=3000 +ch.psi.jcae.impl.DefaultChannelService.waitTimeout=60000 +ch.psi.jcae.impl.DefaultChannelService.waitRetryPeriod=5000 +ch.psi.jcae.impl.DefaultChannelService.retries=4 \ No newline at end of file diff --git a/script/EnergyScan.py b/script/EnergyScan.py index bd020fe..b020845 100644 --- a/script/EnergyScan.py +++ b/script/EnergyScan.py @@ -16,7 +16,7 @@ TIME = 3 #min DELAY = 10.0 #s MODE = 'CIRC +' FOLDER = '2015_04/20150417' -FILE = 'MgE_plus' +FILE = 'Fe_plus'