From 8e65b26484ff0f0b269190bf55bfaba691c453e6 Mon Sep 17 00:00:00 2001 From: Gobbo Alexandre Date: Tue, 8 Feb 2022 16:50:01 +0100 Subject: [PATCH] Update camera name --- bufferutils.py | 4 +++- sources/camserver.sources | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bufferutils.py b/bufferutils.py index 2cf1903..261fdef 100644 --- a/bufferutils.py +++ b/bufferutils.py @@ -69,12 +69,14 @@ def _remove_comments(text): def _load_file(file_path): + try: with open(file_path) as file_h: text = file_h.read() text = _remove_comments(text) config = json.loads(text) return config - + except: + print (file_path) def remove_labels(sources): """ diff --git a/sources/camserver.sources b/sources/camserver.sources index 6bc9c96..86f8c3c 100644 --- a/sources/camserver.sources +++ b/sources/camserver.sources @@ -2,7 +2,7 @@ Get the bsread stream address from an image name (e.g. for SARES20-PROF142-M3:FPICTURE) caget SARES20-PROF142-M3:BSREADCONFIG - the current camserver/pipline configuration can be found here: https://git.psi.ch/controls_highlevel_applications/cam_server_configuration/blob/master/configuration/pipeline_config/servers.json + the current camserver/pipline configuration can be found here: https://git.psi.ch/ */ { @@ -20,7 +20,7 @@ ,{"stream": "tcp://sf-daqsync-04.psi.ch:9011", "labels": ["SATES24-CAMS161-M1"]} /* SATES21-PATT-M1 */ - ,{"stream": "tcp://sf-daqsync-04.psi.ch:9003", "labels": ["SATES21-PATT-M1"]} + ,{"stream": "tcp://sf-daqsync-04.psi.ch:9003", "labels": ["SATES21-CAMS-PATT1"]} /* PSEN SARES11-SPEC125-M1 */ ,{"stream": "tcp://sf-daqsync-05:9001", "labels": ["SARES11-SPEC125-M1"]}