diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index 101392e71b433db42dcba5d45c3a6bf993211d55..68aa2090a1d927b945c4978296c6b29ba1f14e18 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -154,7 +154,7 @@ inputs:
'sbg:x': -1000
'sbg:y': 1100
- id: min_separation
- type: int?
+ type: float?
default: 30
'sbg:x': -1000
'sbg:y': 1200
@@ -194,42 +194,42 @@ inputs:
'sbg:x': -1000
'sbg:y': 1900
outputs:
- - id: msout
+ - id: check_Ateam_separation.png
outputSource:
- - prefactor/msout
- type: 'Directory[]'
- 'sbg:x': 289.5600891113281
- 'sbg:y': -144.01869201660156
+ - 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
outputSource:
- prefactor/make_sourcedb_ateam.log
type: File?
- 'sbg:x': 317.4496154785156
- 'sbg:y': 9.373631477355957
+ 'sbg:x': 1000
+ 'sbg:y': -100
+ - id: msout
+ outputSource:
+ - prefactor/msout
+ type: 'Directory[]'
+ 'sbg:x': 1000
+ 'sbg:y': 0
- id: logfile_prep_cal
outputSource:
- prefactor/logfile_prep_cal
type: 'File[]?'
- 'sbg:x': 315.0741882324219
- 'sbg:y': 180.26284790039062
- - id: check_Ateam_separation.png
- outputSource:
- - prefactor/check_Ateam_separation.png
- type: 'File[]?'
- 'sbg:x': 287.6455078125
- 'sbg:y': 344.1313171386719
- - id: check_Ateam_separation.log
- outputSource:
- - prefactor/check_Ateam_separation.log
- type: 'File[]?'
- 'sbg:x': 315.5941467285156
- 'sbg:y': 494.9656982421875
+ 'sbg:x': 1000
+ 'sbg:y': 100
- id: parset
outputSource:
- prefactor/parset
type: 'File[]'
- 'sbg:x': 293.33331298828125
- 'sbg:y': -305.4627990722656
+ 'sbg:x': 1000
+ 'sbg:y': 200
steps:
- id: prefactor
in:
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 5eeb2026640386bb2ccc842f6d67a26a69ede115..897ed9e0f6d9f1148581ae5c3315499e4dfa96b7 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -55,45 +55,82 @@ inputs:
'sbg:x': -89
'sbg:y': -276
- id: min_separation
- type: int
- default: 20
- 'sbg:x': -638.4987182617188
- 'sbg:y': 31.238996505737305
- - id: A-Team_sky_model
- type: string
- 'sbg:x': -889.9927978515625
- 'sbg:y': -845.9927978515625
+ type: float?
+ default: 30
+ 'sbg:x': -1000
+ 'sbg:y': 1100
+ - id: max_separation_arcmin
+ type: float?
+ default: 1
+ 'sbg:x': -1000
+ 'sbg:y': 1200
+ - id: calibrator_path_skymodel
+ type: Directory?
+ default: /data/skymodels
+ 'sbg:x': -1000
+ 'sbg:y': 1300
+ - id: A-Team_skymodel
+ type: File?
+ default: /data/skymodels/Ateam_LBA_CC.skymodel
+ 'sbg:x': -1000
+ 'sbg:y': 1400
+ - id: cal_solutions
+ type: string?
+ default: cal_solutions.h5
+ 'sbg:x': -1000
+ 'sbg:y': 1500
+ - id: avg_timeresolution
+ type: float?
+ default: 4
+ 'sbg:x': -1000
+ 'sbg:y': 1600
+ - id: avg_freqresolution
+ type: string?
+ default: 48.82kHz
+ 'sbg:x': -1000
+ 'sbg:y': 1700
+ - id: bandpass_freqresolution
+ type: string?
+ default: 195.3125kHz
+ '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: ndppp_prep_cal
in:
@@ -110,6 +147,17 @@ steps:
source: memoryperc
- id: raw_data
source: raw_data
+<<<<<<< HEAD
+=======
+ - id: demix_sources
+ source: demix_sources
+ - id: demix_target
+ source: demix_target
+ - id: demix_freqstep
+ source: demix_freqstep
+ - id: demix_timestep
+ source: demix_timestep
+>>>>>>> 7106ebf374d0653a881c8371a38edc570f793378
- id: demix
source: demix
- id: msin
@@ -128,6 +176,7 @@ steps:
label: ndppp_prep_cal
scatter:
- msin
+<<<<<<< HEAD
'sbg:x': -359
'sbg:y': -519
- id: aoflagger
@@ -210,6 +259,11 @@ steps:
label: make_sourcedb_ateam
'sbg:x': -628.7400512695312
'sbg:y': -847.117919921875
+=======
+ 'sbg:x': 0
+ 'sbg:y': 0
+
+>>>>>>> 7106ebf374d0653a881c8371a38edc570f793378
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator_test.cwl b/workflows/prefactor_calibrator_test.cwl
index aa2db155ed3737bf1ca408c3a0b8e1810058b5c7..08071da2c0ebb82228f8440527c43970a95fdb39 100644
--- a/workflows/prefactor_calibrator_test.cwl
+++ b/workflows/prefactor_calibrator_test.cwl
@@ -5,110 +5,154 @@ label: prefactor_calibrator
$namespaces:
sbg: 'https://www.sevenbridges.com/'
inputs:
+ - id: msin
+ type: 'Directory[]'
+ 'sbg:x': -1000
+ 'sbg:y': -800
+ - id: filter_baselines
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': -700
- id: raw_data
type: boolean
- 'sbg:x': -634
- 'sbg:y': -688
+ 'sbg:x': -1000
+ 'sbg:y': -600
- id: demix
type: boolean
- 'sbg:x': -639
- 'sbg:y': -206.68032836914062
- - id: msin
- type: 'Directory[]'
- 'sbg:x': -635
- 'sbg:y': -543
+ 'sbg:x': -1000
+ 'sbg:y': -500
- id: memoryperc
type: int
- 'sbg:x': -634
- 'sbg:y': -411
- - id: baselines_to_flag
+ 'sbg:x': -1000
+ 'sbg:y': -400
+ - id: flag_baselines
type: 'string[]'
- 'sbg:x': -635
- 'sbg:y': -100.83224487304688
+ 'sbg:x': -1000
+ 'sbg:y': -300
+ - 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: int
+ 'sbg:x': -1000
+ 'sbg:y': 100
+ - id: demix_freqstep
+ type: int
+ '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': -1000
+ 'sbg:y': 400
- id: min_separation
type: float?
- 'sbg:x': -638.4987182617188
- 'sbg:y': 31.238996505737305
- - id: A-Team_sky_model
+ '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: skymodel
- source: make_sourcedb/sourcedb
+ - id: memoryperc
+ default: 20
+ source: memoryperc
+ - id: baselines_to_flag
+ default: []
+ source: flag_baselines
- id: timeresolution
- source: timeresolution
+ default: 1.
+ source: avg_timeresolution
- id: freqresolution
- source: 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
out:
- id: msout
- id: logfile
@@ -117,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
@@ -131,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
@@ -142,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