diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl index ae6ca606850f2a29c4d76a906788d780895c0b9d..0928a2e2a121bd28e4acbd41b158565529b2794b 100644 --- a/steps/find_skymodel_cal.cwl +++ b/steps/find_skymodel_cal.cwl @@ -15,11 +15,7 @@ inputs: type: - Directory? - File? -<<<<<<< HEAD - doc: Directory containing the sky models -======= doc: Directory or file containing the sky models ->>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276 - id: skymodels_extension type: string? doc: path extension of the sky models @@ -80,13 +76,15 @@ outputs: loadContents: true glob: 'out.json' outputEval: $(JSON.parse(self[0].contents).skymodel_name) + - id: logfile + type: File? + outputBinding: + glob: find_skymodel_cal.log + requirements: - class: InlineJavascriptRequirement hints: DockerRequirement: -<<<<<<< HEAD - dockerPull: lofareosc/prefactor:master -======= dockerPull: lofareosc/prefactor:HBAcalibrator ->>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276 +stdout: find_skymodel_cal.log \ No newline at end of file diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl index 3355c043ed1de9c944ccf877aa727ed346959b1d..6900feb7fdc08730ad0357bdb15cb31e33dc300e 100644 --- a/workflows/prefactor_calibrator.cwl +++ b/workflows/prefactor_calibrator.cwl @@ -264,6 +264,8 @@ steps: - demix_sources - id: do_smooth source: do_smooth + - id: max_separation_arcmin + source: max_separation_arcmin - id: min_separation source: min_separation - id: A-Team_skymodel diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl index 6bdaed1d2922f252778e02421704f2a41014b175..015ecc8ced357248bb9ff920b51e7ae2989e3529 100644 --- a/workflows/prefactor_calibrator/prep.cwl +++ b/workflows/prefactor_calibrator/prep.cwl @@ -129,6 +129,12 @@ outputs: type: 'File[]' 'sbg:x': 1000 'sbg:y': 200 + - id: find_skymodel_cal.log + outputSource: + - find_skymodel_cal/logfile + type: 'File[]?' + 'sbg:x': 1000 + 'sbg:y': 300 steps: - id: ndppp_prep_cal in: @@ -222,8 +228,11 @@ steps: source: msin - id: skymodels source: calibrator_path_skymodel + - id: max_separation_arcmin + source: max_separation_arcmin out: - id: output_models + - id: logfile run: ../../steps/find_skymodel_cal.cwl label: find_skymodel_cal 'sbg:x': -500