diff --git a/FofbTool/cli.py b/FofbTool/CommandLineInterface.py
similarity index 70%
rename from FofbTool/cli.py
rename to FofbTool/CommandLineInterface.py
index fbe95a69d3d30a2e9ab5c2349091bcd90893d4ac..a15663d3bb200c7a154fc43f51310cbe7e0ac42d 100755
--- a/FofbTool/cli.py
+++ b/FofbTool/CommandLineInterface.py
@@ -10,6 +10,13 @@
if __name__ == '__main__':
import logging
import argparse
+ import os
+ import sys
+
+ # Safer import: add the parent dir in path
+ sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+ import FofbTool.Utils
+
# Get the module logger
logger = logging.getLogger("FofbTool")
@@ -23,10 +30,12 @@ if __name__ == '__main__':
parser = argparse.ArgumentParser("FofbTool")
parser.add_argument("--log", default="info",
help="Log level (error, warning, info, debug)")
- parser.add_argument("--init", action="store_true",
- help="Run init on devices.")
- parser.add_argument("--confDS", action="store_true",
- help="Configure the Device servers, by applying attribute configuration.")
+ parser.add_argument("--init-opcua", action="store_true",
+ help="Run init on opcua devices.")
+ parser.add_argument("--init-watcher", action="store_true",
+ help="Run init on the Fofb-Watcher device, and then the Fofb-Command.")
+ parser.add_argument("--conf-DS", action="store_true",
+ help="Applying attribute configuration on Tango Device Servers. This is required after restart of devices.")
parser.add_argument("--stop", action="store_true",
)
parser.add_argument("--conf", action="store_true",
@@ -47,40 +56,17 @@ if __name__ == '__main__':
# Set log level from args
logger.setLevel(getattr(logging, args.log.upper()))
- ####
logger.debug(args)
+ if args.init_opcua:
+ FofbTool.Utils.init_opcua()
+
+ if args.init_watcher:
+ FofbTool.Utils.init_watcher()
- #### Node selection
- nodes = []
- if 'allnodes' in args.node:
- nodes = cellnode_subscribers + [centralnode_subscriber,]
- if 'allcells' in args.node:
- nodes = nodes + cellnode_subscribers
- if 'central' in args.node:
- nodes.append(centralnode_subscriber)
- if 'c01' in args.node:
- nodes.append(cellnode_subscribers[0])
- if 'c06' in args.node:
- nodes.append(cellnode_subscribers[1])
- if 'c09' in args.node:
- nodes.append(cellnode_subscribers[2])
- if 'c14' in args.node:
- nodes.append(cellnode_subscribers[3])
-
- nodes = list(set(nodes))
- logger.debug("Perform actions on {}".format(nodes))
- ####
-
- if args.init:
- for cnp in nodes:
- logger.info("Apply command init on {}".format(cnp.name()))
- cnp.init()
-
- if args.confDS:
- for cnp in nodes:
- set_attr_config(cnp)
+ if args.conf_DS:
+ FofbTool.Utils.confds_opcua()
if args.stop:
for cnp in cellnode_subscribers:
diff --git a/FofbTool/Configuration.py b/FofbTool/Configuration.py
new file mode 100755
index 0000000000000000000000000000000000000000..359d5f508ac02e03290f1c46281c6af423f842f4
--- /dev/null
+++ b/FofbTool/Configuration.py
@@ -0,0 +1,230 @@
+#!/usr/bin/env python
+
+import tango
+import logging
+import argparse
+import numpy as np
+import time
+
+
+# Get the module logger
+logger = logging.getLogger("FofbTool")
+
+###################################################################################################
+# TANGO DEVICE PROXIES
+###################################################################################################
+
+cellnode_subscribers = [ tango.DeviceProxy("ans/dg/fofb-cellnode-{}".format(cell)) for cell in ("C01", "C06", "C09", "C14") ]
+
+centralnode_subscriber = tango.DeviceProxy("ans/dg/fofb-centralnode")
+
+bpmmanager = tango.DeviceProxy("ans/dg/bpm-manager")
+
+fofbcommand = tango.DeviceProxy("ans/dg/fofb-command")
+
+
+###################################################################################################
+# OPERATION FUNCTIONS
+###################################################################################################
+
+def cellnode_stop_ccn(cnp):
+ logger.info("Stopping CCN on {}".format(cnp.name()))
+ cnp["ccnpack0_control"] = False
+ cnp["ccnunpack0_control"] = False
+
+def cellnode_start_ccn(cnp):
+ logger.info("Starting CCN on {}".format(cnp.name()))
+ cnp["ccneth0_reset"] = 0x60000001 # impossible to write 0xE0000001
+ cnp["ccneth0_gt_reset"] = 1
+ cnp["ccneth0_gt_reset"] = 0
+ cnp["ccneth0_reset"] = 0
+ cnp["ccnpack0_control"] = True
+ cnp["ccnunpack0_control"] = True
+
+def cellnode_ack_ccn(snp):
+ logger.info("Ack CCN error on {}".format(cnp.name()))
+ cnp["ccnpack0_reset_error"] = True
+ cnp["ccnunpack0_reset_error"] = True
+ cnp["ccnpack0_reset_error"] = False
+ cnp["ccnunpack0_reset_error"] = False
+
+def centralnode_stop_ccn(cnp):
+ logger.info("Stopping CCN on {}".format(cnp.name()))
+ for n in range(4):
+ cnp["ccnpack{}_control".format(n)] = False
+ cnp["ccnunpack{}_control".format(n)] = False
+
+def centralnode_start_ccn(cnp):
+ logger.info("Starting CCN on {}".format(cnp.name()))
+ for n in range(4):
+ cnp["ccneth{}_reset".format(n)] = 0x60000001 # impossible to write 0xE0000001
+ cnp["ccneth{}_gt_reset".format(n)] = 1
+ cnp["ccneth{}_gt_reset".format(n)] = 0
+ cnp["ccneth{}_reset".format(n)] = 0
+ cnp["ccnpack{}_control".format(n)] = True
+ cnp["ccnunpack{}_control".format(n)] = True
+ cnp["ccnpack{}_reset_error".format(n)] = True
+ cnp["ccnunpack{}_reset_error".format(n)] = True
+ cnp["ccnpack{}_reset_error".format(n)] = False
+ cnp["ccnunpack{}_reset_error".format(n)] = False
+
+def cellnode_configure_ccn(cnp, nbpm=None, npsc=100):
+ """
+ Configure the ComCellNode block.
+
+ PARAMETERS
+ ----------
+ nbpm:
+ Number of BPM allowed by the filter, hence the number of expected BPM packets.
+ If None, auto detect the number from the combpm_filter_table attribute.
+ npsc:
+ Number of total PSC, hence the number of expected PSC packets.
+
+ """
+
+ if nbpm is None:
+ # Get number of BPM activated in the filter
+ nbpm = int((cnp["combpm_filter_table"].value == 0x80).sum())
+ logger.debug("{} bpm allowed in the filter on {}".format(nbpm, cnp.name()))
+
+ maclen = 10*nbpm+10
+ logger.debug("Configure packeter framesize (mac length) to {}".format(maclen))
+ cnp["ccnpack0_framesize"] = maclen
+
+ logger.debug("Configure packeter npackets to {}".format(nbpm-1))
+ cnp["ccnpack0_npackets"] = nbpm-1
+
+ maclen = npsc*6+10
+ logger.debug("Configure unpacketer framesize (mac length) to {}".format(maclen))
+ cnp["ccnunpack0_framesize"] = maclen
+
+ logger.info("Configuration of CCN done on {}.".format(cnp.name()))
+
+def centralnode_configure_ccn(cnp, nbpm=[30,30,30,32], npsc=100):
+ """
+ Configure the ComCellNode block.
+
+ PARAMETERS
+ ----------
+ nbpm: list(int)
+ Number of BPM packet received on each interface.
+ npsc:
+ Number of total PSC, hence the number of expected PSC packets.
+
+ """
+
+ for n in range(4):
+
+ maclen = npsc*6+10
+ logger.debug("Configure packeter {} framesize (mac length) to {}".format(n, maclen))
+ cnp["ccnpack{}_framesize".format(n)] = maclen
+
+ logger.debug("Configure packeter {} npackets to {}".format(n, npsc-1))
+ cnp["ccnpack{}_npackets".format(n)] = npsc-1
+
+ maclen = 10*nbpm[n]+10
+ logger.debug("Configure unpacketer {} framesize (mac length) to {}".format(n, maclen))
+ cnp["ccnunpack{}_framesize".format(n)] = maclen
+
+ logger.info("Configuration of CCN done on {}.".format(cnp.name()))
+
+
+def cellnode_stop_combpm(cnp):
+ logger.info("Stopping ComBpm on {}".format(cnp.name()))
+ cnp["combpm_reset"] = 1
+ cnp["combpm_gt_control"] = 0x5
+
+def cellnode_start_combpm(cnp):
+ logger.info("Starting ComBpm on {}".format(cnp.name()))
+ cnp["combpm_reset"] = 0
+ cnp["combpm_gt_control"] = 0x1
+ cnp["combpm_reset_error"] = True
+ cnp["combpm_reset_error"] = False
+
+def cellnode_configure_combpm(cnp):
+
+ # Filter list depends on the cellnode
+ filterlist = {
+ "C01":np.array(list(range(1,23))+list(range(115,123))),
+ "C06":np.array(range(23,53)),
+ "C09":np.array(range(53,83)),
+ "C14":np.array(range(83,115)),
+ }
+
+ for k in filterlist.keys():
+ if k in cnp.name():
+ logger.debug("Activate BPMs {} in the filter for {}".format(filterlist[k], cnp.name()))
+ f = cnp["combpm_filter_table"].value
+ f[:] = 0
+ f[np.array(filterlist[k])] = 0x80
+ cnp["combpm_filter_table"] = f
+
+ logger.info("Configuration of ComBpm done on {}.".format(cnp.name()))
+
+def cellnode_configure_comcorr(cnp, enable=True):
+
+ pscidlist = {
+ 'C01':[50,100,49,99,255,255,255,255,2,52,1,51,255,255,255,255,56,6,3,53,4,54,5,55,10,60,7,57,8,58,9,59],
+ 'C06':[12,62,11,61,255,255,255,255,14,64,13,63,255,255,255,255,68,18,15,65,16,66,17,67,22,72,19,69,20,70,21,71],
+ 'C09':[24,74,23,73,255,255,255,255,26,76,25,75,255,255,255,255,80,30,27,77,28,78,29,79,34,84,31,81,32,82,33,83],
+ 'C14':[36,86,35,85,37,87,38,88,40,90,39,89,255,255,255,255,94,44,41,91,42,92,43,93,48,98,45,95,46,96,47,97]
+ }
+
+ for k in pscidlist.keys():
+ if k in cnp.name():
+ logger.debug("Set PSCIDs {} in the filter for {}".format(pscidlist[k], cnp.name()))
+ f= cnp["comcorr_line_id"].value
+ f[:] = pscidlist[k]
+ f[:] = f+ 0x10000*bool(enable)
+ logger.debug("Set comcorr_line_id {} for {}".format(f, cnp.name()))
+ cnp["comcorr_line_id"] = f
+
+ logger.info("Configuration of ComCorr done on {}.".format(cnp.name()))
+
+def centralnode_configure_corr(cnp):
+
+ # Legacy
+ cnp["corr_k1a_x"]=256
+ cnp["corr_k1b_x"]=0
+ cnp["corr_k1ic_x"]=64
+ cnp["corr_k1d_x"]=16300
+
+ cnp["corr_k1a_y"]=256
+ cnp["corr_k1b_y"]=0
+ cnp["corr_k1ic_y"]=64
+ cnp["corr_k1d_y"]=16300
+
+ # Unitary
+ cnp["corr_k2a_x"]=128
+ cnp["corr_k2b_x"]=0
+ cnp["corr_k2ic_x"]=8192
+ cnp["corr_k2d_x"]=0
+
+ cnp["corr_k2a_y"]=128
+ cnp["corr_k2b_y"]=0
+ cnp["corr_k2ic_y"]=8192
+ cnp["corr_k2d_y"]=0
+
+ f= cnp["corr_pscid"].value
+ f[0:100] = range(1,101)
+ cnp["corr_pscid"] = f
+
+ logger.info("Configuration of Corr done on {}.".format(cnp.name()))
+
+def fofbcommand_writeref(what='current'):
+ if what=="current":
+ fofbcommand["x_ref_orbit"] = (bpmmanager.xmeanorbit*1e6).astype(int)
+ fofbcommand["y_ref_orbit"] = (bpmmanager.zmeanorbit*1e6).astype(int)
+
+ if what=="oldref":
+ fofbcommand["x_ref_orbit"] = (bpmmanager.xreforbit*1e6).astype(int)
+ fofbcommand["y_ref_orbit"] = (bpmmanager.zreforbit*1e6).astype(int)
+
+ if what=="zeros":
+ fofbcommand["x_ref_orbit"] = np.zeros(122, dtype=int)
+ fofbcommand["y_ref_orbit"] = np.zeros(122, dtype=int)
+
+def fofbcommand_writemat(filename='respmat.npy'):
+
+ fofbcommand["x_inv_resp_mat"] = np.hstack([np.zeros((50, 1)), np.load(filename)[50:], np.zeros((50,5))]).astype(int)
+ fofbcommand["y_inv_resp_mat"] = np.hstack([np.zeros((50, 1)), np.load(filename)[:50], np.zeros((50,5))]).astype(int)
diff --git a/FofbTool/dsconfig.py b/FofbTool/DeviceAttributeConfiguration.py
similarity index 96%
rename from FofbTool/dsconfig.py
rename to FofbTool/DeviceAttributeConfiguration.py
index 2c1c34920b6d501da3ca88b3d663d65cf503e2fd..1824cf3e09967ef2a80a41b3100cdb73a9f8fd6c 100755
--- a/FofbTool/dsconfig.py
+++ b/FofbTool/DeviceAttributeConfiguration.py
@@ -13,24 +13,6 @@ import logging
# Get the module logger
logger = logging.getLogger("FofbTool")
-def set_attr_config(cnp):
- """
- Convenient function that choose the proper configuration function.
- Based on the tango path, select either cellnode or centralnode then call
- set_attr_config_centralnode if 'central' is in the path or set_attr_config_cellnode.
-
- PARAMETERS
- ----------
- cnp: tango.DeviceProxy
- Device Proxy to the target device
- """
-
- if "central" in cnp.name().lower():
- set_attr_config_centralnode(cnp)
- else:
- set_attr_config_cellnode(cnp)
-
-
def set_attr_config_cellnode(cnp):
"""
Apply CellNode attribute configuration on the Tango Device cnp.
diff --git a/FofbTool/Utils.py b/FofbTool/Utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..15da6a962135af22cb1c0015cdfd90c5881c3ccd
--- /dev/null
+++ b/FofbTool/Utils.py
@@ -0,0 +1,83 @@
+###################################################################################################
+# Utilities
+###################################################################################################
+#
+# This file contains usefull function and attributes to simplify life
+#
+###################################################################################################
+
+import tango
+import logging
+import DeviceAttributeConfiguration
+
+# Get the module logger
+logger = logging.getLogger("FofbTool")
+
+tangopath_nodes = {
+ "centralnode":"ans/dg/fofb-centralnode",
+ "cellnode-c01":"ans/dg/fofb-cellnode-c01",
+ "cellnode-c06":"ans/dg/fofb-cellnode-c06",
+ "cellnode-c09":"ans/dg/fofb-cellnode-c09",
+ "cellnode-c14":"ans/dg/fofb-cellnode-c14",
+ }
+
+tangopath = {
+ "fofb-watcher":"ans/dg/fofb-watcher",
+ "fofb-command":"ans/dg/fofb-command",
+ "fofb-manager":"ans/dg/fofb-manager",
+ "bpm-manager":"ans/dg/bpm-manager",
+ }.update(tangopath_nodes)
+
+def init_opcua():
+ """
+ Run init on all OPCUA devices. Catch DevFailed and inform via log.
+ """
+
+ for i,(n,p) in enumerate(tangopath_nodes.items()):
+ logger.info("Perform init() on {} '{}'".format(n,p))
+ try:
+ tango.DeviceProxy(p).init()
+ except tango.DevFailed as e:
+ logger.error("Could not perform init() '{}', got DevFailed.".format(p))
+ logger.debug(str(e))
+
+def init_watcher():
+ """
+ Run init on Fofb-Watcher, waiting for its completion then init on the FofbCommand.
+ """
+
+ wprx=tango.DeviceProxy(tangopath["fofb-watcher"])
+ wprx.set_timeout_millis(30000)
+
+ logger.info("Perform init() on Fofb-Watcher. This takes nearly a minute.")
+ try:
+ wprx.init()
+ except tango.DevFailed as e:
+ logger.error("Could not perform init() on Fofb-Watcher.")
+
+ logger.info("Perform init() on Fofb-Command.")
+ tango.DeviceProxy(tangopath["fofb-command"]).init()
+
+def confds_opcua():
+ """
+ Apply attribute configuration on all OPCUA devices. Catch DevFailed and inform via log.
+ """
+ for i,(n,p) in enumerate(tangopath_nodes.items()):
+ try:
+ prx = tango.DeviceProxy(p)
+ except tango.DevFailed as e:
+ logger.error("Could not get proxy '{}', got DevFailed.".format(p))
+ logger.debug(str(e))
+ break
+
+ try:
+ if 'central' in n:
+ DeviceAttributeConfiguration.set_attr_config_centralnode(prx)
+ else:
+ DeviceAttributeConfiguration.set_attr_config_cellnode(prx)
+ except tango.DevFailed as e:
+ logger.error("Could not set attribute configuration for '{}', got DevFailed.".format(p))
+ logger.debug(str(e))
+
+
+
diff --git a/FofbTool/__init__.py b/FofbTool/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8b137891791fe96927ad78e64b0aad7bded08bdc 100644
--- a/FofbTool/__init__.py
+++ b/FofbTool/__init__.py
@@ -0,0 +1 @@
+