From b4c78eeb86e88ebe86ffc879c20d0bed3f72fa56 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 3 Apr 2017 09:07:25 +0000
Subject: [PATCH] Task #10558: Add comments about why station and cobalt
resources do not (yet) have to be propagated from RA->OTDB
---
.../lib/translator.py | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py
index f095daf8345..e16fd67f9a3 100755
--- a/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py
+++ b/SAS/ResourceAssignment/RAtoOTDBTaskSpecificationPropagator/lib/translator.py
@@ -222,12 +222,18 @@ class RAtoOTDBTranslator():
parset[PREFIX+'startTime'] = ra_info['starttime'].strftime('%Y-%m-%d %H:%M:%S')
parset[PREFIX+'stopTime'] = ra_info['endtime'].strftime('%Y-%m-%d %H:%M:%S')
+ # Station resources are dealt with as follows:
+ # * Station list: This is part of the specification, so already in OTDB. The RA only checks for conflicts.
+ # * Data slots: Stations & Cobalt derive a default data-slot mapping, so no need to specify one until Cobalt
+ # can read data from the same antenna field for multiple observations (=the use case for data
+ # slots).
+ # Cobalt resources are dealt with as follows:
+ # * Cobalt.blockSize is part of the specification.
+ # * Cobalt resources are not modelled and allocated, so the defaults (cbt001-8) will be used.
+
if 'storage' in ra_info:
logging.info("Adding storage claims to parset\n" + pprint.pformat(ra_info['storage']))
parset.update(self.ProcessStorageInfo(otdb_id, ra_info['storage'], project_name))
- if 'stations' in ra_info:
- logging.info("Adding stations to parset: " + str(ra_info["stations"]))
- parset[PREFIX+'VirtualInstrument.stationList'] = ra_info["stations"]
if ra_info['type'] == 'observation':
logging.info("Adding inspection plot commands to parset")
parset[PREFIX+'ObservationControl.OnlineControl.inspectionHost'] = 'head01.cep4.control.lofar'
--
GitLab