Commit 9299ba91 authored by Elisabetta Giani's avatar Elisabetta Giani
Browse files

Updated json configuration files to test zoomWindowTuning setting. 

Modified MidCspSubarray rst file to generate API documentation.
parent 3f01bac0

csp-lmc-mid/csp_lmc_mid/MidCspSubarrayBase.py

+7 −3
Original line number Diff line number Diff line
@@ -226,6 +226,13 @@ class MidCspSubarrayBase(CspSubarray): 
        Currently it only copies the received configuration because it does not

        still exist any "cbf" block inside the JSON script.



        :param json_config: the input JSON formatted string with the configuration

                            for a scan

        :raise tango.DevFailed exception if input argument is not a valid json object.



        """



        """

        TODO:

        - look for the sub-element entries

        - add eventual information to the sub-element blocks (for example for PSS add the
@@ -263,9 +270,6 @@ class MidCspSubarrayBase(CspSubarray): 


        if "pst" in json_config:

            ....

        :param json_config: the input JSON formatted string with the configuration

                            for a scan



        """

        self._sc_subarray_assigned_fqdn.clear()

        json_dict = {}

csp-lmc-mid/tests/acceptance_tests/test_ConfigureScan_ADR4.json

+11 −0
Original line number Diff line number Diff line
@@ -58,6 +58,17 @@ 
      "outputHost": [[0, "192.168.0.1"], [8184, "192.168.0.2"]],

      "outputMac": [[0, "06-00-00-00-00-01"]],

      "outputPort": [[0, 9000, 1], [8184, 9000, 1]]

      },

      {

	"fspID":2,

	"functionMode":"CORR",

	"frequencySliceID":2,

	"integrationTime":1400,

	"corrBandwidth":1,

	"channelAveragingMap":[[0,2],[744,0]],

	"fspChannelOffset":744,

	"outputLinkMap":[[0,4],[200,5]],

	"zoomWindowTuning":650000

      }

    ]

}

csp-lmc-mid/tests/acceptance_tests/test_ConfigureScan_without_outputlink.json

0 → 100644
+41 −0
Original line number Diff line number Diff line 
{

    "id": "sbi-mvp01-20200325-00001-science_A",

    "frequencyBand": "1",

    "delayModelSubscriptionPoint": "ska_mid/tm_leaf_node/csp_subarray_01/delayModel",



    "fsp": [

        {

            "fspID": 1,

            "functionMode": "CORR",

            "frequencySliceID": 1,

            "corrBandwidth": 0,

            "integrationTime": 140,

            "fspChannelOffset": 0,

            "channelAveragingMap": [

                [0, 1],

                [744, 1],

                [1488, 1],

                [2232, 1],

                [2976, 1],

                [3720, 1],

                [4464, 1],

		[5208, 1],

                [5952, 1],

                [6696, 1],

                [7440, 1],

                [8184, 1],

                [8928, 1],

                [9672, 1],

                [10416, 1],

                [11160, 1],

                [11904, 1],

                [12648, 1],

                [13392, 1],

                [14136, 1]

            ],

      "outputHost": [[0, "192.168.0.1"], [8184, "192.168.0.2"]],

      "outputMac": [[0, "06-00-00-00-00-01"]],

      "outputPort": [[0, 9000, 1], [8184, 9000, 1]]

      }

    ]

}

docs/src/MidCspSubarray.rst

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ to obtain the value of any subarray attribute. 
MidCspSubarray Class Documentation 

==================================



.. automodule:: csp_lmc_mid.MidCspSubarrayBase.MidCspSubarrayBase

.. autoclass:: csp_lmc_mid.MidCspSubarrayBase.MidCspSubarrayBase

   :members:

   :undoc-members:

   :show-inheritance: