diff --git a/steps/check_unflagged_fraction.cwl b/steps/check_unflagged_fraction.cwl index 0d7d2a014b6923fca42c88acf9b74152434e0e3b..0a42b9ff12519530c2abf7c49d1479d8be50ec95 100644 --- a/steps/check_unflagged_fraction.cwl +++ b/steps/check_unflagged_fraction.cwl @@ -48,7 +48,7 @@ outputs: - id: msout type: Directory[] outputBinding: - glob: 'L*.ms.dpppconcat' + glob: 'L*.dpppconcat' - id: unflagged_fraction type: float outputBinding: diff --git a/steps/identify_bad_antennas.cwl b/steps/identify_bad_antennas.cwl index 822e98504644a58e55e7455f562a2ad58ef70dbc..0fa09ff11bd4a10d481a196c4fd3441d37ca8b6e 100644 --- a/steps/identify_bad_antennas.cwl +++ b/steps/identify_bad_antennas.cwl @@ -21,7 +21,6 @@ arguments: from identifyBadAntennas_CWL import main as identifyBadAntennas ms = sys.argv[1] - filter = '$(inputs.filter)' output = identifyBadAntennas(ms) diff --git a/steps/identify_bad_antennas_join.cwl b/steps/identify_bad_antennas_join.cwl index 8745f75fb0249d7969293af8d7f97b39f9c11344..03a3c2e5b9b6548c9325bbd9eaf18fcd96b5c514 100644 --- a/steps/identify_bad_antennas_join.cwl +++ b/steps/identify_bad_antennas_join.cwl @@ -19,18 +19,21 @@ label: identifyBadAntennas_join arguments: - '-c' - | - - flaggedants_list = sys.argv[1:] + + import sys + import json + + flaggedants = $(inputs.flaggedants) filter = '$(inputs.filter)' + + flaggedants_list = [ flaggedant.split(',') for flaggedant in flaggedants ] flagged_antenna_list = set.intersection(*map(set, flaggedants_list)) - + for flagged_antenna in flagged_antenna_list: filter += ';!' + flagged_antenna + '*&&*' - print('Identified bad antennas: ' + str(flagged_antenna_list)) - - cwl_output = {"filter": str(filter)} + cwl_output = {"filter": filter} with open('./out.json', 'w') as fp: json.dump(cwl_output, fp)