diff --git a/RTCP/Run/src/LOFAR/Parset.py b/RTCP/Run/src/LOFAR/Parset.py index 092cae09b574b4e223be627065d181a275803bd9..a22fccf5ac4556e24b5156141698db23c89c4457 100644 --- a/RTCP/Run/src/LOFAR/Parset.py +++ b/RTCP/Run/src/LOFAR/Parset.py @@ -33,13 +33,21 @@ class Parset(util.Parset.Parset): def distillStations(self): """ Distill station names to use from the parset file and return them. """ - def stripQuotes(s): - return s.strip("'").rstrip("'") + key = "Observation.VirtualInstrument.stationList" - if "OLAP.storageStationNames" not in self: + if key not in self: return "" - return map( stripQuotes, self.getStringVector( "OLAP.storageStationNames" ) ) + stationlist = self.getStringVector(key) + antennaset = self["Observation.antennaSet"] + if antennaset.startswith("LBA"): + array = "LBA" + elif antennaset.startswith("HBA"): + array = "HBA" + else: + assert False,"Unknown Observation.antennaSet: %s" % (antennaset,) + + return "+".join(["%s%s" % (stat,array) for stat in stationlist]) def distillPartition(self): """ Distill partition to use from the parset file and return it. """ diff --git a/RTCP/Run/src/util/Parset.py b/RTCP/Run/src/util/Parset.py index 0991e322798d0e63af250f7925cce1d60e076eea..8004cd2eb5d932fec5ec20e8155af07c55df532b 100644 --- a/RTCP/Run/src/util/Parset.py +++ b/RTCP/Run/src/util/Parset.py @@ -146,7 +146,9 @@ class Parset(dict): # read array value = [] - if peek() != "]": + if peek() == "]": + token() # discard ] + else: # non-empty array # accumulate tokens as a single value,