Refactor combpm

FofbTool/Operation.py

@@ -244,63 +244,69 @@ def ack_ccn(node_tangopath, ccnif=[]):
 #    OPERATIONS ON COMBPM
 ###################################################################################################
 
-def stop_combpm(cellnodename):
+def stop_combpm(node_tangopath):
     """
     Stop the communication with bpm on the specified cellnode.
 
     PARAMETERS
     ----------
-    cellnodename: str
-        The target fofbnode, ie 'cellnode-c09'
+    node_tangopath: str
+        The target fofbnode tango path, ie 'ans/dg/fofb-cellnode-c09'
 
     """
-    prx=FofbTool.Utils.get_prx_from_nodename(cellnodename)
-    if prx is None:
-        logger.error("Failed to stop ComBPM on {}".format(p))
-        return
+    try:
+        prx=tango.DeviceProxy(node_tangopath)
+        prx.ping()
+    except tango.DevFailed:
+        logger.error("Failed to obtain tango proxy or to ping to {}".format(node_tangopath))
+        return None
 
-    logger.info("Stopping ComBPM on {}".format(cellnodename))
+    logger.info("Stopping ComBPM on {}".format(node_tangopath))
     prx["combpm_reset"] = 1
     prx["combpm_gt_control"] = 0x5
 
-def start_combpm(cellnodename):
+def start_combpm(node_tangopath):
     """
     Start the communication with bpm on the specified cellnode.
 
     PARAMETERS
     ----------
-    cellnodename: str
-        The target fofbnode, ie 'cellnode-c09'
+    node_tangopath: str
+        The target fofbnode tango path, ie 'ans/dg/fofb-cellnode-c09'
 
     """
-    prx=FofbTool.Utils.get_prx_from_nodename(cellnodename)
-    if prx is None:
-        logger.error("Failed to start ComBPM on {}".format(cellnodename))
-        return
+    try:
+        prx=tango.DeviceProxy(node_tangopath)
+        prx.ping()
+    except tango.DevFailed:
+        logger.error("Failed to obtain tango proxy or to ping to {}".format(node_tangopath))
+        return None
 
-    logger.info("Starting ComBpm on {}".format(cellnodename))
+    logger.info("Starting ComBpm on {}".format(node_tangopath))
     prx["combpm_reset"] = 0
     prx["combpm_gt_control"] = 0x1
     time.sleep(1)
-    ack_combpm(cellnodename)
+    ack_combpm(node_tangopath)
 
 
-def ack_combpm(cellnodename):
+def ack_combpm(node_tangopath):
     """
     Ack errors on the communication with bpm on the specified cellnode.
 
     PARAMETERS
     ----------
-    cellnodename: str
-        The target fofbnode, ie 'cellnode-c09'
+    node_tangopath: str
+        The target fofbnode tango path, ie 'ans/dg/fofb-cellnode-c09'
 
     """
-    prx=FofbTool.Utils.get_prx_from_nodename(cellnodename)
-    if prx is None:
-        logger.error("Failed to start ComBPM on {}".format(cellnodename))
-        return
+    try:
+        prx=tango.DeviceProxy(node_tangopath)
+        prx.ping()
+    except tango.DevFailed:
+        logger.error("Failed to obtain tango proxy or to ping to {}".format(node_tangopath))
+        return None
 
-    logger.info("Ack ComBpm on {}".format(cellnodename))
+    logger.info("Ack ComBpm on {}".format(node_tangopath))
     prx["combpm_reset_error"] = True
     time.sleep(1)
     prx["combpm_reset_error"] = False

FofbTool/Utils.py

@@ -22,7 +22,7 @@ def init_opcua(force=False):
     """
 
     if not check_fofbnotrunning(force):
-        logger.warning("Not running configuration of combpm because FOFB seems to be running.")
+        logger.warning("Not running because FOFB seems to be running.")
         return
 
     for n,p in FofbTool.Configuration.config["tangopath.fofbnodes"].items():
@@ -40,7 +40,7 @@ def init_watcher(force=False):
     """
 
     if not check_fofbnotrunning(force):
-        logger.warning("Not running configuration of combpm because FOFB seems to be running.")
+        logger.warning("Not running because FOFB seems to be running.")
         return
 
     p=FofbTool.Configuration.config["tangopath"]["fofb-watcher"]
@@ -241,7 +241,7 @@ def stop_all_combpm(force=False):
 
     for n,p in FofbTool.Configuration.config["tangopath.fofbnodes"].items():
         if 'cellnode' in n:
-            FofbTool.Operation.stop_combpm(n)
+            FofbTool.Operation.stop_combpm(p)
 
 
 def stop_all_comlbp(force=False):
@@ -252,7 +252,7 @@ def stop_all_comlbp(force=False):
     """
 
     if not check_fofbnotrunning(force):
-        logger.warning("Not running stop combpm because FOFB seems to be running.")
+        logger.warning("Not running stop comlbp because FOFB seems to be running.")
         return
 
     for n,p in FofbTool.Configuration.config["tangopath.fofbnodes"].items():
@@ -272,7 +272,7 @@ def stop_all_ccn(force=False):
     """
 
     if not check_fofbnotrunning(force):
-        logger.warning("Not running stop combpm because FOFB seems to be running.")
+        logger.warning("Not running stop comccn because FOFB seems to be running.")
         return
 
     for n,p in FofbTool.Configuration.config["tangopath.fofbnodes"].items():
@@ -289,7 +289,7 @@ def start_all_combpm():
 
     for n,p in FofbTool.Configuration.config["tangopath.fofbnodes"].items():
         if 'cellnode' in n:
-            FofbTool.Operation.start_combpm(n)
+            FofbTool.Operation.start_combpm(p)
 
 def start_all_comlbp():
     """