From 49103696c12a7eb668d81b6dd21f11a603bdccc7 Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Mon, 12 Aug 2019 16:36:03 +0200
Subject: [PATCH] SSB-47: implementing selection of the beam specification file
path
---
CAL/CalibrationCommon/lib/mshologextract.py | 9 ++++++---
CAL/CalibrationCommon/lib/utils.py | 6 +++---
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/CAL/CalibrationCommon/lib/mshologextract.py b/CAL/CalibrationCommon/lib/mshologextract.py
index 8c5406c69a0..16660532e23 100644
--- a/CAL/CalibrationCommon/lib/mshologextract.py
+++ b/CAL/CalibrationCommon/lib/mshologextract.py
@@ -182,16 +182,19 @@ def read_holography_datasets_and_store(holography_observation_path,
if holography_ms_path is not None:
raise NotImplementedError()
if holography_bsf_path is not None:
- raise NotImplementedError()
+ if not os.path.exists(holography_bsf_path):
+ raise FileNotFoundError(holography_bsf_path)
+ else:
+ holography_bsf_path = holography_observation_path
if calibration_tables_path is None:
calibration_tables_path = holography_observation_path
- target_station_names = list_all_target_stations(holography_observation_path)
+ target_station_names = list_all_target_stations(holography_bsf_path)
logger.debug('target station names %s', target_station_names)
matched_bsf_ms_pair =\
- match_holography_beam_specification_file_with_observation(holography_observation_path)
+ match_holography_beam_specification_file_with_observation(holography_bsf_path, holography_observation_path)
logger.debug('matched beam specification files and measurement sets: %s',
matched_bsf_ms_pair)
diff --git a/CAL/CalibrationCommon/lib/utils.py b/CAL/CalibrationCommon/lib/utils.py
index 587e3fbae67..d8a4678de47 100644
--- a/CAL/CalibrationCommon/lib/utils.py
+++ b/CAL/CalibrationCommon/lib/utils.py
@@ -24,9 +24,9 @@ def is_observation_in_range(start, end, from_datetime, to_datetime):
return start_in_range and end_in_range
-def match_holography_beam_specification_file_with_observation(path):
- bsf_files = list_bsf_files_in_path(path)
- observation_list = list_observations_in_path(path)
+def match_holography_beam_specification_file_with_observation(bsf_path, observation_path):
+ bsf_files = list_bsf_files_in_path(bsf_path)
+ observation_list = list_observations_in_path(observation_path)
logger.debug('specification files found %s', bsf_files)
logger.debug('observation files found %s', observation_list)
matched_observation_bsf_pair = []
--
GitLab