From ef469ac0723e9f357eaff43bfbd0648b021fc18e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20J=C3=BCrges?= <jurges@astron.nl>
Date: Tue, 25 Sep 2018 07:50:43 +0000
Subject: [PATCH] Task SSB-42: sas_ids is a list of strings not ints
---
.../lib/datacontainers/holography_measurementset.py | 2 +-
.../lib/datacontainers/holography_observation.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py b/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py
index 7446bf3c9c6..0c136e99590 100644
--- a/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py
+++ b/CAL/CalibrationCommon/lib/datacontainers/holography_measurementset.py
@@ -215,7 +215,7 @@ class HolographyMeasurementSet(object):
if not HolographyMeasurementSet.is_a_valid_ms_name(ms_name):
raise ValueError('The measurement set %s has not a valid name' % ms_name,)
match = re.match(HolographyMeasurementSet.ms_name_pattern, ms_name)
- return (int(match.group('sas_id')), int(match.group('sub_band_id')))
+ return (str(match.group('sas_id')), int(match.group('sub_band_id')))
@staticmethod
diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py b/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py
index 71aeef558c6..3af56f86790 100644
--- a/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py
+++ b/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py
@@ -99,7 +99,7 @@ class HolographyObservation():
for root, dirnames, filenames in os.walk(path):
match = re.match(ms_dirs_path_pattern, root)
if match:
- sas_id = int(match.group('sas_id'))
+ sas_id = match.group('sas_id')
ms_indexed_per_beamlet_number = HolographyObservation. \
create_ms_dict_from_ms_name_list_and_path(dirnames, root)
--
GitLab