diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index a763d790152b3534ec925d4ddbe8baaf6118bd06..f552e635e89dee356ee1993dec05bc8614104b19 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -189,10 +189,16 @@ inputs:
'sbg:x': -1000
'sbg:y': 1800
outputs:
- - id: msout
+ - id: check_Ateam_separation.png
outputSource:
- - prefactor/msout
- type: 'Directory[]'
+ - prefactor/check_Ateam_separation.png
+ type: 'File[]?'
+ 'sbg:x': 1000
+ 'sbg:y': -300
+ - id: check_Ateam_separation.log
+ outputSource:
+ - prefactor/check_Ateam_separation.log
+ type: 'File[]?'
'sbg:x': 1000
'sbg:y': -200
- id: make_sourcedb_ateam.log
@@ -201,30 +207,24 @@ outputs:
type: File?
'sbg:x': 1000
'sbg:y': -100
- - id: logfile_prep_cal
+ - id: msout
outputSource:
- - prefactor/logfile_prep_cal
- type: 'File[]?'
+ - prefactor/msout
+ type: 'Directory[]'
'sbg:x': 1000
'sbg:y': 0
- - id: check_Ateam_separation.png
+ - id: logfile_prep_cal
outputSource:
- - prefactor/check_Ateam_separation.png
+ - prefactor/logfile_prep_cal
type: 'File[]?'
'sbg:x': 1000
'sbg:y': 100
- - id: check_Ateam_separation.log
- outputSource:
- - prefactor/check_Ateam_separation.log
- type: 'File[]?'
- 'sbg:x': 1000
- 'sbg:y': 200
- id: parset
outputSource:
- prefactor/parset
type: 'File[]'
'sbg:x': 1000
- 'sbg:y': 300
+ 'sbg:y': 200
steps:
- id: prefactor
in:
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 31e959bb7b733737f5464b3dfb2ea04a2d6dc5dd..8d3ce43b28e3434cde8190c864b86cc1bedd3878 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -189,36 +189,42 @@ inputs:
'sbg:x': -1000
'sbg:y': 1800
outputs:
- - id: outh5parm
+ - id: check_Ateam_separation.png
outputSource:
- - h5parm_collector/outh5parm
- type: File
- 'sbg:x': 477
- 'sbg:y': -546.076171875
- - id: log
+ - prep/check_Ateam_separation.png
+ type: 'File[]?'
+ 'sbg:x': 1000
+ 'sbg:y': -300
+ - id: check_Ateam_separation.log
outputSource:
- - h5parm_collector/log
- type: File
- 'sbg:x': 481.1239318847656
- 'sbg:y': -368.0228576660156
- - id: output_imag
+ - prep/check_Ateam_separation.log
+ type: 'File[]?'
+ 'sbg:x': 1000
+ 'sbg:y': -200
+ - id: make_sourcedb_ateam.log
outputSource:
- - check_ateam_separation/output_imag
+ - prep/make_sourcedb_ateam.log
type: File?
- 'sbg:x': 486.94464111328125
- 'sbg:y': -5.156437873840332
- - id: logfile
+ 'sbg:x': 1000
+ 'sbg:y': -100
+ - id: msout
outputSource:
- - check_ateam_separation/logfile
- type: File?
- 'sbg:x': 492.1335754394531
- 'sbg:y': 133
- - id: log_1
+ - prep/msout
+ type: 'Directory[]'
+ 'sbg:x': 1000
+ 'sbg:y': 0
+ - id: logfile_prep_cal
outputSource:
- - make_sourcedb/log
- type: File?
- 'sbg:x': 495.6245422363281
- 'sbg:y': -1257.4857177734375
+ - prep/logfile_prep_cal
+ type: 'File[]?'
+ 'sbg:x': 1000
+ 'sbg:y': 100
+ - id: parset
+ outputSource:
+ - prep/parset
+ type: 'File[]'
+ 'sbg:x': 1000
+ 'sbg:y': 200
steps:
- id: prep
in:
@@ -270,8 +276,8 @@ steps:
label: prep
scatter:
- msin
- 'sbg:x': -359
- 'sbg:y': -519
+ 'sbg:x': 0
+ 'sbg:y': 0
requirements:
- class: SubworkflowFeatureRequirement
diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl
index 5cff3afa51658647e44d86d9935cd3cbfe319d6e..97fbc9d320e9a4216690fab75ff39cd76c33ec06 100644
--- a/workflows/prefactor_calibrator/prep.cwl
+++ b/workflows/prefactor_calibrator/prep.cwl
@@ -9,118 +9,150 @@ inputs:
type: 'Directory[]'
'sbg:x': -1000
'sbg:y': -800
- - id: flag_baselines
- type: 'string[]'
+ - id: filter_baselines
+ type: string
'sbg:x': -1000
'sbg:y': -700
- - id: process_baselines_cal
- type: string
+ - id: raw_data
+ type: boolean
'sbg:x': -1000
'sbg:y': -600
- - id: filter_baselines
- type: string
+ - id: demix
+ type: boolean
'sbg:x': -1000
'sbg:y': -500
- - id: do_smooth
- type: boolean
+ - id: memoryperc
+ type: int
'sbg:x': -1000
'sbg:y': -400
- - id: raw_data
- type: boolean
+ - id: flag_baselines
+ type: 'string[]'
'sbg:x': -1000
'sbg:y': -300
- - id: demix
+ - id: avg_timeresolution
+ type: float
+ 'sbg:x': -1000
+ 'sbg:y': -200
+ - id: avg_freqresolution
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': -100
+ - id: process_baselines_cal
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': 0
+ - id: demix_timestep
+ type: float
+ 'sbg:x': -1000
+ 'sbg:y': 100
+ - id: demix_freqstep
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': 100
+ - id: demix_target
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': 200
+ - id: demix_sources
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': 300
+ - id: do_smooth
type: boolean
- 'sbg:x': -639
- 'sbg:y': -206.68032836914062
- - id: memoryperc
- type: int
- 'sbg:x': -634
- 'sbg:y': -411
+ 'sbg:x': -1000
+ 'sbg:y': 400
- id: min_separation
type: float?
- 'sbg:x': -638.4987182617188
- 'sbg:y': 31.238996505737305
+ 'sbg:x': -1000
+ 'sbg:y': 500
- id: A-Team_skymodel
default: /data/skymodels/Ateam_LBA_CC.skymodel
type:
- string?
- File?
- 'sbg:x': -889
- 'sbg:y': -983.5078735351562
- - id: timeresolution
- type: float
- 'sbg:x': -634.4667358398438
- 'sbg:y': -817.0217895507812
- - id: freqresolution
- type: string
- 'sbg:x': -641.6406860351562
- 'sbg:y': -298.1281433105469
+ 'sbg:x': -1000
+ 'sbg:y': 600
+
outputs:
- id: check_Ateam_separation.png
outputSource:
- check_ateam_separation/output_imag
type: 'File[]?'
- 'sbg:x': 68.06497955322266
- 'sbg:y': -3.1985559463500977
+ 'sbg:x': 1000
+ 'sbg:y': -300
- id: check_Ateam_separation.log
outputSource:
- check_ateam_separation/logfile
type: 'File[]?'
- 'sbg:x': 83.07220458984375
- 'sbg:y': 136.60289001464844
+ 'sbg:x': 1000
+ 'sbg:y': -200
- id: make_sourcedb_ateam.log
outputSource:
- make_sourcedb/log
type: File?
- 'sbg:x': 71.66065216064453
- 'sbg:y': -880.4981689453125
+ 'sbg:x': 1000
+ 'sbg:y': -100
- id: msout
outputSource:
- ndppp_prep_cal/msout
type: 'Directory[]'
- 'sbg:x': 52.33274459838867
- 'sbg:y': -546.0951538085938
+ 'sbg:x': 1000
+ 'sbg:y': 0
- id: logfile_prep_cal
outputSource:
- ndppp_prep_cal/logfile
type: 'File[]?'
- 'sbg:x': 43.325523376464844
- 'sbg:y': -371.35504150390625
+ 'sbg:x': 1000
+ 'sbg:y': 100
- id: parset
outputSource:
- ndppp_prep_cal/parset
type: 'File[]'
- 'sbg:x': 49.54720687866211
- 'sbg:y': -680.8679809570312
+ 'sbg:x': 1000
+ 'sbg:y': 200
steps:
- id: ndppp_prep_cal
in:
- - id: baselines_to_flag
- default: []
+ - id: msin
+ linkMerge: merge_flattened
source:
- - baselines_to_flag
- - id: elevation_to_flag
- default: 0deg..20deg
- - id: min_amplitude_to_flag
- default: 1.e-30
- - id: memoryperc
- default: 20
- source: memoryperc
+ - msin
+ - id: filter_baselines
+ source: filter_baselines
+ default: "*"
- id: raw_data
+ default: false
source: raw_data
- id: demix
+ default: false
source: demix
- - id: msin
- linkMerge: merge_flattened
- source:
- - msin
+ - id: memoryperc
+ default: 20
+ source: memoryperc
+ - id: baselines_to_flag
+ default: []
+ source: flag_baselines
+ - id: avg_timeresolution
+ default: 1.
+ source: avg_timeresolution
+ - id: avg_freqresolution
+ default: "12.21kHz"
+ source: avg_freqresolution
+ - id: process_baselines_cal
+ default: "*"
+ source: process_baselines_cal
+ - id: demix_freqstep
+ default: 1
+ source: demix_freqstep
+ - id: demix_timestep
+ default: 1
+ source: demix_timestep
+ - id: demix_target
+ source: demix_target
+ - id: demix_sources
+ source: demix_sources
- id: skymodel
source: make_sourcedb/sourcedb
- - id: timeresolution
- source: timeresolution
- - id: freqresolution
- source: freqresolution
out:
- id: msout
- id: logfile
@@ -129,8 +161,8 @@ steps:
label: ndppp_prep_cal
scatter:
- msin
- 'sbg:x': -359
- 'sbg:y': -519
+ 'sbg:x': 0
+ 'sbg:y': 0
- id: check_ateam_separation
in:
- id: ms
@@ -143,8 +175,8 @@ steps:
- id: logfile
run: ../../lofar-cwl/steps/check_ateam_separation.cwl
label: check_Ateam_separation
- 'sbg:x': -331.452392578125
- 'sbg:y': 23.596216201782227
+ 'sbg:x': 0
+ 'sbg:y': -300
- id: make_sourcedb
in:
- id: sky_model
@@ -154,8 +186,8 @@ steps:
- id: log
run: ../../lofar-cwl/steps/makesourcedb.cwl
label: make_sourcedb_ateam
- 'sbg:x': -647.0108642578125
- 'sbg:y': -981.3153076171875
+ 'sbg:x': -500
+ 'sbg:y': 300
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement