diff --git a/subworkflow/apply_calibration.cwl b/subworkflow/apply_calibration.cwl
index d4bf02cb21bf3ec9b142686ac86272f8cdd536f9..3256393581b84aee5e8aeed39da2b4e0543521cd 100644
--- a/subworkflow/apply_calibration.cwl
+++ b/subworkflow/apply_calibration.cwl
@@ -25,8 +25,12 @@ steps:
in:
- id: msin
source: msin
+ - id: msin_datacolumn
+ default: DATA
- id: parmdb
source: parmdb
+ - id: correction
+ default: polalign
out:
- id: msout
run: ../lofar-cwl/steps/applycal.cwl
diff --git a/subworkflow/bandpass.cwl b/subworkflow/bandpass.cwl
index 31fc674db5cd2761d4f2ee01bc809b001f2fe97a..6a68b20a3a19d2320ef0ed8de904e44cfeeb3aff 100644
--- a/subworkflow/bandpass.cwl
+++ b/subworkflow/bandpass.cwl
@@ -9,6 +9,46 @@ inputs:
type: 'Directory[]'
'sbg:x': -66.62995910644531
'sbg:y': -47.43605041503906
+ - id: do_smooth
+ type: boolean
+ 'sbg:x': -30.103496551513672
+ 'sbg:y': 168.6453857421875
+ - id: propagate_solutions
+ type: boolean
+ 'sbg:x': 81.81513214111328
+ 'sbg:y': -313.3733215332031
+ - id: flagunconverged
+ type: boolean
+ 'sbg:x': 172.986328125
+ 'sbg:y': 244.30821228027344
+ - id: skipInternational
+ type: string?
+ 'sbg:x': 600.0303344726562
+ 'sbg:y': -411.65814208984375
+ - id: max2interpolate
+ type: int?
+ 'sbg:x': 472.91082763671875
+ 'sbg:y': -275.4460144042969
+ - id: bandpass_freqresolution
+ type: string
+ 'sbg:x': 479.5017395019531
+ 'sbg:y': 199.0994415283203
+ - id: avg_freqresolution
+ type: string?
+ 'sbg:x': 565.18359375
+ 'sbg:y': 390.2358093261719
+ - id: ampRange
+ type: 'float[]?'
+ 'sbg:x': 773.8956909179688
+ 'sbg:y': 471.523681640625
+ - id: outh5parmname
+ type: string
+ 'sbg:x': 805.8613891601562
+ 'sbg:y': -296.09796142578125
+ - id: antenna_to_transfer
+ type: string?
+ 'sbg:x': 985.4193725585938
+ 'sbg:y': 183.84898376464844
outputs:
- id: output
outputSource:
@@ -21,10 +61,18 @@ steps:
in:
- id: msin
source: msin
+ - id: do_smooth
+ source: do_smooth
+ - id: in_column_name
+ default: CORRECTED_DATA
+ - id: out_column
+ default: SMOOTHED_DATA
+ - id: restore
+ default: true
out:
- id: msout
run: ../steps/blsmooth.cwl
- label: BLsmooth
+ label: smooth_corrected
scatter:
- msin
'sbg:x': 143.50439453125
@@ -33,6 +81,14 @@ steps:
in:
- id: msin
source: smooth_corrected/msout
+ - id: msin_datacolumn
+ default: SMOOTHED_DATA
+ - id: output_name_h5parm
+ default: calibration.h5
+ - id: propagate_solutions
+ source: propagate_solutions
+ - id: flagunconverged
+ source: flagunconverged
out:
- id: msout
- id: h5parm
@@ -46,47 +102,84 @@ steps:
- id: h5parmFiles
source:
- calib_cal2/h5parm
+ - id: insolset
+ 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
+ label: h5imp_cal_bandpass
scatter:
- h5parmFiles
'sbg:x': 553.6541748046875
'sbg:y': -29.645381927490234
- - id: losoto_bandpass
- in:
- - id: input_h5parm
- source: h5imp_cal_bandpass/outh5parm
- out:
- - id: output_h5parm
- run: ./losoto_bandpass.cwl
- label: losoto_bandpass
- 'sbg:x': 734.6299438476562
- 'sbg:y': -45.850223541259766
- - id: h5parm_collector
+ - id: h5exp_cal_bandpass
in:
- id: h5parmFiles
source:
- losoto_bandpass/output_h5parm
+ - id: insolset
+ default: bandpass
+ - id: outh5parmname
+ source: outh5parmname
+ - id: verbose
+ default: true
+ - id: clobber
+ default: true
out:
- id: outh5parm
- id: log
run: ../lofar-cwl/steps/H5ParmCollector.cwl
- label: H5parm_collector
+ label: h5exp_cal_bandpass
'sbg:x': 943
'sbg:y': -45
- id: transfer_solutions
in:
- id: refh5parm
- source: h5parm_collector/outh5parm
+ source: h5exp_cal_bandpass/outh5parm
+ - id: insolset
+ default: calibrator
+ - id: outsolset
+ default: calibrator
+ - id: insoltab
+ default: bandpass
+ - id: outsoltab
+ default: bandpass
+ - id: antenna
+ source: antenna_to_transfer
out:
- id: output
run: ../steps/transfer_solutions.cwl
label: transfer_solutions
- 'sbg:x': 1132.31494140625
- 'sbg:y': -62.268699645996094
+ 'sbg:x': 1132
+ 'sbg:y': -62
+ - id: losoto_bandpass
+ in:
+ - id: ampRange
+ source:
+ - ampRange
+ - id: skipInternational
+ source: skipInternational
+ - id: input_h5parm
+ source: h5imp_cal_bandpass/outh5parm
+ - id: max2interpolate
+ source: max2interpolate
+ - id: bandpass_freqresolution
+ source: bandpass_freqresolution
+ - id: avg_freqresolution
+ source: avg_freqresolution
+ out:
+ - id: output_h5parm
+ run: ./losoto_bandpass.cwl
+ label: losoto_bandpass
+ 'sbg:x': 747.5215454101562
+ 'sbg:y': -46.37216567993164
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/subworkflow/losoto_bandpass.cwl b/subworkflow/losoto_bandpass.cwl
index 4a824b715e2a1552680802e336ca4a724431d797..4b668f7b7ce12a649075edd973c99d801699cf3a 100644
--- a/subworkflow/losoto_bandpass.cwl
+++ b/subworkflow/losoto_bandpass.cwl
@@ -5,14 +5,34 @@ label: losoto_bandpass
$namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
+ - id: ampRange
+ type: 'float[]?'
+ 'sbg:x': 730.283935546875
+ 'sbg:y': 152.7667236328125
+ - id: skipInternational
+ type: string?
+ 'sbg:x': 742.662841796875
+ 'sbg:y': -221.30563354492188
- id: input_h5parm
type: File
- 'sbg:x': 516.171875
- 'sbg:y': -52.5
+ 'sbg:x': 512.96240234375
+ 'sbg:y': -41.42390060424805
+ - id: max2interpolate
+ type: int?
+ 'sbg:x': 1227
+ 'sbg:y': -278
+ - id: bandpass_freqresolution
+ type: string
+ 'sbg:x': 1399
+ 'sbg:y': -354
+ - id: avg_freqresolution
+ type: string?
+ 'sbg:x': 1286.2171630859375
+ 'sbg:y': 127.25900268554688
outputs:
- id: output_h5parm
outputSource:
- - smooth2/output_h5parm
+ - smoothb/output_h5parm
type: File
'sbg:x': 1798
'sbg:y': -47
@@ -20,55 +40,111 @@ steps:
- id: duplicateAbkp
in:
- id: input_h5parm
- source:
- - h5imp_cal_bandpass/outh5parm
- - input_h5parm
+ source: input_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: soltabOut
+ default: amplitudeOrig000
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 666.9075317382812
- 'sbg:y': -50.17535400390625
+ 'sbg:x': 642
+ 'sbg:y': -48
- id: losoto_flag
in:
- id: input_h5parm
source: duplicateAbkp/output_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: axesToFlag
+ default:
+ - time
+ - freq
+ - id: order
+ default:
+ - 100
+ - 40
+ - id: maxCycles
+ default: 1
+ - id: maxRms
+ default: 5
+ - id: mode
+ default: smooth
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Flag.cwl
label: flag
- 'sbg:x': 793.4662475585938
- 'sbg:y': -47.08479690551758
- - id: flagstation
+ 'sbg:x': 764
+ 'sbg:y': -47
+ - id: flagbp
in:
- id: input_h5parm
source: losoto_flag/output_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: mode
+ default: bandpass
+ - id: ampRange
+ source:
+ - ampRange
+ - id: skipInternational
+ source: skipInternational
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.FlagStation.cwl
- 'sbg:x': 910.7532958984375
- 'sbg:y': -45.53951644897461
+ 'sbg:x': 873
+ 'sbg:y': -55
- id: flagextend
in:
- id: input_h5parm
- source: flagstation/output_h5parm
+ source: flagbp/output_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: axesToExt
+ default:
+ - time
+ - freq
+ - id: size
+ default:
+ - 200
+ - 80
+ - id: percent
+ default: 50
+ - id: maxCycles
+ default: 2
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Flagextend.cwl
- 'sbg:x': 1034.3082275390625
- 'sbg:y': -49.26783752441406
+ 'sbg:x': 1005
+ 'sbg:y': -51
- id: merge
in:
- id: input_h5parm
source: flagextend/output_h5parm
+ - id: soltab
+ default: sol000/phase000
+ - id: mode
+ default: copy
+ - id: soltabImport
+ default: amplitude000
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Reweight.cwl
- 'sbg:x': 1146.227294921875
- 'sbg:y': -49.539520263671875
+ 'sbg:x': 1121
+ 'sbg:y': -55
- id: smooth
in:
- id: input_h5parm
source: merge/output_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: axesToSmooth
+ default:
+ - time
+ - id: mode
+ default: median
+ - id: log
+ default: true
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
@@ -78,6 +154,20 @@ steps:
in:
- id: input_h5parm
source: smooth/output_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: axesToSmooth
+ default:
+ - freq
+ - id: size
+ default:
+ - 17
+ - id: mode
+ default: savitzky-golay
+ - id: degree
+ default: 2
+ - id: log
+ default: true
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
@@ -87,20 +177,44 @@ steps:
in:
- id: input_h5parm
source: bandpass/output_h5parm
+ - id: soltab
+ default: sol000/amplitude000
+ - id: axisToRegrid
+ default: freq
+ - id: outSoltab
+ default: bandpass
+ - id: newdelta
+ source: bandpass_freqresolution
+ - id: delta
+ source: avg_freqresolution
+ - id: maxFlaggedWidth
+ source: max2interpolate
+ - id: log
+ default: true
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Interpolate.cwl
'sbg:x': 1507.4566650390625
'sbg:y': -51.45471954345703
- - id: smooth2
+ - id: smoothb
in:
- id: input_h5parm
source: interp/output_h5parm
+ - id: soltab
+ default: sol000/bandpass
+ - id: axesToSmooth
+ default:
+ - time
+ - id: mode
+ default: median
+ - id: replace
+ default: true
+ - id: log
+ default: true
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
- label: smooth
+ label: smoothb
'sbg:x': 1648.5743408203125
'sbg:y': -51.13884735107422
-requirements:
- - class: MultipleInputFeatureRequirement
+requirements: []