diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py b/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py index a994ca19597cd3cc1cda0c84a51de7c660945658..b74bc1ea74da352f8978a7b14a4af0609e9b4a73 100644 --- a/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py +++ b/CAL/CalibrationCommon/lib/datacontainers/holography_dataset.py @@ -218,7 +218,7 @@ class HolographyDataset(): central_beamlet = dict() for (frequency_string, beamlets) in pseudo_distance.items(): values = list(beamlets.values()) - keys = beamlets.keys() + keys = list(beamlets.keys()) minimal_distance = min(values) # If I find a second beamlet that is 'closest' to the source for the # same frequency then that is a problem. The outset was that there @@ -387,7 +387,7 @@ class HolographyDataset(): # reads the target station position and the coordinate of its axes # and does this only once since the coordinate will not change first_holography_observation = list_of_hbs_ho_tuples[0][1] - first_ms = first_holography_observation.ms_for_a_given_beamlet_number.values()[0] + first_ms = list(first_holography_observation.ms_for_a_given_beamlet_number.values())[0] station_position, tile_offset, axes_coordinates = first_ms. \ get_station_position_tile_offsets_and_axes_coordinate_for_station_name( station_name) diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py b/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py index af15f5114a3786142d67072f770bcbd38b464311..d49b2f7cc98714f415b840be5507a4e93d63c376 100644 --- a/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py +++ b/CAL/CalibrationCommon/lib/datacontainers/holography_observation.py @@ -15,7 +15,7 @@ class HolographyObservation(): :param path: :type path: str :param sas_id: - :type sas_id: int + :type sas_id: str :param ms_for_a_given_beamlet_number: :type ms_for_a_given_beamlet_number: dict[int, HolographyMeasurementSet] :param start_mjd_in_seconds: @@ -103,7 +103,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) diff --git a/CAL/CalibrationCommon/lib/datacontainers/holography_specification.py b/CAL/CalibrationCommon/lib/datacontainers/holography_specification.py index 31e1092c67d8ba94f30ac1e926cbb29733c9ab7d..b43f124e1cfd98ebf5f75c03769bbdb058877256 100644 --- a/CAL/CalibrationCommon/lib/datacontainers/holography_specification.py +++ b/CAL/CalibrationCommon/lib/datacontainers/holography_specification.py @@ -118,7 +118,7 @@ class HolographySpecification(object): def _read_lines(self): with open(self.path, 'r') as fstream_in: - return fstream_in.read().splitlines() + return fstream_in.readlines() @staticmethod def _split_header(line): diff --git a/CAL/CalibrationProcessing/test/processing/t_processing.py b/CAL/CalibrationProcessing/test/processing/t_processing.py index 373ed92ec5d1bab86452abec6ae247df8e23f1dd..a4bac0b6b235c3e2957abdd0003858038d803b38 100755 --- a/CAL/CalibrationProcessing/test/processing/t_processing.py +++ b/CAL/CalibrationProcessing/test/processing/t_processing.py @@ -393,7 +393,7 @@ class TestProcessing(unittest.TestCase): for frequency in out_datatable[station]: for beam in out_datatable[station][frequency]: self.assertEqual(out_datatable[station][frequency][beam]['mean'].shape[0], - len(timesamples) / 3 + 1) + len(timesamples) // 3 + 1) if __name__ == '__main__':