diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json
index 9763e45af29ef026a061b6b801f3931a0f5b8302..07081c0e3098153f07f55d8078608ece8776bec7 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/UC1-scheduling-unit-observation-strategy.json
@@ -9,8 +9,7 @@
"pointing": {
"direction_type": "J2000",
"angle1": 0,
- "angle2": 0,
- "angle3": 0
+ "angle2": 0
},
"name": "calibrator1"
},
@@ -80,8 +79,7 @@
"tile_beam": {
"direction_type": "J2000",
"angle1": 0.42,
- "angle2": 0.43,
- "angle3": 0.44
+ "angle2": 0.43
},
"SAPs": [
{
@@ -89,8 +87,7 @@
"digital_pointing": {
"direction_type": "J2000",
"angle1": 0.24,
- "angle2": 0.25,
- "angle3": 0.26
+ "angle2": 0.25
},
"subbands": [
349,
@@ -102,8 +99,7 @@
"digital_pointing": {
"direction_type": "J2000",
"angle1": 0.27,
- "angle2": 0.28,
- "angle3": 0.29
+ "angle2": 0.28
},
"subbands": [
349,
@@ -169,8 +165,7 @@
"pointing": {
"direction_type": "J2000",
"angle1": 0,
- "angle2": 0,
- "angle3": 0
+ "angle2": 0
},
"name": "calibrator2"
},
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json
index 88668838c82f03c889baee2825b7f8bf9823d3a4..75e850155bd192c799fc8e659516ac23c9ee2f2d 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/common_schema_template-pointing-1.json
@@ -42,12 +42,6 @@
"title": "Angle 2",
"description": "Second angle (e.g. DEC)",
"default": 0
- },
- "angle3": {
- "type": "number",
- "title": "Angle 3",
- "description": "Third angle (e.g. N in LMN)",
- "default": 0
}
},
"required": [
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
index 23756bfb22a1d883279f592b8c01d7b453847e7b..ac3277566c7e385713036301a3c2a6af7bd3c911 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/short-observation-pipeline-ingest-scheduling-unit-observation-strategy.json
@@ -30,8 +30,7 @@
"tile_beam": {
"direction_type": "J2000",
"angle1": 5.233660650313663,
- "angle2": 0.7109404782526458,
- "angle3": 0
+ "angle2": 0.7109404782526458
},
"SAPs": [
{
@@ -40,8 +39,7 @@
"digital_pointing": {
"direction_type": "J2000",
"angle1": 5.233660650313663,
- "angle2": 0.7109404782526458,
- "angle3": 0
+ "angle2": 0.7109404782526458
},
"subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json
index a711c97f18d6bb9f3facbe17f4f5f1a15e41f423..f74ee652b3c73ffbedb2451edce6531cf93f8990 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-beamforming-observation-scheduling-unit-observation-strategy.json
@@ -14,8 +14,7 @@
"digital_pointing": {
"direction_type": "J2000",
"angle1": 5.233660650313663,
- "angle2": 0.7109404782526458,
- "angle3": 0
+ "angle2": 0.7109404782526458
},
"subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
}
@@ -26,8 +25,7 @@
"tile_beam": {
"direction_type": "J2000",
"angle1": 5.233660650313663,
- "angle2": 0.7109404782526458,
- "angle3": 0
+ "angle2": 0.7109404782526458
},
"beamformers": [ {} ]
},
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json
index 06e34636cc16cd68ccfc10c68b3b7180634d9070..4ea17e719fad83f17b9746f474f1761f9682a48f 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/schemas/simple-observation-scheduling-unit-observation-strategy.json
@@ -30,8 +30,7 @@
"tile_beam": {
"direction_type": "J2000",
"angle1": 5.233660650313663,
- "angle2": 0.7109404782526458,
- "angle3": 0
+ "angle2": 0.7109404782526458
},
"SAPs": [
{
@@ -40,8 +39,7 @@
"digital_pointing": {
"direction_type": "J2000",
"angle1": 5.233660650313663,
- "angle2": 0.7109404782526458,
- "angle3": 0
+ "angle2": 0.7109404782526458
},
"subbands": [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243]
}
diff --git a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
index 243cb8b3ddbc8729a94b61606a3a7a4c93b5be42..60499017cdc4a4247f7716881ca2840f45ffb96a 100644
--- a/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
+++ b/SAS/TMSS/backend/src/tmss/tmssapp/subtasks.py
@@ -99,7 +99,7 @@ def _add_pointings(pointing_a, pointing_b):
raise SubtaskCreationException(
"Cannot add pointings because direction types differ pointing_a=%s; pointing_b=%s" % (pointing_a, pointing_b))
pointing = {"direction_type": pointing_a['direction_type']}
- for angle in ['angle1', 'angle2', 'angle3']:
+ for angle in ['angle1', 'angle2']:
pointing[angle] = pointing_a.get(angle, 0.0) + pointing_b.get(angle, 0.0)
return pointing
diff --git a/SAS/TMSS/backend/test/t_adapter.py b/SAS/TMSS/backend/test/t_adapter.py
index f67d013c90e33f656334d3416444ec70006f7ffb..772a2d43ed706e328371dc2cdb048f38f65db9ed 100755
--- a/SAS/TMSS/backend/test/t_adapter.py
+++ b/SAS/TMSS/backend/test/t_adapter.py
@@ -214,7 +214,7 @@ class SIPadapterTest(unittest.TestCase):
specifications_doc['stations']['filter'] = "HBA_210_250"
feedback_template = models.DataproductFeedbackTemplate.objects.get(name='feedback')
# feedback_doc = get_default_json_object_for_schema(feedback_template.schema) # todo <- fix the default generator, for some reason it does not produce valid json here...
- feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [156], 'central_frequencies': [33593750.0], 'channel_width': 6103.515625, 'channels_per_subband': 32}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'angle3': 0, 'direction_type': 'J2000'}}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}, '$schema': 'http://127.0.0.1:8001/api/schemas/dataproductfeedbacktemplate/feedback/1#'}
+ feedback_doc = {'percentage_written': 100, 'frequency': {'subbands': [156], 'central_frequencies': [33593750.0], 'channel_width': 6103.515625, 'channels_per_subband': 32}, 'time': {'start_time': '2013-02-16T17:00:00', 'duration': 5.02732992172, 'sample_width': 2.00278016}, 'antennas': {'set': 'HBA_DUAL', 'fields': [{'type': 'HBA', 'field': 'HBA0', 'station': 'CS001'}, {'type': 'HBA', 'field': 'HBA1', 'station': 'CS001'}]}, 'target': {'pointing': {'angle1': 0, 'angle2': 0, 'direction_type': 'J2000'}}, 'samples': {'polarisations': ['XX', 'XY', 'YX', 'YY'], 'type': 'float', 'bits': 32, 'writer': 'standard', 'writer_version': '2.2.0', 'complex': True}, '$schema': 'http://127.0.0.1:8001/api/schemas/dataproductfeedbacktemplate/feedback/1#'}
for dp in specifications_doc['stations']['digital_pointings']:
dp['subbands'] = list(range(8))
# Create SubTask(output)
diff --git a/SAS/TMSS/backend/test/t_subtasks.py b/SAS/TMSS/backend/test/t_subtasks.py
index c3a8c261bd74c019f4728aa4d525e376aad875cf..806fcd682579d20829b1b010f5548fb530ae73e1 100755
--- a/SAS/TMSS/backend/test/t_subtasks.py
+++ b/SAS/TMSS/backend/test/t_subtasks.py
@@ -230,10 +230,10 @@ class SubTasksCreationFromTaskBluePrint(unittest.TestCase):
def test_create_subtasks_from_task_blueprint_translates_SAP_names(self):
task_blueprint = create_task_blueprint_object_for_testing('target observation')
task_blueprint.specifications_doc['SAPs'] = [{'name': 'target1', 'target': '', 'subbands': [],
- 'digital_pointing': {'angle1': 0.1, 'angle2': 0.1, 'angle3': 0.1,
+ 'digital_pointing': {'angle1': 0.1, 'angle2': 0.1,
'direction_type': 'J2000'}},
{'name': 'target2', 'target': '', 'subbands': [],
- 'digital_pointing': {'angle1': 0.2, 'angle2': 0.2, 'angle3': 0.2,
+ 'digital_pointing': {'angle1': 0.2, 'angle2': 0.2,
'direction_type': 'J2000'}}]
subtask = create_observation_control_subtask_from_task_blueprint(task_blueprint)
i = 0
@@ -386,9 +386,9 @@ class SettingTest(unittest.TestCase):
class SubTaskCreationFromTaskBlueprintBeamformer(unittest.TestCase):
saps = [{"name": "target1", "target": "", "subbands": [349, 372],
- "digital_pointing": {"angle1": 0.24, "angle2": 0.25, "angle3": 0.26, "direction_type": "J2000"}},
+ "digital_pointing": {"angle1": 0.24, "angle2": 0.25, "direction_type": "J2000"}},
{"name": "target2", "target": "", "subbands": [309, 302],
- "digital_pointing": {"angle1": 0.42, "angle2": 0.52, "angle3": 0.62, "direction_type": "J2000"}}
+ "digital_pointing": {"angle1": 0.42, "angle2": 0.52, "direction_type": "J2000"}}
]
beamformers = [{"name": "beamformer1",
"coherent": {"settings": {"stokes": "I", "time_integration_factor": 8, "subbands_per_file": 244,
@@ -447,7 +447,7 @@ class SubTaskCreationFromTaskBlueprintBeamformer(unittest.TestCase):
def test_generate_tab_ring_pointings_returns_correct_pointings(self):
- pointing = {"angle1": 0.11, "angle2": 0.22, "angle3": 0.33, "direction_type": "J2000"}
+ pointing = {"angle1": 0.11, "angle2": 0.22, "direction_type": "J2000"}
tab_rings = {"width": 1, "count": 1}
# assert center pointing is returned
@@ -469,9 +469,9 @@ class SubTaskCreationFromTaskBlueprintBeamformer(unittest.TestCase):
def test_add_pointings_adds_correctly(self):
pointing_a = {"angle1": 0.11, "angle2": 0.22, "direction_type": "J2000"}
- pointing_b = {"angle1": 0.88, "angle2": 0.66, "angle3": 0.77, "direction_type": "J2000"}
+ pointing_b = {"angle1": 0.88, "angle2": 0.66, "direction_type": "J2000"}
pointing_sum = _add_pointings(pointing_a, pointing_b)
- self.assertEqual(pointing_sum, {"angle1": 0.99, "angle2": 0.88, "angle3": 0.77, "direction_type": "J2000"})
+ self.assertEqual(pointing_sum, {"angle1": 0.99, "angle2": 0.88, "direction_type": "J2000"})
def test_filter_subbands_filters_correctly(self):
subbands = [1,3,4,5,10,11,12,13,19,20]