diff --git a/DG_PY_FOFBLegacy.py b/DG_PY_FOFBLegacy.py index 62615b05f33cd940c02aa8f3156ae25323f5b774..92fe0717ceb95de13d971b3b1e16069b7ffb9719 100644 --- a/DG_PY_FOFBLegacy.py +++ b/DG_PY_FOFBLegacy.py @@ -28,8 +28,6 @@ from tango import AttrWriteType, PipeWriteType import datetime import time import numpy as np -import FofbTool.Utils -import FofbTool.Configuration #----- PROTECTED REGION END -----# // DG_PY_FOFBLegacy.additionnal_import __all__ = ["DG_PY_FOFBLegacy", "main"] @@ -780,68 +778,6 @@ class DG_PY_FOFBLegacy(Device): # PROTECTED REGION END # // DG_PY_FOFBLegacy.StopComSteererLibera - @command( - display_level=DispLevel.EXPERT, - ) - @DebugIt() - def StopComSteererCellNode(self): - # PROTECTED REGION ID(DG_PY_FOFBLegacy.StopComSteererCellNode) ENABLED START # - """ - Stop the frame sending from cellnodes to all steerers. - - :return:None - """ - FofbTool.Utils.conf_all_comcorr(False) - - # PROTECTED REGION END # // DG_PY_FOFBLegacy.StopComSteererCellNode - - @command( - display_level=DispLevel.EXPERT, - ) - @DebugIt() - def StopComFofbNodes(self): - # PROTECTED REGION ID(DG_PY_FOFBLegacy.StopComFofbNodes) ENABLED START # - """ - This stops the communication on FofbNodes: in between them, from BPM and to PSC. - - :return:None - """ - FofbTool.Utils.stop_all_combpm() - FofbTool.Utils.stop_all_ccn() - # PROTECTED REGION END # // DG_PY_FOFBLegacy.StopComFofbNodes - - @command( - display_level=DispLevel.EXPERT, - ) - @DebugIt() - def ConfFofbNodes(self): - # PROTECTED REGION ID(DG_PY_FOFBLegacy.ConfFofbNodes) ENABLED START # - """ - This applies default configuration on FofbNodes - - :return:None - """ - FofbTool.Utils.conf_all_combpm() - FofbTool.Utils.conf_all_comcorr() - FofbTool.Utils.conf_all_ccn() - FofbTool.Configuration.centralnode_configure_corr() - # PROTECTED REGION END # // DG_PY_FOFBLegacy.ConfFofbNodes - - @command( - display_level=DispLevel.EXPERT, - ) - @DebugIt() - def StartComFofbNodes(self): - # PROTECTED REGION ID(DG_PY_FOFBLegacy.StartComFofbNodes) ENABLED START # - """ - This starts the communication of FofbNodes. - - :return:None - """ - FofbTool.Utils.start_all_combpm() - FofbTool.Utils.start_all_ccn() - # PROTECTED REGION END # // DG_PY_FOFBLegacy.StartComFofbNodes - # ---------- # Run server # ---------- diff --git a/DG_PY_FOFBLegacy.xmi b/DG_PY_FOFBLegacy.xmi index 511353cb52e0bc68a409e33395d0288f8bafa4f0..051f8f31c6a434be1a9cac9c76cd4df8e1ec5f0b 100644 --- a/DG_PY_FOFBLegacy.xmi +++ b/DG_PY_FOFBLegacy.xmi @@ -134,42 +134,6 @@ </argout> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> </commands> - <commands name="StopComSteererCellNode" description="Stop the frame sending from cellnodes to all steerers." execMethod="stop_com_steerer_cell_node" displayLevel="EXPERT" polledPeriod="0" isDynamic="false"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argout> - <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> - </commands> - <commands name="StopComFofbNodes" description="This stops the communication on FofbNodes: in between them, from BPM and to PSC." execMethod="stop_com_fofb_nodes" displayLevel="EXPERT" polledPeriod="0" isDynamic="false"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argout> - <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> - </commands> - <commands name="ConfFofbNodes" description="This applies default configuration on FofbNodes" execMethod="conf_fofb_nodes" displayLevel="EXPERT" polledPeriod="0" isDynamic="false"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argout> - <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> - </commands> - <commands name="StartComFofbNodes" description="This starts the communication of FofbNodes." execMethod="start_com_fofb_nodes" displayLevel="EXPERT" polledPeriod="0" isDynamic="false"> - <argin description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argin> - <argout description=""> - <type xsi:type="pogoDsl:VoidType"/> - </argout> - <status abstract="false" inherited="false" concrete="true" concreteHere="true"/> - </commands> <attributes name="xRefOrbitLoadedOnDevice" attType="Scalar" rwType="READ" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false"> <dataType xsi:type="pogoDsl:BooleanType"/> <changeEvent fire="false" libCheckCriteria="false"/> diff --git a/setup.py b/setup.py index c6c813d9edd437dc007d423665762e25c3e66fa7..a0ffe9233f36d3d195840935c808a7a3d190d30b 100755 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from distutils.core import setup setup(name='DG_PY_FOFBLegacy', - version='2.0', + version='2.1', description='Offer a similar API to Matlab FOFB/SOFB scripts when using new flavour platform.', url='https://gitlab.synchrotron-soleil.fr/dg/ds_dg_pytango_package/dg_py_fofblegacy', license="GNU-GPL-v3",