diff --git a/FofbTool/Configuration.py b/FofbTool/Configuration.py index a4ae4314f2ed8cfd5514ca2e4b86346bc8287c1e..22a33d081d3e58e9f6d0790073309301bb1c799d 100644 --- a/FofbTool/Configuration.py +++ b/FofbTool/Configuration.py @@ -258,7 +258,7 @@ def cellnode_configure_ccn(node_tangopath, nbpm, npsc): return True @trycatch_tango_devfailed -def centralnode_configure_ccn(node_tangopath, nbpm, npsc): +def centralnode_configure_ccn_w_gbe(node_tangopath, nbpm, npsc): """ Configure the ComCellNode block on the centralnode. Automatically set the number of bpm/psc packets and MAC length. @@ -286,9 +286,9 @@ def centralnode_configure_ccn(node_tangopath, nbpm, npsc): return None for n in range(len(nbpm)): - maclen = npsc*6+10 + maclen = npsc*4+4 logger.debug("Configure packeter {} framesize (mac length) to {}".format(n, maclen)) - prx["ccnpack{}_framesize".format(n)] = maclen + prx["ccnethhead{}_framesize".format(n)] = maclen logger.debug("Configure packeter {} npackets to {}".format(n, npsc-1)) prx["ccnpack{}_npackets".format(n)] = npsc-1 diff --git a/FofbTool/__init__.py b/FofbTool/__init__.py index e009633e3a704ad1babde09d2baabdf66a0bf55b..8535c77d940d2850f3c8f68a6de812f00959604d 100644 --- a/FofbTool/__init__.py +++ b/FofbTool/__init__.py @@ -14,4 +14,4 @@ This package is cut in several modules: For basic usage, see doc of FofbTool.Utils """ -__version__ = "3.5-dev" +__version__ = "3.5.1-dev"