From 0e5bdda13e98b2b941f9ca8ef88a20a32a46debd Mon Sep 17 00:00:00 2001 From: goei <JsXLRu> Date: Mon, 5 Oct 2020 11:12:26 +0200 Subject: [PATCH] TMSS-343 Change pointing angle test values, these schould be below 2 pi radians --- ...1-scheduling-unit-observation-strategy.json | 18 +++++++++--------- SAS/TMSS/test/t_subtasks.py | 8 ++++---- .../testdata/example_UC1_scheduling_unit.json | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/SAS/TMSS/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json b/SAS/TMSS/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json index 05b2946b839..183f8933332 100644 --- a/SAS/TMSS/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json +++ b/SAS/TMSS/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json @@ -65,18 +65,18 @@ "stations":["CS001"], "tile_beam": { "direction_type": "J2000", - "angle1": 42, - "angle2": 42, - "angle3": 42 + "angle1": 0.42, + "angle2": 0.43, + "angle3": 0.44 }, "SAPs": [ { "name": "target0", "digital_pointing": { "direction_type": "J2000", - "angle1": 24, - "angle2": 24, - "angle3": 24 + "angle1": 0.24, + "angle2": 0.25, + "angle3": 0.26 }, "subbands": [ 349, @@ -87,9 +87,9 @@ "name": "target1", "digital_pointing": { "direction_type": "J2000", - "angle1": 24, - "angle2": 24, - "angle3": 24 + "angle1": 0.27, + "angle2": 0.28, + "angle3": 0.29 }, "subbands": [ 349, diff --git a/SAS/TMSS/test/t_subtasks.py b/SAS/TMSS/test/t_subtasks.py index ca94d9eb33b..8d80cb4b2cd 100755 --- a/SAS/TMSS/test/t_subtasks.py +++ b/SAS/TMSS/test/t_subtasks.py @@ -257,15 +257,15 @@ class SubTasksCreationFromTaskBluePrintCalibrator(unittest.TestCase): create_observation_control_subtask_from_task_blueprint(cal_task_blueprint) cal_task_blueprint.specifications_doc['autoselect'] = False - cal_task_blueprint.specifications_doc['pointing']['angle1'] = 11.11 - cal_task_blueprint.specifications_doc['pointing']['angle2'] = 22.22 + cal_task_blueprint.specifications_doc['pointing']['angle1'] = 1.111 + cal_task_blueprint.specifications_doc['pointing']['angle2'] = 2.222 subtask = create_observation_control_subtask_from_task_blueprint(cal_task_blueprint) self.assertEqual("defined", str(subtask.state)) self.assertEqual("observation control", str(subtask.specifications_template.name)) self.assertEqual("observation", str(subtask.specifications_template.type)) self.assertEqual('J2000', subtask.specifications_doc['stations']['analog_pointing']['direction_type']) - self.assertEqual(11.11, subtask.specifications_doc['stations']['analog_pointing']['angle1']) - self.assertEqual(22.22, subtask.specifications_doc['stations']['analog_pointing']['angle2']) + self.assertEqual(1.111, subtask.specifications_doc['stations']['analog_pointing']['angle1']) + self.assertEqual(2.222, subtask.specifications_doc['stations']['analog_pointing']['angle2']) class SubtaskInputSelectionFilteringTest(unittest.TestCase): diff --git a/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json b/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json index 639ad9535ae..38dc23b9cc5 100644 --- a/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json +++ b/SAS/TMSS/test/testdata/example_UC1_scheduling_unit.json @@ -69,16 +69,16 @@ "stations": ["CS001","CS002","CS003"], "tile_beam": { "direction_type": "J2000", - "angle1": 42, - "angle2": 42 + "angle1": 0.42, + "angle2": 0.43 }, "SAPs": [ { "name": "target0", "digital_pointing": { "direction_type": "J2000", - "angle1": 24, - "angle2": 24 + "angle1": 0.24, + "angle2": 0.25 }, "subbands": [ 349, -- GitLab