diff --git a/CAL/CalibrationProcessing/lib/process_holography_dataset.py b/CAL/CalibrationProcessing/lib/process_holography_dataset.py index dc1d37a98747be74967168f60263f5c43ccc3c8e..647333f200c924e14d460869a8dc702f44c6c126 100644 --- a/CAL/CalibrationProcessing/lib/process_holography_dataset.py +++ b/CAL/CalibrationProcessing/lib/process_holography_dataset.py @@ -16,7 +16,7 @@ def main(): process_holography_dataset(input_path=arguments.input_path, output_path=arguments.output_path, - average_window=arguments.average_samples, + average_samples=arguments.average_samples, time_average_step=arguments.time_average_step) @@ -37,17 +37,6 @@ def parse_command_line_arguments_and_set_verbose_logging(parser): logger.debug('The selected arguments are %s', arguments) - - if arguments.average_samples is not None and arguments.time_average_step is not None: - logger.error('Please specify either the average window in samples' - ' or the time average step in seconds') - sys.exit(1) - - if arguments.average_samples is None and arguments.time_average_step is None: - logger.error('Please specify at least one between the average window in samples' - ' or the time average step in seconds') - sys.exit(1) - return arguments @@ -74,18 +63,27 @@ def specify_command_line_arguments(): return parser -def process_holography_dataset(input_path, output_path, average_window, time_average_step): +def process_holography_dataset(input_path, output_path, average_samples, time_average_step): """ :param infile_path: path to the input file :param outfile_path: path to the output file - :param average_window: averaging sample step + :param average_samples: averaging sample step :param time_average_step: averaging time window :return: """ - if average_window is not None: - logger.info('Averaging %s with a time sample window of %s', input_path, average_window) - output_hds = processing.average_dataset_by_sample(input_path, average_window) + + if average_samples is not None and time_average_step is not None: + logger.error('Please specify either the average window in samples' + ' or the time average step in seconds') + raise ValueError('Both average_samples and time_average_step have been specified') + + if average_samples is None and time_average_step is None: + logger.error('Neither average_samples nor time_average_step has been specified') + + if average_samples is not None: + logger.info('Averaging %s with a time sample window of %s', input_path, average_samples) + output_hds = processing.average_dataset_by_sample(input_path, average_samples) logger.info('Averaged %s with a time sample window of %s', input_path, output_path) logger.info('Storing processed file %s in %s', input_path, output_path)