diff --git a/tangostationcontrol/tangostationcontrol/common/lofar_version.py b/tangostationcontrol/tangostationcontrol/common/lofar_version.py index 0d38c9b95231ec69c2fb7ffa7c76003b7e4dcb59..89cb22f9fe6b76caf438984c673b21d00bc25645 100644 --- a/tangostationcontrol/tangostationcontrol/common/lofar_version.py +++ b/tangostationcontrol/tangostationcontrol/common/lofar_version.py @@ -68,7 +68,7 @@ def get_version(repo: git.Repo = None) -> str: reg = re.compile(r'^v[0-9](\.[0-9]){2}(\.[a-z]*[0-9]*)?') commit = repo.commit() - filtered_tags = list(filter(reg.search, [tag.name for tag in repo.tags])) + filtered_tags = [tag.name for tag in repo.tags if reg.search(tag.name)] # Order tags from newest to oldest tags = {tag.commit: tag for tag in reversed(repo.tags) if tag.name in filtered_tags} diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics_collector.py b/tangostationcontrol/tangostationcontrol/devices/sdp/statistics_collector.py index feee750f9e0514671d18525d6ebd4612177b44c0..29503ca58ef25fcd3cb0b4ced4ff09ddaa62ecc6 100644 --- a/tangostationcontrol/tangostationcontrol/devices/sdp/statistics_collector.py +++ b/tangostationcontrol/tangostationcontrol/devices/sdp/statistics_collector.py @@ -132,7 +132,7 @@ class XSTCollector(StatisticsCollector): # Last value array we've constructed out of the packets "xst_blocks": numpy.zeros((self.MAX_BLOCKS, self.BLOCK_LENGTH * self.BLOCK_LENGTH * self.VALUES_PER_COMPLEX), dtype=numpy.int64), # Whether the values are actually conjugated and transposed - "xst_conjugated": numpy.zeros((self.MAX_BLOCKS,), dtype=numpy.bool_), + "xst_conjugated": numpy.zeros((self.MAX_BLOCKS,), dtype=numpy.bool_), "xst_timestamps": numpy.zeros((self.MAX_BLOCKS,), dtype=numpy.float64), "xst_subbands": numpy.zeros((self.MAX_BLOCKS,), dtype=numpy.uint16), "integration_intervals": numpy.zeros((self.MAX_BLOCKS,), dtype=numpy.float32),