From cfa0baf037d3c7ca09c6c32946b5291a15ee3b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20BRON=C3=88S?= <romain.brones@synchrotron-soleil.fr> Date: Thu, 29 Feb 2024 13:57:10 +0100 Subject: [PATCH] fix: remove proxy getter for cellnode * Do not separate those cases --- FofbTool/Operation.py | 6 +++--- FofbTool/Utils.py | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/FofbTool/Operation.py b/FofbTool/Operation.py index a4ce10c..3893fa6 100644 --- a/FofbTool/Operation.py +++ b/FofbTool/Operation.py @@ -143,7 +143,7 @@ def stop_combpm(cellnodename): The target fofbnode, ie 'cellnode-c09' """ - prx=FofbTool.Utils.get_prx_from_cellnodename(cellnodename) + prx=FofbTool.Utils.get_prx_from_nodename(cellnodename) if prx is None: logger.error("Failed to stop ComBPM on {}".format(p)) return @@ -162,7 +162,7 @@ def start_combpm(cellnodename): The target fofbnode, ie 'cellnode-c09' """ - prx=FofbTool.Utils.get_prx_from_cellnodename(cellnodename) + prx=FofbTool.Utils.get_prx_from_nodename(cellnodename) if prx is None: logger.error("Failed to start ComBPM on {}".format(cellnodename)) return @@ -184,7 +184,7 @@ def ack_combpm(cellnodename): The target fofbnode, ie 'cellnode-c09' """ - prx=FofbTool.Utils.get_prx_from_cellnodename(cellnodename) + prx=FofbTool.Utils.get_prx_from_nodename(cellnodename) if prx is None: logger.error("Failed to start ComBPM on {}".format(cellnodename)) return diff --git a/FofbTool/Utils.py b/FofbTool/Utils.py index 303a3df..513253d 100644 --- a/FofbTool/Utils.py +++ b/FofbTool/Utils.py @@ -224,9 +224,6 @@ def get_prx_from_nodename(nodename): return prx -# No more difference -get_prx_from_cellnodename = get_prx_from_nodename - def stop_all_combpm(): """ Apply stop command on all Cellnodes. -- GitLab