diff --git a/subworkflow/bandpass.cwl b/subworkflow/bandpass.cwl index 7ed990e04068d51b97549f17f67dc2793bc78587..46dc66024b5b7d5cbba73b945ddf72c8a16f6bdf 100644 --- a/subworkflow/bandpass.cwl +++ b/subworkflow/bandpass.cwl @@ -25,10 +25,6 @@ inputs: type: 'float[]?' 'sbg:x': 621.3228149414062 'sbg:y': 415.88018798828125 - - id: antenna_to_transfer - type: string? - 'sbg:x': 985.4193725585938 - 'sbg:y': 183.84898376464844 - id: msin type: 'Directory[]' 'sbg:x': -209.68214416503906 @@ -46,24 +42,18 @@ inputs: 'sbg:x': 182.17527770996094 'sbg:y': 245.62673950195312 outputs: - - id: outh5parm - outputSource: - - transfer_solutions/output - type: File? - 'sbg:x': 1584.9029541015625 - 'sbg:y': -202.09591674804688 - - id: msout - outputSource: - - apply_calibration/msout - type: 'Directory[]' - 'sbg:x': 1667.565673828125 - 'sbg:y': 493.5250549316406 - - id: before_transfer + - id: output_h5parm outputSource: - losoto_bandpass/output_h5parm type: File - 'sbg:x': 1171.266357421875 - 'sbg:y': -376.4964294433594 + 'sbg:x': 1616.339599609375 + 'sbg:y': -79.22715759277344 + - id: msout + outputSource: + - applycal/msout + type: Directory + 'sbg:x': 1635.458984375 + 'sbg:y': 451.6930847167969 steps: - id: h5imp_cal_bandpass in: @@ -83,26 +73,6 @@ steps: label: h5imp_cal_bandpass 'sbg:x': 506.7213134765625 'sbg:y': -46.799495697021484 - - id: transfer_solutions - in: - - id: refh5parm - source: h5parm_collector/outh5parm - - id: insolset - default: calibrator - - id: outsolset - default: calibrator - - id: insoltab - default: bandpass000 - - id: outsoltab - default: bandpass000 - - id: antenna - source: antenna_to_transfer - out: - - id: output - run: ../steps/transfer_solutions.cwl - label: transfer_solutions - 'sbg:x': 1213.063232421875 - 'sbg:y': -19.87626075744629 - id: losoto_bandpass in: - id: ampRange @@ -129,8 +99,8 @@ steps: - id: output_h5parm run: ./losoto_bandpass.cwl label: losoto_bandpass - 'sbg:x': 815.5712280273438 - 'sbg:y': -105.06683349609375 + 'sbg:x': 825.2948608398438 + 'sbg:y': -0.5806066393852234 - id: smooth_calibrate in: - id: msin @@ -151,42 +121,27 @@ steps: label: smooth_calibrate 'sbg:x': 295.0807189941406 'sbg:y': -65.40983581542969 - - id: apply_calibration + - id: applycal in: - - id: parmdb - source: transfer_solutions/output - id: msin source: msin + - id: msin_datacolumn + default: CORRECTED_DATA + - id: parmdb + source: losoto_bandpass/output_h5parm + - id: msout_datacolumn + default: CORRECTED_DATA + - id: correction + default: bandpass000 + - id: storagemanager + default: dysco out: - id: msout - run: ./apply_calibration.cwl - label: apply_calibration + run: ../lofar-cwl/steps/applycal.cwl scatter: - msin - 'sbg:x': 1376.5487060546875 - 'sbg:y': 486.63787841796875 - - id: h5parm_collector - in: - - id: h5parmFiles - source: - - losoto_bandpass/output_h5parm - - id: outsolset - default: calibrator - - id: insoltab - default: bandpass - - id: squeeze - default: true - - id: verbose - default: true - - id: clobber - default: true - out: - - id: outh5parm - - id: log - run: ../lofar-cwl/steps/H5ParmCollector.cwl - label: H5parm_collector - 'sbg:x': 1037.4373779296875 - 'sbg:y': -74.7872314453125 + 'sbg:x': 1249.17578125 + 'sbg:y': 471.29852294921875 requirements: - class: SubworkflowFeatureRequirement - class: ScatterFeatureRequirement diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl index d12227d11357b67a43f93632e901e4384f2fd243..0fcf465caabb1b0ba88197bd192c7f864229df42 100644 --- a/workflows/prefactor_calibrator.cwl +++ b/workflows/prefactor_calibrator.cwl @@ -78,12 +78,6 @@ outputs: type: File? 'sbg:x': 1196.5001220703125 'sbg:y': -924.676513671875 - - id: before_transfer - outputSource: - - rename_4/output_file - type: File? - 'sbg:x': 1336.022705078125 - 'sbg:y': 305.3316650390625 steps: - id: prep in: @@ -299,17 +293,5 @@ steps: label: h5parm_cat 'sbg:x': 1084.4119873046875 'sbg:y': -580.6766967773438 - - id: rename_4 - in: - - id: file_in - source: bandpass/before_transfer - - id: new_name - default: before_transfer.h5 - out: - - id: output_file - run: ../steps/rename.cwl - label: rename - 'sbg:x': 1027.068115234375 - 'sbg:y': 360.77679443359375 requirements: - class: SubworkflowFeatureRequirement