Skip to content
Snippets Groups Projects
Commit d3329fbf authored by BRONES Romain's avatar BRONES Romain
Browse files

Remove all calls to FofbTool

* We now use the dedicated device to do so
parent 3a81a06c
No related branches found
No related tags found
No related merge requests found
...@@ -28,8 +28,6 @@ from tango import AttrWriteType, PipeWriteType ...@@ -28,8 +28,6 @@ from tango import AttrWriteType, PipeWriteType
import datetime import datetime
import time import time
import numpy as np import numpy as np
import FofbTool.Utils
import FofbTool.Configuration
#----- PROTECTED REGION END -----# // DG_PY_FOFBLegacy.additionnal_import #----- PROTECTED REGION END -----# // DG_PY_FOFBLegacy.additionnal_import
__all__ = ["DG_PY_FOFBLegacy", "main"] __all__ = ["DG_PY_FOFBLegacy", "main"]
...@@ -780,68 +778,6 @@ class DG_PY_FOFBLegacy(Device): ...@@ -780,68 +778,6 @@ class DG_PY_FOFBLegacy(Device):
# PROTECTED REGION END # // DG_PY_FOFBLegacy.StopComSteererLibera # 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 # Run server
# ---------- # ----------
......
...@@ -134,42 +134,6 @@ ...@@ -134,42 +134,6 @@
</argout> </argout>
<status abstract="false" inherited="false" concrete="true" concreteHere="true"/> <status abstract="false" inherited="false" concrete="true" concreteHere="true"/>
</commands> </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"> <attributes name="xRefOrbitLoadedOnDevice" attType="Scalar" rwType="READ" displayLevel="OPERATOR" polledPeriod="0" maxX="" maxY="" allocReadMember="true" isDynamic="false">
<dataType xsi:type="pogoDsl:BooleanType"/> <dataType xsi:type="pogoDsl:BooleanType"/>
<changeEvent fire="false" libCheckCriteria="false"/> <changeEvent fire="false" libCheckCriteria="false"/>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
from distutils.core import setup from distutils.core import setup
setup(name='DG_PY_FOFBLegacy', 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.', 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', url='https://gitlab.synchrotron-soleil.fr/dg/ds_dg_pytango_package/dg_py_fofblegacy',
license="GNU-GPL-v3", license="GNU-GPL-v3",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment