Commit b8ff8b31 authored by mancini's avatar mancini

Merge branch 'ionosphere' into 'master'

Ionosphere

See merge request !19
parents b73f1d68 12570b7f
Pipeline #785 failed with stages
in 2 minutes and 37 seconds
......@@ -5,22 +5,6 @@ label: bandpass
$namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
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
......@@ -57,52 +41,8 @@ outputs:
'sbg:x': 1310.1014404296875
'sbg:y': -65.6321029663086
steps:
- id: smooth_corrected
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: smooth_corrected
scatter:
- msin
'sbg:x': 143.50439453125
'sbg:y': -49.544036865234375
- id: calib_cal2
in:
- id: msin
source: smooth_corrected/msout
- id: msin_datacolumn
default: SMOOTHED_DATA
- id: output_name_h5parm
default: calibration.h5
- id: propagate_solutions
default: true
source: propagate_solutions
- id: flagunconverged
source: flagunconverged
out:
- id: msout
- id: h5parm
run: ../lofar-cwl/steps/calib_rot_diag.cwl
scatter:
- msin
'sbg:x': 347.1034851074219
'sbg:y': -49.969146728515625
- id: h5imp_cal_bandpass
in:
- id: h5parmFiles
source:
- calib_cal2/h5parm
- id: insolset
default: bandpass
- id: squeeze
......
......@@ -98,7 +98,7 @@ steps:
out:
- id: msout
- id: h5parm
run: ../lofar-cwl/steps/calib_rot_diag.cwl
run: ../lofar-cwl/steps/ddecal.cwl
'sbg:x': 222
'sbg:y': -89
requirements: []
......@@ -9,18 +9,6 @@ inputs:
type: 'Directory[]'
'sbg:x': -1017.7406616210938
'sbg:y': -230.76498413085938
- id: do_smooth
type: boolean
'sbg:x': -892.199951171875
'sbg:y': 63.25977325439453
- id: propagate_solutions
type: boolean
'sbg:x': -862.6722412109375
'sbg:y': -476.848876953125
- id: flagunconverged
type: boolean
'sbg:x': -719.998046875
'sbg:y': 88.66199493408203
- id: refAnt
type: string?
'sbg:x': -468.52337646484375
......@@ -33,53 +21,10 @@ outputs:
'sbg:x': 481.69647216796875
'sbg:y': -386.3322448730469
steps:
- id: smooth_corrected
in:
- id: msin
source: msin
- id: do_smooth
source: do_smooth
- id: in_column_name
default: CORRECTED_DATA
- id: out_column
default: SMOOTHED_DATA
out:
- id: msout
run: ../steps/blsmooth.cwl
label: smooth_corrected
scatter:
- msin
'sbg:x': -773.8645629882812
'sbg:y': -111.44158172607422
- id: calib_cal
in:
- id: msin
source: smooth_corrected/msout
- id: msin_modelcolum
default: SMOOTHED_DATA
- id: output_name_h5parm
default: output.h5
- id: propagate_solutions
source: propagate_solutions
- id: flagunconverged
default: true
source: flagunconverged
- id: flagdivergedonly
default: true
out:
- id: msout
- id: h5parm
run: ../lofar-cwl/steps/calib_rot_diag.cwl
scatter:
- msin
'sbg:x': -568.359130859375
'sbg:y': -151.39132690429688
- id: h5imp_cal_FR
in:
- id: h5parmFiles
linkMerge: merge_flattened
source:
- calib_cal/h5parm
- id: squeeze
default: true
- id: verbose
......
class: Workflow
cwlVersion: v1.0
id: ionosphere
label: ionosphere
$namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
'sbg:x': -590.3988647460938
'sbg:y': -21.5
- id: propagate_solutions
type: boolean
'sbg:x': -482.39886474609375
'sbg:y': -260.5
- id: flagunconverged
type: boolean
'sbg:x': -559.3988647460938
'sbg:y': 118.5
- id: do_smooth
type: boolean
'sbg:x': -420.39886474609375
'sbg:y': 229.5
outputs:
- id: outh5parm
outputSource:
- h5exp_cal_ion/outh5parm
type: File
'sbg:x': 558.2401123046875
'sbg:y': -60.5
steps:
- id: smooth_calibrate
in:
- id: msin
source:
- msin
- id: mode
default: diagonal
- id: propagate_solutions
source: propagate_solutions
- id: flagunconverged
source: flagunconverged
- id: do_smooth
source: do_smooth
out:
- id: h5parm
run: ./smooth_calibrate.cwl
label: smooth_calibrate
'sbg:x': -225
'sbg:y': -14
- id: h5parm_collector
in:
- id: h5parmFiles
source:
- smooth_calibrate/h5parm
- id: squeeze
default: true
- id: verbose
default: true
- id: clobber
default: true
out:
- id: outh5parm
- id: log
run: ../lofar-cwl/steps/H5ParmCollector.cwl
label: h5imp_cal_ion
'sbg:x': -42
'sbg:y': -19
- id: losoto_ion
in:
- id: input_h5parm
source: h5parm_collector/outh5parm
out:
- id: output_h5parm
run: ./losoto_ion.cwl
label: losoto_ion
'sbg:x': 140
'sbg:y': -34
- id: h5exp_cal_ion
in:
- id: h5parmFiles
source:
- losoto_ion/output_h5parm
- id: outh5parmname
default: cal_solutions.h5
- id: squeeze
default: true
- id: verbose
default: true
out:
- id: outh5parm
- id: log
run: ../lofar-cwl/steps/H5ParmCollector.cwl
label: h5exp_cal_ion
'sbg:x': 352
'sbg:y': -31
requirements:
- class: SubworkflowFeatureRequirement
class: Workflow
cwlVersion: v1.0
id: losoto_ion
label: losoto_ion
$namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
- id: input_h5parm
type: File
'sbg:x': -588.3988647460938
'sbg:y': -147.5
- id: fit3rdorder
type: boolean?
'sbg:x': 83.60113525390625
'sbg:y': 53.5
- id: refAnt
type: string?
'sbg:x': 500.74346923828125
'sbg:y': -382.8847351074219
- id: maxStddev
type: float?
'sbg:x': 374.1950988769531
'sbg:y': -308.9609069824219
outputs:
- id: output_h5parm
outputSource:
- losoto_flagstation/output_h5parm
type: File
'sbg:x': 775
'sbg:y': -169
steps:
- id: flag
in:
- id: input_h5parm
source: input_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
'sbg:x': -442.3984375
'sbg:y': -138.5
- id: flagextend
in:
- id: input_h5parm
source: flag/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': -255
'sbg:y': -160
- 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': -94
'sbg:y': -162
- id: duplicatePbkp
in:
- id: input_h5parm
source: merge/output_h5parm
- id: soltab
default: sol000/phase000
- id: soltabOut
default: phaseOrig
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
'sbg:x': 69
'sbg:y': -162
- id: losoto_flagstation
in:
- id: input_h5parm
source: losoto_residual/output_h5parm
- id: soltab
default: sol000/phase000
- id: maxStddev
source: maxStddev
- id: refAnt
source: refAnt
- id: soltabExport
default: clock
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.FlagStation.cwl
'sbg:x': 587
'sbg:y': -172
- id: losoto_clocktec
in:
- id: input_h5parm
source: duplicatePbkp/output_h5parm
- id: soltab
default: sol000/phase000
- id: clocksoltabOut
default: clock
- id: tecsoltabOut
default: tec
- id: offsetsoltabOut
default: phase_offset
- id: tec3rdsoltabOut
default: tec3rd
- id: combinePol
default: true
- id: fit3rdorder
source: fit3rdorder
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.ClockTec.cwl
'sbg:x': 217.72296142578125
'sbg:y': -230.69259643554688
- id: losoto_residual
in:
- id: input_h5parm
source: losoto_clocktec/output_h5parm
- id: soltab
default: sol000/phase000
- id: soltabsToSub
source:
- fit3rdorder
valueFrom: '$(self ? ["tec", "clock", "tec3rd"] : ["tec", "clock"])'
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Residual.cwl
'sbg:x': 411.0426330566406
'sbg:y': -168.98934936523438
requirements: []
class: Workflow
cwlVersion: v1.0
id: smooth_calibrate
label: smooth_calibrate
$namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
'sbg:x': -684
'sbg:y': -41
- id: mode
type:
type: enum
symbols:
- scalarcomplexgain
- scalarphase
- scalaramplitude
- tec
- tecandphase
- fulljones
- diagonal
- phaseonly
- amplitudeonly
- rotation
- rotation+diagonal
name: mode
'sbg:x': -431
'sbg:y': 145
- id: propagate_solutions
type: boolean
'sbg:x': -265.89886474609375
'sbg:y': -222.5
- id: flagunconverged
type: boolean
'sbg:x': -300
'sbg:y': 234
- id: do_smooth
type: boolean
'sbg:x': -674.8988647460938
'sbg:y': 185.5
outputs:
- id: h5parm
outputSource:
- calib_cal/h5parm
type: File[]
'sbg:x': 104.91718292236328
'sbg:y': -19.33123779296875
steps:
- id: blsmooth
in:
- id: msin
source: msin
- id: do_smooth
source: do_smooth
- id: in_column_name
default: DATA
- id: out_column
default: SMOOTHED_DATA
- id: restore
default: true
out:
- id: msout
run: ../steps/blsmooth.cwl
label: smooth_corrected
scatter:
- msin
scatterMethod: flat_crossproduct
'sbg:x': -394
'sbg:y': -29
- id: calib_cal
in:
- id: msin
source: blsmooth/msout
- id: msin_datacolumn
default: SMOOTHED_DATA
- id: propagate_solutions
source: propagate_solutions
- id: flagunconverged
source: flagunconverged
- id: flagdivergedonly
default: true
- id: mode
source: mode
out:
- id: msout
- id: h5parm
run: ../lofar-cwl/steps/ddecal.cwl
scatter:
- msin
'sbg:x': -124
'sbg:y': -43
requirements:
- class: ScatterFeatureRequirement
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment