diff --git a/lofar-cwl/steps/Ateamclipper.cwl b/lofar-cwl/steps/Ateamclipper.cwl
index a9fad9dc64fff92dad989ddbe5ccba0333270d53..fcd186610e3742aebae0fb1f41a6d1efb12310f4 100755
--- a/lofar-cwl/steps/Ateamclipper.cwl
+++ b/lofar-cwl/steps/Ateamclipper.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: check_ateam_separation
baseCommand:
- Ateamclipper.py
diff --git a/lofar-cwl/steps/DP3.DemixerStepGenerator.cwl b/lofar-cwl/steps/DP3.DemixerStepGenerator.cwl
index 56672e50f16786d8f562d5efa9eed404653c8c37..69773455d377f7a4d135a898c55eb6f05232a881 100755
--- a/lofar-cwl/steps/DP3.DemixerStepGenerator.cwl
+++ b/lofar-cwl/steps/DP3.DemixerStepGenerator.cwl
@@ -2,8 +2,6 @@
class: Workflow
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: demix_step_generator
inputs:
diff --git a/lofar-cwl/steps/DP3.Execute.cwl b/lofar-cwl/steps/DP3.Execute.cwl
index 6c8c471cb636ee4307eccc5de5249229cc8dad29..0aaac69c6de3ed7b7b3101ce303452c86fc31ff0 100644
--- a/lofar-cwl/steps/DP3.Execute.cwl
+++ b/lofar-cwl/steps/DP3.Execute.cwl
@@ -2,57 +2,37 @@ class: Workflow
cwlVersion: v1.2
id: dp3_execute
label: DP3.Execute
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msout_name
type: string
- 'sbg:x': -425.39886474609375
- 'sbg:y': 127
- id: msin
type: Directory
- 'sbg:x': -254.39886474609375
- 'sbg:y': 242
- id: steps
type: 'Any[]?'
- 'sbg:x': -518.3988647460938
- 'sbg:y': -88
- id: autoweight
type: boolean
default: true
- 'sbg:x': -113
- 'sbg:y': 290
outputs:
- id: secondary_output_files
outputSource:
- dppp/secondary_output_files
type: Any
- 'sbg:x': 213.60113525390625
- 'sbg:y': -184
- id: secondary_output_directories
outputSource:
- dppp/secondary_output_directories
type: Any
- 'sbg:x': 248.60113525390625
- 'sbg:y': -47
- id: msout
outputSource:
- dppp/msout
type: Directory
- 'sbg:x': 224.60113525390625
- 'sbg:y': 130
- id: logfile
outputSource:
- dppp/logfile
type: 'File[]'
- 'sbg:x': 185.1875
- 'sbg:y': 334.5
- id: parset
outputSource:
- generic_step/parset
type: File
- 'sbg:x': 11.1875
- 'sbg:y': -299.5
steps:
- id: generic_step
in:
@@ -66,8 +46,6 @@ steps:
- id: output_file_names
- id: output_directory_names
run: ./DP3.ParsetGenerator.cwl
- 'sbg:x': -294
- 'sbg:y': -84
- id: dppp
in:
- id: parset
@@ -94,6 +72,4 @@ steps:
- id: secondary_output_directories
- id: logfile
run: ./DPPP.cwl
- 'sbg:x': 26
- 'sbg:y': -46
requirements: []
diff --git a/lofar-cwl/steps/DP3.FilterStepGenerator.cwl b/lofar-cwl/steps/DP3.FilterStepGenerator.cwl
index 229dae0523fcd8c63a8b376486ab4be2afc51d93..1b21d248a091113e43469a49f4239baa8a19027c 100644
--- a/lofar-cwl/steps/DP3.FilterStepGenerator.cwl
+++ b/lofar-cwl/steps/DP3.FilterStepGenerator.cwl
@@ -2,8 +2,6 @@
class: Workflow
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: dp3-filter-step-generator
inputs:
diff --git a/lofar-cwl/steps/DPPP.cwl b/lofar-cwl/steps/DPPP.cwl
index 64b97ba840b9c5ec41cac782d642ca5b1e0f0acb..7723f030d17b40c59e6f3a05613553e4e606903e 100755
--- a/lofar-cwl/steps/DPPP.cwl
+++ b/lofar-cwl/steps/DPPP.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: dppp
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/H5ParmCollector.cwl b/lofar-cwl/steps/H5ParmCollector.cwl
index 0576951a8431ef134f999cdbbcaa16661fd4ca4a..04f836df64f78ac5b0132aa091274c971b9727b4 100755
--- a/lofar-cwl/steps/H5ParmCollector.cwl
+++ b/lofar-cwl/steps/H5ParmCollector.cwl
@@ -1,7 +1,6 @@
class: CommandLineTool
cwlVersion: v1.2
$namespaces:
- sbg: 'https://www.sevenbridges.com/'
lofar: https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl
$schema:
- https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl
diff --git a/lofar-cwl/steps/LoSoTo.PrefactorBandpass.cwl b/lofar-cwl/steps/LoSoTo.PrefactorBandpass.cwl
index 9d9c546ed01c86c373b0093c17910a97bf95cdb5..80668ac78d1945cc87de2da59c8fb45f0ef9403e 100644
--- a/lofar-cwl/steps/LoSoTo.PrefactorBandpass.cwl
+++ b/lofar-cwl/steps/LoSoTo.PrefactorBandpass.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: losoto_prefactor_bandpass
baseCommand:
- losoto
diff --git a/lofar-cwl/steps/LoSoTo.PrefactorXYoffset.cwl b/lofar-cwl/steps/LoSoTo.PrefactorXYoffset.cwl
index 61fab155063823987b845b18c89b6c2e6fae813b..9ad58471ed01f4ea4ecea58e8c4efe9a507d1dc1 100644
--- a/lofar-cwl/steps/LoSoTo.PrefactorXYoffset.cwl
+++ b/lofar-cwl/steps/LoSoTo.PrefactorXYoffset.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: losoto_prefactor_xyoffset
baseCommand:
- losoto
diff --git a/lofar-cwl/steps/applybeam.cwl b/lofar-cwl/steps/applybeam.cwl
index 3d3fb93b28feb35d0e1aeb10ba1e3ec5e5073638..5537940c6a1a70fd73a46f419023b09020e61b00 100644
--- a/lofar-cwl/steps/applybeam.cwl
+++ b/lofar-cwl/steps/applybeam.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: applybeam
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/applycal.cwl b/lofar-cwl/steps/applycal.cwl
index 00524676f801ffe5b135607eff8cd596ab1b9a87..97a6f22977e566b75016dfd962823906553b2319 100644
--- a/lofar-cwl/steps/applycal.cwl
+++ b/lofar-cwl/steps/applycal.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: applycal
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/applytarget.cwl b/lofar-cwl/steps/applytarget.cwl
index 87214eb0e0038e396b107cd5a158f9da05ebabad..f12733a1896536b8ae452be87aba76a435c3fb03 100644
--- a/lofar-cwl/steps/applytarget.cwl
+++ b/lofar-cwl/steps/applytarget.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: applytarget
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/average.cwl b/lofar-cwl/steps/average.cwl
index af9cb7ec725ebf75ba517e5fc4444f0528d24f7c..8990ba9c57c216f345f911d89e46b9c132692b7f 100644
--- a/lofar-cwl/steps/average.cwl
+++ b/lofar-cwl/steps/average.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: average
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/calib_rot_diag.cwl b/lofar-cwl/steps/calib_rot_diag.cwl
index 62ab77f1552ea108e2b92e1dd652ffcecf400f93..3a41928338f3e245a0fc046fd691ae9428066899 100644
--- a/lofar-cwl/steps/calib_rot_diag.cwl
+++ b/lofar-cwl/steps/calib_rot_diag.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: calib_rot_diag
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/dpppconcat.cwl b/lofar-cwl/steps/dpppconcat.cwl
index 8d0f288dc016c79a0b7c8fb077471540107e5d2b..4de4ac05016f602c08db913c3af13ae97f09b5e1 100644
--- a/lofar-cwl/steps/dpppconcat.cwl
+++ b/lofar-cwl/steps/dpppconcat.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: dpppconcat
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/filter_predict.cwl b/lofar-cwl/steps/filter_predict.cwl
index 6d9d0fcf07b0f11f7b29eda4c618e874bbc23057..f5449077fa17f16f9bac4f38ff04005e51850da7 100644
--- a/lofar-cwl/steps/filter_predict.cwl
+++ b/lofar-cwl/steps/filter_predict.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: predict
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/gaincal.cwl b/lofar-cwl/steps/gaincal.cwl
index 7560ac719bc0f13f4db0e96da24d997d65bde8c0..bf62f4319e65d127fb65aa1d8317d3245805adca 100644
--- a/lofar-cwl/steps/gaincal.cwl
+++ b/lofar-cwl/steps/gaincal.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: gaincal
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/interpolate_visibilities.cwl b/lofar-cwl/steps/interpolate_visibilities.cwl
index 8eefafcf949a7b90b09f4637d63fa5bac25f5aa8..5ff9017ec41fe76be2f843e222614c8c3d06a592 100644
--- a/lofar-cwl/steps/interpolate_visibilities.cwl
+++ b/lofar-cwl/steps/interpolate_visibilities.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: interpolate_visibilities
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/makesourcedb.cwl b/lofar-cwl/steps/makesourcedb.cwl
index baaa6ddc46517f67eb0c5e709ef5382d9000cbd8..705e0e17ccf28a7cd7059e006df99498dc8bf8a0 100755
--- a/lofar-cwl/steps/makesourcedb.cwl
+++ b/lofar-cwl/steps/makesourcedb.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: make_sourcedb
baseCommand:
- makesourcedb
diff --git a/lofar-cwl/steps/ms_concat.cwl b/lofar-cwl/steps/ms_concat.cwl
index de03fa988e3d6cf70faaf8d6de307639a6e900d0..fdc393f495ddbd63aefc0d2cf3931fdd759b50df 100644
--- a/lofar-cwl/steps/ms_concat.cwl
+++ b/lofar-cwl/steps/ms_concat.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: ms_concat
baseCommand:
- /bin/bash
diff --git a/lofar-cwl/steps/predict.cwl b/lofar-cwl/steps/predict.cwl
index 1b28e1348a964e0dca10c9d621e7da1076bc069a..be4862fa6dd2c69c33344e56ad04f3ade3053074 100644
--- a/lofar-cwl/steps/predict.cwl
+++ b/lofar-cwl/steps/predict.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: predict
baseCommand:
- DP3
diff --git a/lofar-cwl/steps/wsclean.cwl b/lofar-cwl/steps/wsclean.cwl
index 4ae1432edd7362347a38b604bfd45e86b76c371f..d485617906974d88a8cf41947fbf7b387f0b4a51 100644
--- a/lofar-cwl/steps/wsclean.cwl
+++ b/lofar-cwl/steps/wsclean.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: wsclean
baseCommand:
- wsclean
diff --git a/myworkflow.cwl b/myworkflow.cwl
index 96b3e1d129a91e5160d451e673d578badc2eec73..e2f46b7d17a03e3d5e9c38dc60063e53f169305d 100755
--- a/myworkflow.cwl
+++ b/myworkflow.cwl
@@ -2,24 +2,16 @@ class: Workflow
cwlVersion: v1.2
id: myworkflow
label: MyWorkflow
-$namespaces:
- sbg: 'https://www.sevenbridges.com'
inputs:
- id: msin
type: Directory
- 'sbg:x': -379
- 'sbg:y': -172.47381591796875
- id: strategy
type: File?
- 'sbg:x': -555.515625
- 'sbg:y': -628.5
outputs:
- id: msout
outputSource:
- dppp/msout
type: Directory
- 'sbg:x': 108.00761413574219
- 'sbg:y': -379
steps:
- id: dppp
in:
@@ -33,8 +25,6 @@ steps:
out:
- id: msout
run: steps/DPPPStep.cwl
- 'sbg:x': -77.87055969238281
- 'sbg:y': -458.0888366699219
- id: average_step_generator
in:
- id: input_parset
@@ -46,8 +36,6 @@ steps:
- id: output_parset
- id: output_secondary_files
run: steps/AveragingStepGenerator.cwl
- 'sbg:x': -659.6497192382812
- 'sbg:y': -479.365478515625
- id: aoflagger_step_generator
in:
- id: input_parset
@@ -61,15 +49,11 @@ steps:
- id: output_parset
- id: output_secondary_files
run: steps/AOFlaggerStepGenerator.cwl
- 'sbg:x': -393.4390869140625
- 'sbg:y': -485.9670104980469
- id: empty_parset_generator
in: []
out:
- id: output_parset
- id: output_secondary_files
run: steps/EmptyParsetGenerator.cwl
- 'sbg:x': -903.7893676757812
- 'sbg:y': -480.0863037109375
requirements:
- class: MultipleInputFeatureRequirement
diff --git a/steps/add_missing_stations.cwl b/steps/add_missing_stations.cwl
index b3834805b6faad63a8b0e681de03b4922a8d26fa..b2c6b4478485bfea8a4fd9fb742fbfbe1325443f 100644
--- a/steps/add_missing_stations.cwl
+++ b/steps/add_missing_stations.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: add_missing_stations
baseCommand:
- add_missing_stations.py
diff --git a/steps/applybeam.cwl b/steps/applybeam.cwl
index 930b68b2f86c0747fa40790f9a9c966b5f7148a1..510db2b8c236d056919899a60e3aacf877f96e12 100644
--- a/steps/applybeam.cwl
+++ b/steps/applybeam.cwl
@@ -1,103 +1,83 @@
-class: Workflow
+#!/usr/bin/env cwl-runner
+
cwlVersion: v1.2
-id: applybeam
+class: Workflow
label: applybeam
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
+doc: ''
+requirements:
+ - class: SubworkflowFeatureRequirement
inputs:
- - type:
- - 'null'
- - boolean
- id: '#usechannelfreq'
- 'sbg:includeInPorts': true
- 'sbg:x': -491.39886474609375
- 'sbg:y': -275.5
- - type:
- - 'null'
- - boolean
- id: '#updateweights'
- 'sbg:includeInPorts': true
- 'sbg:x': -595.3988647460938
- 'sbg:y': -140.5
- - type:
- - 'null'
- - string
- id: '#onebeamperpatch'
- 'sbg:includeInPorts': true
- 'sbg:x': -609.3988647460938
- 'sbg:y': -22.5
- - type:
- - 'null'
- - boolean
- id: '#invert'
- 'sbg:includeInPorts': true
- 'sbg:x': -568.3988647460938
- 'sbg:y': 102.5
- - type:
- - 'null'
- - string
- id: '#direction'
- 'sbg:includeInPorts': true
- 'sbg:x': -472.39886474609375
- 'sbg:y': 211.5
- - type:
- - type: enum
- symbols:
- - array_factor
- - element
- - default
- name: ''
- id: '#beammode'
- 'sbg:includeInPorts': true
- 'sbg:x': -455
- 'sbg:y': 378
- - type:
- - Directory
- id: '#msin'
- 'sbg:includeInPorts': true
- 'sbg:x': -203
- 'sbg:y': 424
+- id: usechannelfreq
+ type:
+ - 'null'
+ - boolean
+- id: updateweights
+ type:
+ - 'null'
+ - boolean
+- id: onebeamperpatch
+ type:
+ - 'null'
+ - string
+- id: invert
+ type:
+ - 'null'
+ - boolean
+- id: direction
+ type:
+ - 'null'
+ - string
+- id: beammode
+ type:
+ - name: ''
+ type: enum
+ symbols:
+ - array_factor
+ - element
+ - default
+- id: msin
+ type:
+ - Directory
+
outputs:
- - id: '#msout'
- source:
- - '#dp3_execute.msout'
- type:
- - Directory
- 'sbg:x': 429.60113525390625
- 'sbg:y': 267.5
+- id: msout
+ type:
+ - Directory
+ outputSource:
+ - dp3_execute/msout
+
steps:
- - id: '#applybeam_step_generator'
- inputs:
- - id: '#applybeam_step_generator.direction'
- source: '#direction'
- - id: '#applybeam_step_generator.onebeamperpatch'
- source: '#onebeamperpatch'
- - id: '#applybeam_step_generator.usechannelfreq'
- source: '#usechannelfreq'
- - id: '#applybeam_step_generator.updateweights'
- source: '#updateweights'
- - id: '#applybeam_step_generator.invert'
- source: '#invert'
- - id: '#applybeam_step_generator.beammode'
- source: '#beammode'
- outputs:
- - id: '#applybeam_step_generator.augmented_steps'
- run: ../lofar-cwl/steps/DP3.ApplyBeamStepGenerator.cwl
- 'sbg:x': -30
- 'sbg:y': 115
- - id: '#dp3_execute'
- inputs:
- - id: '#dp3_execute.msin'
- source: '#msin'
- - id: '#dp3_execute.steps'
- source:
- - '#applybeam_step_generator.augmented_steps'
- outputs:
- - id: '#dp3_execute.secondary_output_files'
- - id: '#dp3_execute.secondary_output_directories'
- - id: '#dp3_execute.msout'
- run: ../lofar-cwl/steps/DP3.Execute.cwl
- label: DP3.Execute
- 'sbg:x': 208
- 'sbg:y': 127
-doc: ''
+- id: applybeam_step_generator
+ run: ../lofar-cwl/steps/DP3.ApplyBeamStepGenerator.cwl
+ in:
+ - id: direction
+ source: direction
+ - id: onebeamperpatch
+ source: onebeamperpatch
+ - id: usechannelfreq
+ source: usechannelfreq
+ - id: updateweights
+ source: updateweights
+ - id: invert
+ source: invert
+ - id: beammode
+ source: beammode
+ out:
+ - id: augmented_steps
+- id: dp3_execute
+ label: DP3.Execute
+ run: ../lofar-cwl/steps/DP3.Execute.cwl
+ in:
+ - id: msin
+ source: msin
+ - id: msout_name
+ source: msin
+ valueFrom: $(msin.basename)
+ - id: steps
+ source:
+ - applybeam_step_generator/augmented_steps
+ out:
+ - id: secondary_output_files
+ - id: secondary_output_directories
+ - id: msout
+id: applybeam
diff --git a/steps/bulk_rename.cwl b/steps/bulk_rename.cwl
index c827f2672a23d22dedee27219dbcf30699b5730b..d551bdb696f598705f85614260da489e3958cda1 100644
--- a/steps/bulk_rename.cwl
+++ b/steps/bulk_rename.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: bulk_rename
baseCommand:
- bash
diff --git a/steps/check_unflagged_fraction.cwl b/steps/check_unflagged_fraction.cwl
index 71a7bea042fb58b29116ae420961f06e2a894ede..a2bb03bcb03e2cab977e903ce50074f4688b4c22 100644
--- a/steps/check_unflagged_fraction.cwl
+++ b/steps/check_unflagged_fraction.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: check_unflagged_fraction
baseCommand:
- python3
diff --git a/steps/collectlog.cwl b/steps/collectlog.cwl
index ee46b37794502a542c31bd953cac438da37d5276..40c78c211ce99ba9cd6fd3eca20635216ae46386 100644
--- a/steps/collectlog.cwl
+++ b/steps/collectlog.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: collectlog
baseCommand:
- bash
diff --git a/steps/compare_station_list.cwl b/steps/compare_station_list.cwl
index 97279e085bc3ce05a3525c204110f150c16d6cdc..f8e5117c36cf1ce20147c751aacf49d1e430f534 100644
--- a/steps/compare_station_list.cwl
+++ b/steps/compare_station_list.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: compare_station_list
baseCommand:
- python3
diff --git a/steps/concatenate_files.cwl b/steps/concatenate_files.cwl
index 6054d41ad5742ac90bb5064fa307fced0a4d45a9..fa7b040b2716cb5b9c188372ae234fdca8b52dc4 100644
--- a/steps/concatenate_files.cwl
+++ b/steps/concatenate_files.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: concatfiles
baseCommand:
- bash
diff --git a/steps/create_workflow_input.cwl b/steps/create_workflow_input.cwl
index 1e511508d2295a93a25b0b1c66bd8001c19b0421..94a8d3cc1a370680deab49f5c7f60e5168955d73 100644
--- a/steps/create_workflow_input.cwl
+++ b/steps/create_workflow_input.cwl
@@ -1,5 +1,3 @@
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: create_workflow_input
label: create_workflow_input
class: CommandLineTool
diff --git a/steps/directory_listing.cwl b/steps/directory_listing.cwl
index cf869b835d630349fe9b87a9d968e110f2c6585e..fc5bd0d626bec754238bae1f4a8c3e90d45f9c18 100644
--- a/steps/directory_listing.cwl
+++ b/steps/directory_listing.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: directory_listing
baseCommand:
- find
diff --git a/steps/dppp_make_parset_cal.cwl b/steps/dppp_make_parset_cal.cwl
index 5e1dbbf0ebf316165c607cdb636198e2f5b53545..ffa398f73421beb5b846c67ed6019eb5d14edaf8 100755
--- a/steps/dppp_make_parset_cal.cwl
+++ b/steps/dppp_make_parset_cal.cwl
@@ -2,8 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
id: make_parset
label: define_parset
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: raw_data
type: boolean?
diff --git a/steps/dppp_make_parset_target.cwl b/steps/dppp_make_parset_target.cwl
index b61aae344c5c018b0cd27c2257b3bee27af100c6..dd2ab38b53f1de67e1dac6db5bdfadffc47d9c30 100755
--- a/steps/dppp_make_parset_target.cwl
+++ b/steps/dppp_make_parset_target.cwl
@@ -2,8 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
id: make_parset
label: define_parset
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: raw_data
type: boolean?
diff --git a/steps/dppp_prep_cal.cwl b/steps/dppp_prep_cal.cwl
index b6fb9d5a4daa142d958379be06ed51751149e8d9..7652814f837dc1d9f52996e47fb6c766d98ec0f7 100755
--- a/steps/dppp_prep_cal.cwl
+++ b/steps/dppp_prep_cal.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: dppp
baseCommand:
- DP3
diff --git a/steps/dppp_prep_target.cwl b/steps/dppp_prep_target.cwl
index 59c2f962c0a31f58519b441f37831f34543735f0..0992ce8099a064693758c70c1564397dff679e9a 100755
--- a/steps/dppp_prep_target.cwl
+++ b/steps/dppp_prep_target.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: dppp
baseCommand:
- DP3
diff --git a/steps/findRefAnt.cwl b/steps/findRefAnt.cwl
index 2edacaa6244e2cd407596513b1bad65e6b6290eb..4e10061f993bac9392e8c48c09e0adbc16083aad 100644
--- a/steps/findRefAnt.cwl
+++ b/steps/findRefAnt.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: dppp
baseCommand:
- DP3
diff --git a/steps/findRefAnt_join.cwl b/steps/findRefAnt_join.cwl
index 02e5f12eb2bab6223ffcf350cc50fb3a69ef3925..0679989e3c06551e072ccc5c5e64aff5d381023b 100644
--- a/steps/findRefAnt_join.cwl
+++ b/steps/findRefAnt_join.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: findRefAnt_join
baseCommand:
- python3
diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl
index 1a213a826c8fea5a585cebc44a185d79f0af954e..039eb712d773da8918e8d9a7c9a325b4e5eaa0e3 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: find_skymodel_cal_py
baseCommand:
- python3
diff --git a/steps/find_skymodel_target.cwl b/steps/find_skymodel_target.cwl
index fa74d491e3baa0438e5388e10eeab1a5eccef150..1f7e35bf740b7e537ea345feff54c39894f2a415 100644
--- a/steps/find_skymodel_target.cwl
+++ b/steps/find_skymodel_target.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: find_skymodel_target_py
baseCommand:
- python3
diff --git a/steps/get_targetname.cwl b/steps/get_targetname.cwl
index ece04259c3092a8faa5b047a1a185d0457413372..2c39b56a5281a7755ac211e98052db3822382273 100644
--- a/steps/get_targetname.cwl
+++ b/steps/get_targetname.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: get_targetname
baseCommand:
- python3
diff --git a/steps/h5parm_pointingname.cwl b/steps/h5parm_pointingname.cwl
index 95e7e51572d07e548eca1ab4a9ab078c21f28767..be01e508c7151bb955d80d47b5472dd6410c3a02 100644
--- a/steps/h5parm_pointingname.cwl
+++ b/steps/h5parm_pointingname.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: h5parm_pointingname
baseCommand:
- h5parm_pointingname.py
diff --git a/steps/h5parmcat.cwl b/steps/h5parmcat.cwl
index d34a69ae9aa653562691171e350ce1e0b7aaee37..99e9906f34d6a31e42af95ea382cf6046d20ea8f 100644
--- a/steps/h5parmcat.cwl
+++ b/steps/h5parmcat.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: h5parm_cat
baseCommand:
- H5parm_collector.py
diff --git a/steps/identify_bad_antennas.cwl b/steps/identify_bad_antennas.cwl
index 5fe2d44abc290bae7188fdd52c010d750e50a4f9..0127d48abd9187fe0be9eea3ba685d0fcbac7101 100644
--- a/steps/identify_bad_antennas.cwl
+++ b/steps/identify_bad_antennas.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: identify_bad_antennas
baseCommand:
- python3
diff --git a/steps/identify_bad_antennas_join.cwl b/steps/identify_bad_antennas_join.cwl
index f9bc007eb4af91a4739a9405a5cd1dc38588ce7f..e091e1a3219f98551f3ad0cc91c16f157701d95f 100644
--- a/steps/identify_bad_antennas_join.cwl
+++ b/steps/identify_bad_antennas_join.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: identify_bad_antennas_join
baseCommand:
- python3
diff --git a/steps/plot_Ateamclipper.cwl b/steps/plot_Ateamclipper.cwl
index c7d2da897130fb386770993f35a7697cb9001b69..347e6875693a9c464a3f72707d3ad280335e1db3 100644
--- a/steps/plot_Ateamclipper.cwl
+++ b/steps/plot_Ateamclipper.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: plot_Ateamclipper
baseCommand:
- plot_Ateamclipper.py
diff --git a/steps/plot_unflagged.cwl b/steps/plot_unflagged.cwl
index b06a07b6505fd7575a52812d370f538ba2696505..5e742ad9660a293adca3058f3d936546ba0afb3c 100644
--- a/steps/plot_unflagged.cwl
+++ b/steps/plot_unflagged.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: plot_unflagged
baseCommand:
- python3
diff --git a/steps/separate_results_directory.cwl b/steps/separate_results_directory.cwl
index 760e4f20745d19a362eeff42169744250c6b1f64..5d5675082648e359a028848934cfefc905988d4e 100644
--- a/steps/separate_results_directory.cwl
+++ b/steps/separate_results_directory.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: separate_results_directory
baseCommand:
- echo "exploding directory"
diff --git a/steps/sort_times_into_freqGroups.cwl b/steps/sort_times_into_freqGroups.cwl
index fb0e28d1b75532d260b0abf430bb47f94c6daa1f..961210f45cd30991707046eac76ee4c0c840c414 100644
--- a/steps/sort_times_into_freqGroups.cwl
+++ b/steps/sort_times_into_freqGroups.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: sort_times_into_freqGroups
baseCommand:
- python3
diff --git a/steps/stage.cwl b/steps/stage.cwl
index 419d012595b3bf5aff44dc875e8a1fcc35339791..18605ff6654deee02c962e4b942aff9385f75996 100644
--- a/steps/stage.cwl
+++ b/steps/stage.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: stage
baseCommand:
- gfal-legacy-bringonline
diff --git a/steps/structure_function.cwl b/steps/structure_function.cwl
index ca6e74298659c6a313d7f278e7dff2ec7d16082e..296c092c34095f7de21a0efeeeb967d50a335925 100644
--- a/steps/structure_function.cwl
+++ b/steps/structure_function.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: structure_function
baseCommand:
- getStructure_from_phases.py
diff --git a/steps/summary.cwl b/steps/summary.cwl
index 8cdbaf6dee73d4237055b4e82932920b11dc2401..75d011319eabe036611510e15a1337d077958030 100644
--- a/steps/summary.cwl
+++ b/steps/summary.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: summary
baseCommand:
- make_summary_CWL.py
diff --git a/steps/surl_copy.cwl b/steps/surl_copy.cwl
index e9e447eb172f774b309f4b0a6a09f4c28937fa11..02b03c934faa521e2fabccb62ebf66d4dc0f490e 100644
--- a/steps/surl_copy.cwl
+++ b/steps/surl_copy.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: surl_copy
baseCommand:
- gfal-copy
diff --git a/steps/transfer_solutions.cwl b/steps/transfer_solutions.cwl
index fa55fb64720fa016afbecd79ba9dbe866727a3ac..b81e1a9911673a3c63eefbc03ea4b0ebf6a4fc54 100644
--- a/steps/transfer_solutions.cwl
+++ b/steps/transfer_solutions.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: transfer_solutions
baseCommand:
- transfer_solutions.py
diff --git a/steps/uvplot.cwl b/steps/uvplot.cwl
index 41531750307421d59430f4b893d5760f1833796d..e95d7281ffe442089c01f2e67f4bca7de94bddc2 100644
--- a/steps/uvplot.cwl
+++ b/steps/uvplot.cwl
@@ -2,7 +2,6 @@ class: CommandLineTool
cwlVersion: v1.2
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
id: uvplot
baseCommand:
- plot_uvcov.py
diff --git a/subworkflow/apply_calibrate_bp.cwl b/subworkflow/apply_calibrate_bp.cwl
index 113eb874bdbaeb99673101c29092ae21f8d9cab7..fe0065d563efa1023b659580a7402866f21a9e5b 100644
--- a/subworkflow/apply_calibrate_bp.cwl
+++ b/subworkflow/apply_calibrate_bp.cwl
@@ -2,81 +2,53 @@ class: Workflow
cwlVersion: v1.2
id: apply_calibrate
label: apply_calibrate
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: Directory
- 'sbg:x': -1000
- 'sbg:y': -200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 100
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 200
- id: input_h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 300
outputs:
- id: apply_fr.log
outputSource:
- concat_logfiles_applyFR/output
type: File
- 'sbg:x': 1000
- 'sbg:y': -300
- id: final_flags_out
outputSource:
- calib_cal/flagged_fraction_dict
type: string?
- 'sbg:x': 1000
- 'sbg:y': -200
- id: BLsmooth.log
outputSource:
- BLsmooth/logfile
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: apply_cal.log
outputSource:
- concat_logfiles_applyBP/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 0
- id: calib_cal.log
outputSource:
- concat_logfiles_calib_cal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: outh5parm
outputSource:
- calib_cal/h5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 200
- id: apply_pa.log
outputSource:
- concat_logfiles_applyPA/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 300
- id: applybeam.log
outputSource:
- concat_logfiles_applybeam/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 400
steps:
- id: applyPA
in:
@@ -99,8 +71,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applycal.cwl
label: applyPA
- 'sbg:x': -400
- 'sbg:y': 0
- id: applyBP
in:
- id: msin
@@ -124,8 +94,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applycal.cwl
label: applyBP
- 'sbg:x': -200
- 'sbg:y': 0
- id: applybeam
in:
- id: msin
@@ -153,8 +121,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applybeam.cwl
label: applybeam
- 'sbg:x': 0
- 'sbg:y': 0
- id: applyFR
in:
- id: msin
@@ -176,8 +142,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applycal.cwl
label: applyFR
- 'sbg:x': 200
- 'sbg:y': 0
- id: BLsmooth
in:
- id: msin
@@ -191,8 +155,6 @@ steps:
- id: logfile
run: ../steps/blsmooth.cwl
label: BLsmooth
- 'sbg:x': 400
- 'sbg:y': 0
- id: calib_cal
in:
- id: msin
@@ -213,8 +175,6 @@ steps:
- id: flagged_fraction_dict
- id: logfile
run: ../lofar-cwl/steps/ddecal.cwl
- 'sbg:x': 600
- 'sbg:y': 0
- id: concat_logfiles_calib_cal
in:
- id: file_list
@@ -226,8 +186,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_calib_cal
- 'sbg:x': 700
- 'sbg:y': 200
- id: concat_logfiles_applyFR
in:
- id: file_list
@@ -239,8 +197,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applyFR
- 'sbg:x': 400
- 'sbg:y': 200
- id: concat_logfiles_applybeam
in:
- id: file_list
@@ -252,8 +208,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applybeam
- 'sbg:x': 200
- 'sbg:y': 200
- id: concat_logfiles_applyBP
in:
- id: file_list
@@ -265,8 +219,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applyBP
- 'sbg:x': 0
- 'sbg:y': 200
- id: concat_logfiles_applyPA
in:
- id: file_list
@@ -278,6 +230,4 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applyPA
- 'sbg:x': -200
- 'sbg:y': 200
requirements: []
diff --git a/subworkflow/apply_calibrate_fr.cwl b/subworkflow/apply_calibrate_fr.cwl
index 400bac04063fb9751d7680338d6e317525881cf8..e773a0d1004bf0406dced19d016396702df1ba1c 100644
--- a/subworkflow/apply_calibrate_fr.cwl
+++ b/subworkflow/apply_calibrate_fr.cwl
@@ -2,63 +2,41 @@ class: Workflow
cwlVersion: v1.2
id: apply_calibrate
label: apply_calibrate
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: Directory
- 'sbg:x': -1000
- 'sbg:y': -200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 100
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 200
- id: input_h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 300
outputs:
- id: msout
outputSource:
- calib_cal/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': -200
- id: BLsmooth.log
outputSource:
- BLsmooth/logfile
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: apply_cal.log
outputSource:
- concat_logfiles_applycal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 0
- id: calib_cal.log
outputSource:
- concat_logfiles_calib_cal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: outh5parm
outputSource:
- calib_cal/h5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 200
steps:
- id: applyFR
in:
@@ -81,8 +59,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applycal.cwl
label: applyFR
- 'sbg:x': -400
- 'sbg:y': 0
- id: BLsmooth
in:
- id: msin
@@ -96,8 +72,6 @@ steps:
- id: logfile
run: ../steps/blsmooth.cwl
label: BLsmooth
- 'sbg:x': 0
- 'sbg:y': 0
- id: calib_cal
in:
- id: msin
@@ -117,8 +91,6 @@ steps:
- id: h5parm
- id: logfile
run: ../lofar-cwl/steps/ddecal.cwl
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_calib_cal
in:
- id: file_list
@@ -130,8 +102,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_calib_cal
- 'sbg:x': 700
- 'sbg:y': 200
- id: concat_logfiles_applycal
in:
- id: file_list
@@ -143,6 +113,4 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applycal
- 'sbg:x': -200
- 'sbg:y': 200
requirements: []
diff --git a/subworkflow/apply_calibrate_pa.cwl b/subworkflow/apply_calibrate_pa.cwl
index abba30f0818e8ddf106db750535992b35231d02a..23d1ace1c51f722e1c8830a72ccc34d40bffda64 100644
--- a/subworkflow/apply_calibrate_pa.cwl
+++ b/subworkflow/apply_calibrate_pa.cwl
@@ -2,69 +2,45 @@ class: Workflow
cwlVersion: v1.2
id: apply_calibrate
label: apply_calibrate
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: Directory
- 'sbg:x': -1000
- 'sbg:y': -200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 100
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 200
- id: input_h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 300
outputs:
- id: msout
outputSource:
- calib_cal/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': -200
- id: BLsmooth.log
outputSource:
- BLsmooth/logfile
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: apply_cal.log
outputSource:
- concat_logfiles_applycal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 0
- id: calib_cal.log
outputSource:
- concat_logfiles_calib_cal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: outh5parm
outputSource:
- calib_cal/h5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 200
- id: applybeam.log
outputSource:
- concat_logfiles_applybeam/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 300
steps:
- id: applyPA
in:
@@ -87,8 +63,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applycal.cwl
label: applyPA
- 'sbg:x': -400
- 'sbg:y': 0
- id: applybeam
in:
- id: msin_datacolumn
@@ -116,8 +90,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/applybeam.cwl
label: applybeam
- 'sbg:x': -200
- 'sbg:y': 0
- id: BLsmooth
in:
- id: msin
@@ -131,8 +103,6 @@ steps:
- id: logfile
run: ../steps/blsmooth.cwl
label: BLsmooth
- 'sbg:x': 0
- 'sbg:y': 0
- id: calib_cal
in:
- id: msin
@@ -152,8 +122,6 @@ steps:
- id: h5parm
- id: logfile
run: ../lofar-cwl/steps/ddecal.cwl
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_calib_cal
in:
- id: file_list
@@ -165,8 +133,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_calib_cal
- 'sbg:x': 700
- 'sbg:y': 200
- id: concat_logfiles_applybeam
in:
- id: file_list
@@ -178,8 +144,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applybeam
- 'sbg:x': 0
- 'sbg:y': 200
- id: concat_logfiles_applycal
in:
- id: file_list
@@ -191,6 +155,4 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_applycal
- 'sbg:x': -200
- 'sbg:y': 200
requirements: []
diff --git a/subworkflow/apply_calibration.cwl b/subworkflow/apply_calibration.cwl
index c7f66ce5618fc9f140abda80d05f2a93524aa791..4924f5d5d841a99ea0a653f9e2b25d4ff2e9621f 100644
--- a/subworkflow/apply_calibration.cwl
+++ b/subworkflow/apply_calibration.cwl
@@ -2,24 +2,16 @@ class: Workflow
cwlVersion: v1.2
id: apply_calibration
label: apply_calibration
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: parmdb
type: File
- 'sbg:x': -604.3988647460938
- 'sbg:y': -199.5
- id: msin
type: Directory
- 'sbg:x': -679.001220703125
- 'sbg:y': 36
outputs:
- id: msout
outputSource:
- apply_FR/msout
type: Directory
- 'sbg:x': 551.6011352539062
- 'sbg:y': -4.501007080078125
steps:
- id: apply_PA
in:
@@ -36,8 +28,6 @@ steps:
out:
- id: msout
run: ../lofar-cwl/steps/applycal.cwl
- 'sbg:x': -358
- 'sbg:y': 4
- id: apply_bandpass
in:
- id: msin
@@ -55,8 +45,6 @@ steps:
out:
- id: msout
run: ../lofar-cwl/steps/applycal.cwl
- 'sbg:x': -133
- 'sbg:y': -14
- id: apply_FR
in:
- id: msin
@@ -72,8 +60,6 @@ steps:
out:
- id: msout
run: ../lofar-cwl/steps/applycal.cwl
- 'sbg:x': 287
- 'sbg:y': -36
- id: applybeam
in:
- id: updateweights
@@ -88,7 +74,5 @@ steps:
- id: msout
run: ../steps/applybeam.cwl
label: applybeam
- 'sbg:x': 62
- 'sbg:y': -15
requirements:
- class: SubworkflowFeatureRequirement
diff --git a/subworkflow/bandpass.cwl b/subworkflow/bandpass.cwl
index c7c767599f0f77fb48d95e38e835eaa690fa0264..64047a683cb6241b220cb529f31c1209a797350c 100644
--- a/subworkflow/bandpass.cwl
+++ b/subworkflow/bandpass.cwl
@@ -2,45 +2,29 @@ class: Workflow
cwlVersion: v1.2
id: losoto_bandpass
label: losoto_bandpass
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: ampRange
type: 'float[]?'
default: [0, 0]
- 'sbg:x': 397.4866943359375
- 'sbg:y': 73.48989868164062
- id: skipInternational
type: boolean?
default: false
- 'sbg:x': 401.4047546386719
- 'sbg:y': -185.20863342285156
- id: input_h5parm
type: File
- 'sbg:x': 395.389404296875
- 'sbg:y': -51.39104080200195
- id: max2interpolate
type: int?
default: 30
- 'sbg:x': 398.02581787109375
- 'sbg:y': -311.48223876953125
- id: bandpass_freqresolution
type: string?
default: '195.3125kHz'
- 'sbg:x': 404.9237365722656
- 'sbg:y': -440.521484375
- id: avg_freqresolution
type: string?
default: '48.82kHz'
- 'sbg:x': 401.60693359375
- 'sbg:y': 198.58273315429688
outputs:
- id: output_h5parm
outputSource:
- smoothb/output_h5parm
type: File
- 'sbg:x': 2315
- 'sbg:y': -50
- id: logfiles
outputSource:
- duplicateAbkp/log
@@ -55,8 +39,6 @@ outputs:
- smoothb/logfile
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 2315.6181640625
- 'sbg:y': 352.22503662109375
steps:
- id: duplicateAbkp
in:
@@ -70,8 +52,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 600
- 'sbg:y': -50
- id: losoto_flag
in:
- id: input_h5parm
@@ -101,8 +81,6 @@ steps:
- id: log
run: ../lofar-cwl/steps/LoSoTo.Flag.cwl
label: flag
- 'sbg:x': 750
- 'sbg:y': -50
- id: flagbp
in:
- id: input_h5parm
@@ -120,8 +98,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.FlagStation.cwl
- 'sbg:x': 900
- 'sbg:y': -50
- id: flagextend
in:
- id: input_h5parm
@@ -144,8 +120,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Flagextend.cwl
- 'sbg:x': 1050
- 'sbg:y': -50
- id: merge
in:
- id: input_h5parm
@@ -160,8 +134,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Reweight.cwl
- 'sbg:x': 1200
- 'sbg:y': -50
- id: duplicateAbkp2
in:
- id: input_h5parm
@@ -174,8 +146,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 1350
- 'sbg:y': -50
- id: smooth
in:
- id: input_h5parm
@@ -195,8 +165,6 @@ steps:
- id: output_h5parm
- id: logfile
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
- 'sbg:x': 1500
- 'sbg:y': -50
- id: bandpass
in:
- id: input_h5parm
@@ -219,8 +187,6 @@ steps:
- id: output_h5parm
- id: logfile
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
- 'sbg:x': 1650
- 'sbg:y': -50
- id: interp
in:
- id: input_h5parm
@@ -243,8 +209,6 @@ steps:
- id: output_h5parm
- id: logfile
run: ../lofar-cwl/steps/LoSoTo.Interpolate.cwl
- 'sbg:x': 1800
- 'sbg:y': -50
- id: smoothb
in:
- id: input_h5parm
@@ -265,6 +229,4 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
label: smoothb
- 'sbg:x': 1950
- 'sbg:y': -50
requirements: []
diff --git a/subworkflow/calib_cal.cwl b/subworkflow/calib_cal.cwl
index 6c6a82a7ff413787b21e63d4063c63fdbe9639e7..d17d053def527a3f47f85293d2712a353a3aa5cf 100644
--- a/subworkflow/calib_cal.cwl
+++ b/subworkflow/calib_cal.cwl
@@ -2,35 +2,23 @@ class: Workflow
cwlVersion: v1.2
id: calibrate_calibrator
label: calibrate_calibrator
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: Directory
- 'sbg:x': -1000
- 'sbg:y': -100
- id: do_smooth
type: boolean
default: false
- 'sbg:x': -1000
- 'sbg:y': 0
- id: sourcedb
type: File
- 'sbg:x': -1000
- 'sbg:y': 100
outputs:
- id: msout
outputSource:
- predict/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': 0
- id: BLsmooth.log
outputSource:
- BLsmooth/logfile
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
steps:
- id: BLsmooth
in:
@@ -43,8 +31,6 @@ steps:
- id: logfile
run: ../steps/blsmooth.cwl
label: BLsmooth
- 'sbg:x': -500
- 'sbg:y': 0
- id: predict
in:
- id: msin
@@ -56,7 +42,5 @@ steps:
out:
- id: msout
run: ../lofar-cwl/steps/predict.cwl
- 'sbg:x': 0
- 'sbg:y': 0
requirements:
- class: ScatterFeatureRequirement
diff --git a/subworkflow/calib_targ.cwl b/subworkflow/calib_targ.cwl
index 2fc396c8a6fbc4038849234cb25db961a8fecd14..8a90a0659363b122707e808f86c05ed1f1613ce6 100644
--- a/subworkflow/calib_targ.cwl
+++ b/subworkflow/calib_targ.cwl
@@ -2,54 +2,36 @@ class: Workflow
cwlVersion: v1.2
id: calibrate_target
label: calibrate_target
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: Directory
- 'sbg:x': -1000
- 'sbg:y': -200
- id: skymodel
type:
- File
- Directory
- 'sbg:x': -1000
- 'sbg:y': -100
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 0
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 100
outputs:
- id: msout
outputSource:
- calib_targ/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': -200
- id: BLsmooth.log
outputSource:
- BLsmooth/logfile
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: gaincal.log
outputSource:
- concat_logfiles_gaincal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 0
- id: outh5parm
outputSource:
- calib_targ/h5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
steps:
- id: BLsmooth
in:
@@ -66,8 +48,6 @@ steps:
- id: logfile
run: ../steps/blsmooth.cwl
label: BLsmooth
- 'sbg:x': -500
- 'sbg:y': 0
- id: calib_targ
in:
- id: msin
@@ -107,8 +87,6 @@ steps:
- id: h5parm
- id: logfile
run: ../lofar-cwl/steps/gaincal.cwl
- 'sbg:x': 0
- 'sbg:y': 0
- id: concat_logfiles_gaincal
in:
- id: file_list
@@ -120,7 +98,5 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_gaincal
- 'sbg:x': 600
- 'sbg:y': 400
requirements:
- class: MultipleInputFeatureRequirement
diff --git a/subworkflow/clocktec.cwl b/subworkflow/clocktec.cwl
index df429abda5eff4768d38ec57e9e0b1b743cbae5f..834e60dffcd88b81a6275f4d550d071a5716f04f 100644
--- a/subworkflow/clocktec.cwl
+++ b/subworkflow/clocktec.cwl
@@ -2,40 +2,26 @@ class: Workflow
cwlVersion: v1.2
id: losoto_ion
label: losoto_ion
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: input_h5parm
type: File
- 'sbg:x': -700
- 'sbg:y': -400
- id: fit3rdorder
type: boolean?
default: false
- 'sbg:x': -700
- 'sbg:y': -200
- id: refAnt
type: string?
default: 'CS001HBA0'
- 'sbg:x': -700
- 'sbg:y': 0
- id: maxStddev
type: float?
default: -1.0
- 'sbg:x': -700
- 'sbg:y': 200
- id: clock_smooth
type: boolean?
default: true
- 'sbg:x': -700
- 'sbg:y': 400
outputs:
- id: output_h5parm
outputSource:
- losoto_flagstation/output_h5parm
type: File
- 'sbg:x': 1500
- 'sbg:y': 0
- id: logfiles
outputSource:
- duplicatePbkp/log
@@ -46,14 +32,10 @@ outputs:
- losoto_flagstation/log
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1500
- 'sbg:y': -200
- id: parset
outputSource:
- losoto_residual/output_h5parm
type: File
- 'sbg:x': 1500
- 'sbg:y': 200
steps:
- id: duplicatePbkp
in:
@@ -67,8 +49,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 300
- 'sbg:y': 0
- id: losoto_clocktec
in:
- id: input_h5parm
@@ -96,8 +76,6 @@ steps:
- id: parset
- id: log
run: ../lofar-cwl/steps/LoSoTo.ClockTec.cwl
- 'sbg:x': 500
- 'sbg:y': 0
- id: duplicateCbkp
in:
- id: input_h5parm
@@ -110,8 +88,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 700
- 'sbg:y': 0
- id: smooth
in:
- id: input_h5parm
@@ -133,8 +109,6 @@ steps:
- id: output_h5parm
- id: logfile
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
- 'sbg:x': 900
- 'sbg:y': 0
- id: losoto_residual
doc: |
Note: this step uses the OrigClock solutions, to ensure that the
@@ -152,8 +126,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Residual.cwl
- 'sbg:x': 1100
- 'sbg:y': 0
- id: losoto_flagstation
in:
- id: input_h5parm
@@ -172,8 +144,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.FlagStation.cwl
- 'sbg:x': 1300
- 'sbg:y': 0
requirements:
- class: StepInputExpressionRequirement
- class: InlineJavascriptRequirement
diff --git a/subworkflow/concat.cwl b/subworkflow/concat.cwl
index 53175cad4b6edb4f057990517304f3dc5d09c558..190767ced15c356a650b37c4523b4d444d4c72d5 100644
--- a/subworkflow/concat.cwl
+++ b/subworkflow/concat.cwl
@@ -2,60 +2,38 @@ class: Workflow
cwlVersion: v1.2
id: concat
label: concat
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -300
- id: group_id
type: string
- 'sbg:x': -1000
- 'sbg:y': -200
- id: groups_specification
type: File
- 'sbg:x': -1000
- 'sbg:y': -100
- id: filter_baselines
type: string?
default: '*&'
- 'sbg:x': -1000
- 'sbg:y': 0
- id: avg_timeresolution_concat
type: int?
default: 8
- 'sbg:x': -1000
- 'sbg:y': 100
- id: avg_freqresolution_concat
type: string?
default: '97.64kHz'
- 'sbg:x': -1000
- 'sbg:y': 200
- id: min_unflagged_fraction
type: float?
default: 0.5
- 'sbg:x': -1000
- 'sbg:y': 300
outputs:
- id: flagged_fraction_dict
outputSource:
- dpppconcat/flagged_fraction_dict
type: string
- 'sbg:x': 1000
- 'sbg:y': -100
- id: msout
outputSource:
- dpppconcat/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': 0
- id: dpppconcat.log
outputSource:
- concat_logfiles_dpppconcat/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
steps:
- id: filter_ms_group
in:
@@ -71,8 +49,6 @@ steps:
- id: selected_ms
run: ../steps/filter_ms_group.cwl
label: filter_ms_group
- 'sbg:x': -500
- 'sbg:y': 0
- id: dpppconcat
in:
- id: msin
@@ -110,8 +86,6 @@ steps:
- id: logfile
run: ../lofar-cwl/steps/dpppconcat.cwl
label: dpppconcat
- 'sbg:x': -200
- 'sbg:y': 0
- id: concat_logfiles_dpppconcat
in:
- id: file_list
@@ -123,7 +97,5 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_dpppconcat
- 'sbg:x': 600
- 'sbg:y': 200
requirements: []
\ No newline at end of file
diff --git a/subworkflow/faraday_rotation.cwl b/subworkflow/faraday_rotation.cwl
index 803927896dedd4893aa80cdf0377293384e9662d..2a4f46abce99f4bf66e9f6838042c619874c246d 100644
--- a/subworkflow/faraday_rotation.cwl
+++ b/subworkflow/faraday_rotation.cwl
@@ -4,33 +4,24 @@ id: faraday_rotation
label: faraday_rotation
$namespaces:
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: refAnt
type: string?
default: 'CS001HBA0'
- 'sbg:x': -451.3746643066406
- 'sbg:y': -493.92510986328125
- id: input_h5parm
type: File
- 'sbg:x': -743.1871948242188
- 'sbg:y': -316.5615234375
outputs:
- id: output_h5parm
outputSource:
- losoto_faraday/output_h5parm
type: File
format: 'lofar:#H5Parm'
- 'sbg:x': 152.59103393554688
- 'sbg:y': -289.2899169921875
- id: logfiles
outputSource:
- losoto_duplicate/log
- losoto_faraday/log
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 300.5910339355469
- 'sbg:y': 0
steps:
- id: losoto_duplicate
in:
@@ -44,8 +35,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': -423.6229248046875
- 'sbg:y': -287.8958435058594
- id: losoto_faraday
in:
- id: input_h5parm
@@ -62,8 +51,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Faraday.cwl
- 'sbg:x': -99.27792358398438
- 'sbg:y': -126.80227661132812
requirements: []
$schema:
- 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
diff --git a/subworkflow/ionosphere.cwl b/subworkflow/ionosphere.cwl
index 4ed83a1079950a8d37a4d6e24e8a8fe4163cfdc9..6c5f77af05275f772d9d677f50805be7d197a952 100644
--- a/subworkflow/ionosphere.cwl
+++ b/subworkflow/ionosphere.cwl
@@ -2,35 +2,23 @@ class: Workflow
cwlVersion: v1.2
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
default: true
- 'sbg:x': -482.39886474609375
- 'sbg:y': -260.5
- id: flagunconverged
type: boolean
default: false
- 'sbg:x': -559.3988647460938
- 'sbg:y': 118.5
- id: do_smooth
type: boolean
default: false
- '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:
@@ -49,8 +37,6 @@ steps:
- id: h5parm
run: ./smooth_calibrate.cwl
label: smooth_calibrate
- 'sbg:x': -225
- 'sbg:y': -14
- id: h5parm_collector
in:
- id: h5parmFiles
@@ -67,8 +53,6 @@ steps:
- 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
@@ -77,8 +61,6 @@ steps:
- id: output_h5parm
run: ./losoto_ion.cwl
label: losoto_ion
- 'sbg:x': 140
- 'sbg:y': -34
- id: h5exp_cal_ion
in:
- id: h5parmFiles
@@ -95,7 +77,5 @@ steps:
- id: log
run: ../lofar-cwl/steps/H5ParmCollector.cwl
label: h5exp_cal_ion
- 'sbg:x': 352
- 'sbg:y': -31
requirements:
- class: SubworkflowFeatureRequirement
diff --git a/subworkflow/losoto_bandpass.cwl b/subworkflow/losoto_bandpass.cwl
index 88c3fcc0d566ad63c0263e8503450261f58a673d..51368c4d31d6333f0de4f206903ea38a37ec8dc5 100644
--- a/subworkflow/losoto_bandpass.cwl
+++ b/subworkflow/losoto_bandpass.cwl
@@ -2,44 +2,28 @@ class: Workflow
cwlVersion: v1.2
id: losoto_bandpass
label: losoto_bandpass
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: ampRange
type: 'float[]?'
default: [0, 0]
- 'sbg:x': 730.283935546875
- 'sbg:y': 152.7667236328125
- id: skipInternational
type: boolean?
default: true
- 'sbg:x': 742.662841796875
- 'sbg:y': -221.30563354492188
- id: input_h5parm
type: File
- 'sbg:x': 512.96240234375
- 'sbg:y': -41.42390060424805
- id: max2interpolate
type: int?
default: 30
- 'sbg:x': 1227
- 'sbg:y': -278
- id: bandpass_freqresolution
type: string
- 'sbg:x': 1399
- 'sbg:y': -354
- id: avg_freqresolution
type: string?
default: '48.82kHz'
- 'sbg:x': 1286.2171630859375
- 'sbg:y': 127.25900268554688
outputs:
- id: output_h5parm
outputSource:
- smoothb/output_h5parm
type: File
- 'sbg:x': 1798
- 'sbg:y': -47
steps:
- id: duplicateAbkp
in:
@@ -52,8 +36,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 642
- 'sbg:y': -48
- id: losoto_flag
in:
- id: input_h5parm
@@ -78,8 +60,6 @@ steps:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Flag.cwl
label: flag
- 'sbg:x': 764
- 'sbg:y': -47
- id: flagbp
in:
- id: input_h5parm
@@ -96,8 +76,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.FlagStation.cwl
- 'sbg:x': 873
- 'sbg:y': -55
- id: flagextend
in:
- id: input_h5parm
@@ -119,8 +97,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Flagextend.cwl
- 'sbg:x': 1005
- 'sbg:y': -51
- id: merge
in:
- id: input_h5parm
@@ -134,8 +110,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Reweight.cwl
- 'sbg:x': 1121
- 'sbg:y': -55
- id: smooth
in:
- id: input_h5parm
@@ -152,8 +126,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
- 'sbg:x': 1265.0499267578125
- 'sbg:y': -47.9036750793457
- id: bandpass
in:
- id: input_h5parm
@@ -175,8 +147,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
- 'sbg:x': 1378.419921875
- 'sbg:y': -52.9036750793457
- id: interp
in:
- id: input_h5parm
@@ -198,8 +168,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Interpolate.cwl
- 'sbg:x': 1507.4566650390625
- 'sbg:y': -51.45471954345703
- id: smoothb
in:
- id: input_h5parm
@@ -219,6 +187,4 @@ steps:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Smooth.cwl
label: smoothb
- 'sbg:x': 1648.5743408203125
- 'sbg:y': -51.13884735107422
requirements: []
diff --git a/subworkflow/losoto_ion.cwl b/subworkflow/losoto_ion.cwl
index b74507ba7331920593f63b5a93dfd8fbf901bc31..c64273513bd3a27862c3d1528ecff2a3d24425fc 100644
--- a/subworkflow/losoto_ion.cwl
+++ b/subworkflow/losoto_ion.cwl
@@ -2,35 +2,23 @@ class: Workflow
cwlVersion: v1.2
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?
default: false
- 'sbg:x': 83.60113525390625
- 'sbg:y': 53.5
- id: refAnt
type: string?
default: 'CS001HBA0'
- 'sbg:x': 500.74346923828125
- 'sbg:y': -382.8847351074219
- id: maxStddev
type: float?
default: -1.0
- '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:
@@ -55,8 +43,6 @@ steps:
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
@@ -78,8 +64,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Flagextend.cwl
- 'sbg:x': -255
- 'sbg:y': -160
- id: merge
in:
- id: input_h5parm
@@ -93,8 +77,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Reweight.cwl
- 'sbg:x': -94
- 'sbg:y': -162
- id: duplicatePbkp
in:
- id: input_h5parm
@@ -106,8 +88,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': 69
- 'sbg:y': -162
- id: losoto_flagstation
in:
- id: input_h5parm
@@ -123,8 +103,6 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.FlagStation.cwl
- 'sbg:x': 587
- 'sbg:y': -172
- id: losoto_clocktec
in:
- id: input_h5parm
@@ -146,8 +124,6 @@ steps:
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
@@ -161,6 +137,4 @@ steps:
out:
- id: output_h5parm
run: ../lofar-cwl/steps/LoSoTo.Residual.cwl
- 'sbg:x': 411.0426330566406
- 'sbg:y': -168.98934936523438
requirements: []
diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl
index c68dfbebdea23a88e90cd7a98e66bb0efe7cade5..8d71e58295c0b891d1b91640c68c2b395f5024d4 100644
--- a/subworkflow/ndppp_prep_cal.cwl
+++ b/subworkflow/ndppp_prep_cal.cwl
@@ -2,113 +2,71 @@ class: Workflow
cwlVersion: v1.2
id: ndppp_prep_cal
label: ndppp_prep_cal
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: baselines_to_flag
type: 'string[]?'
default: []
- 'sbg:x': -500
- 'sbg:y': -800
- id: elevation_to_flag
type: string?
default: '0deg..15deg'
- 'sbg:x': -500
- 'sbg:y': -700
- id: min_amplitude_to_flag
type: float?
default: 1e-30
- 'sbg:x': -500
- 'sbg:y': -600
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -500
- 'sbg:y': -500
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -500
- 'sbg:y': -400
- id: demix
type: boolean?
default: false
- 'sbg:x': -500
- 'sbg:y': -300
- id: msin
type: Directory
- 'sbg:x': -500
- 'sbg:y': -200
- id: msin_baseline
type: string?
default: '*&'
- 'sbg:x': -500
- 'sbg:y': -100
- id: skymodel
type:
- File
- Directory
- 'sbg:x': -500
- 'sbg:y': 0
- id: timeresolution
type: int?
default: 4
- 'sbg:x': -500
- 'sbg:y': 100
- id: freqresolution
type: string?
default: '48.82kHz'
- 'sbg:x': -500
- 'sbg:y': 200
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -500
- 'sbg:y': 300
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -500
- 'sbg:y': 400
- id: demix_baseline
type: string?
default: '*&'
- 'sbg:x': -500
- 'sbg:y': 500
- id: target_source
type: string?
default: ''
- 'sbg:x': -500
- 'sbg:y': 600
- id: ntimechunk
type: int?
default: 16
- 'sbg:x': -500
- 'sbg:y': 700
- id: subtract_sources
type: 'string[]?'
default: []
- 'sbg:x': -500
- 'sbg:y': 800
outputs:
- id: msout
outputSource:
- dp3_execute/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': -100
- id: logfile
outputSource:
- concat_logfiles_dppp/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 0
- id: flagged_fraction_dict
outputSource:
- dp3_execute/flagged_fraction_dict
type: string
- 'sbg:x': 1000
- 'sbg:y': 100
steps:
- id: define_parset
in:
@@ -148,8 +106,6 @@ steps:
- id: output
run: ../steps/dppp_make_parset_cal.cwl
label: make_parset
- 'sbg:x': 0
- 'sbg:y': 0
- id: dp3_execute
in:
- id: parset
@@ -179,8 +135,6 @@ steps:
- id: logfile
run: ../steps/dppp_prep_cal.cwl
label: DP3.Execute
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_dppp
in:
- id: file_list
@@ -192,8 +146,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_dppp
- 'sbg:x': 700
- 'sbg:y': -200
requirements:
- class: SubworkflowFeatureRequirement
- class: StepInputExpressionRequirement
diff --git a/subworkflow/ndppp_prep_targ.cwl b/subworkflow/ndppp_prep_targ.cwl
index 2ef2c0dc6c7b50d41c7cf148565e2e31ac50bd14..8d157d3f2e81295d51e3c5ccef034f4e42cdfe26 100644
--- a/subworkflow/ndppp_prep_targ.cwl
+++ b/subworkflow/ndppp_prep_targ.cwl
@@ -2,128 +2,78 @@ class: Workflow
cwlVersion: v1.2
id: ndppp_prep_targ
label: ndppp_prep_targ
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: baselines_to_flag
type: 'string[]?'
default: []
- 'sbg:x': -500
- 'sbg:y': -1000
- id: elevation_to_flag
type: string?
default: '0deg..15deg'
- 'sbg:x': -500
- 'sbg:y': -900
- id: min_amplitude_to_flag
type: float?
default: 1e-30
- 'sbg:x': -500
- 'sbg:y': -800
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -500
- 'sbg:y': -700
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -500
- 'sbg:y': -600
- id: demix
type: boolean?
default: false
- 'sbg:x': -500
- 'sbg:y': -500
- id: msin
type: Directory
- 'sbg:x': -500
- 'sbg:y': -400
- id: skymodel
type:
- File
- Directory
- 'sbg:x': -500
- 'sbg:y': -300
- id: timeresolution
type: int?
default: 4
- 'sbg:x': -500
- 'sbg:y': -200
- id: freqresolution
type: string?
default: '48.82kHz'
- 'sbg:x': -500
- 'sbg:y': -100
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -500
- 'sbg:y': 0
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -500
- 'sbg:y': 100
- id: process_baselines_target
type: string?
default: '[CR]S*&'
- 'sbg:x': -500
- 'sbg:y': 200
- id: target_source
type: string?
default: ''
- 'sbg:x': -500
- 'sbg:y': 300
- id: ntimechunk
type: int?
default: 16
- 'sbg:x': -500
- 'sbg:y': 400
- id: subtract_sources
type: 'string[]?'
default: []
- 'sbg:x': -500
- 'sbg:y': 500
- id: parmdb
type: File
- 'sbg:x': -500
- 'sbg:y': 600
- id: apply_tec_correction
type: boolean?
default: false
- 'sbg:x': -500
- 'sbg:y': 700
- id: apply_rm_correction
type: boolean?
default: true
- 'sbg:x': -500
- 'sbg:y': 800
- id: apply_phase_correction
type: boolean?
default: false
- 'sbg:x': -500
- 'sbg:y': 900
- id: apply_clock_correction
type: boolean?
default: true
- 'sbg:x': -500
- 'sbg:y': 1000
- id: apply_beam_correction
type: boolean?
default: true
- 'sbg:x': -500
- 'sbg:y': 1100
- id: filter_baselines
type: string?
default: ''
- 'sbg:x': -500
- 'sbg:y': 1200
- id: updateweights
type: boolean?
default: true
- 'sbg:x': -500
- 'sbg:y': 1300
- id: clip_sources
type: 'string[]?'
default:
@@ -131,51 +81,35 @@ inputs:
- CygAGG
- CasA_4_patch
- TauAGG
- 'sbg:x': -500
- 'sbg:y': 1400
outputs:
- id: initial_flags_out
outputSource:
- dp3_execute/flagged_fraction_dict_initial
type: string
- 'sbg:x': 2000
- 'sbg:y': 300
- id: prep_flags_out
outputSource:
- dp3_execute/flagged_fraction_dict_prep
type: string
- 'sbg:x': 2000
- 'sbg:y': 200
- id: prep_logfile
outputSource:
- concat_logfiles_dppp/output
type: File
- 'sbg:x': 2000
- 'sbg:y': 100
- id: predict_logfile
outputSource:
- concat_logfiles_predict/output
type: File
- 'sbg:x': 2000
- 'sbg:y': 0
- id: clipper_logfile
outputSource:
- concat_logfiles_clipper/output
type: File
- 'sbg:x': 2000
- 'sbg:y': -100
- id: msout
outputSource:
- Ateamclipper/msout
type: Directory
- 'sbg:x': 2000
- 'sbg:y': -200
- id: clipper_output
outputSource:
- Ateamclipper/output
type: File
- 'sbg:x': 2000
- 'sbg:y': -300
steps:
- id: define_parset
in:
@@ -227,8 +161,6 @@ steps:
- id: output
run: ../steps/dppp_make_parset_target.cwl
label: make_parset
- 'sbg:x': 0
- 'sbg:y': 0
- id: concat_logfiles_dppp
in:
- id: file_list
@@ -240,8 +172,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_dppp
- 'sbg:x': 1200
- 'sbg:y': -500
- id: concat_logfiles_predict
in:
- id: file_list
@@ -253,8 +183,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_predict
- 'sbg:x': 1400
- 'sbg:y': -500
- id: concat_logfiles_clipper
in:
- id: file_list
@@ -266,8 +194,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_clipper
- 'sbg:x': 1600
- 'sbg:y': -500
- id: dp3_execute
in:
- id: parset
@@ -300,8 +226,6 @@ steps:
- id: logfile
run: ../steps/dppp_prep_target.cwl
label: DP3.Execute
- 'sbg:x': 500
- 'sbg:y': 0
- id: predict
in:
- id: msin
@@ -327,8 +251,6 @@ steps:
- id: msout
- id: logfile
run: ../lofar-cwl/steps/filter_predict.cwl
- 'sbg:x': 1000
- 'sbg:y': 0
- id: Ateamclipper
in:
- id: msin
@@ -340,8 +262,6 @@ steps:
- id: output
run: ../lofar-cwl/steps/Ateamclipper.cwl
label: Ateamclipper
- 'sbg:x': 1300
- 'sbg:y': 0
requirements:
- class: InlineJavascriptRequirement
- class: StepInputExpressionRequirement
diff --git a/subworkflow/pol_align.cwl b/subworkflow/pol_align.cwl
index ef359913c03b5381aafe6f78f603269a32e8c90e..70d860d74707c06102fb30c837d77d831e521c57 100644
--- a/subworkflow/pol_align.cwl
+++ b/subworkflow/pol_align.cwl
@@ -3,31 +3,22 @@ cwlVersion: v1.2
id: pol_align
label: PolAlign
$namespaces:
- sbg: 'https://www.sevenbridges.com/'
lofar: 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
inputs:
- id: refAnt
type: string?
default: 'CS001HBA0'
- 'sbg:x': -451.3746643066406
- 'sbg:y': -493.92510986328125
- id: input_h5parm
type: File
- 'sbg:x': -743.1871948242188
- 'sbg:y': -316.5615234375
- id: fit_offset_PA
type: boolean?
default: false
- 'sbg:x': -743.1871948242188
- 'sbg:y': -316.5615234375
outputs:
- id: output_h5parm
outputSource:
- losoto_residual/output_h5parm
type: File
format: lofar:#H5Parm
- 'sbg:x': 152.59103393554688
- 'sbg:y': -289.2899169921875
- id: logfiles
outputSource:
- losoto_duplicate/log
@@ -49,8 +40,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Duplicate.cwl
- 'sbg:x': -423.6229248046875
- 'sbg:y': -287.8958435058594
- id: losoto_polalign
in:
- id: input_h5parm
@@ -73,8 +62,6 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Polalign.cwl
- 'sbg:x': -203.663818359375
- 'sbg:y': -292.61700439453125
- id: losoto_residual
in:
- id: input_h5parm
@@ -88,7 +75,5 @@ steps:
- id: output_h5parm
- id: log
run: ../lofar-cwl/steps/LoSoTo.Residual.cwl
- 'sbg:x': -0.012040258385241032
- 'sbg:y': -287.7294006347656
requirements:
MultipleInputFeatureRequirement: {}
diff --git a/subworkflow/predict_calibrate.cwl b/subworkflow/predict_calibrate.cwl
index 660910a935c365cab170ffc4660cd9d354b85f46..cdee29b7e310e0cd65f2f506b14f119779bf7491 100644
--- a/subworkflow/predict_calibrate.cwl
+++ b/subworkflow/predict_calibrate.cwl
@@ -2,71 +2,47 @@ class: Workflow
cwlVersion: v1.2
id: predict_calibrate
label: predict_calibrate
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: Directory
- 'sbg:x': -1000
- 'sbg:y': -200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: sourcedb
type:
- File
- Directory
- 'sbg:x': -1000
- 'sbg:y': 0
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 100
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 200
outputs:
- id: msout
outputSource:
- calib_cal/msout
type: Directory
- 'sbg:x': 1000
- 'sbg:y': -200
- id: BLsmooth.log
outputSource:
- BLsmooth/logfile
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: predict_cal.log
outputSource:
- concat_logfiles_predict/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 0
- id: calib_cal.log
outputSource:
- concat_logfiles_calib_cal/output
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: flagged_fraction_dict
outputSource:
- calib_cal/flagged_fraction_dict
type: string
- 'sbg:x': 1000
- 'sbg:y': 200
- id: outh5parm
outputSource:
- calib_cal/h5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 300
steps:
- id: BLsmooth
in:
@@ -79,8 +55,6 @@ steps:
- id: logfile
run: ../steps/blsmooth.cwl
label: BLsmooth
- 'sbg:x': -500
- 'sbg:y': 0
- id: predict
in:
- id: msin
@@ -99,8 +73,6 @@ steps:
- id: msout
- id: logfile
run: ../lofar-cwl/steps/predict.cwl
- 'sbg:x': 0
- 'sbg:y': 0
- id: calib_cal
in:
- id: msin
@@ -121,8 +93,6 @@ steps:
- id: flagged_fraction_dict
- id: logfile
run: ../lofar-cwl/steps/ddecal.cwl
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_predict
in:
- id: file_list
@@ -134,8 +104,6 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_predict
- 'sbg:x': 500
- 'sbg:y': 200
- id: concat_logfiles_calib_cal
in:
- id: file_list
@@ -147,6 +115,4 @@ steps:
- id: output
run: ../steps/concatenate_files.cwl
label: concat_logfiles_calib_cal
- 'sbg:x': 700
- 'sbg:y': 200
requirements: []
diff --git a/subworkflow/prep_target_applycal.cwl b/subworkflow/prep_target_applycal.cwl
index 3767ba8a656132d6d7dfaab6bfc177a79d522089..70ccc56490ab20b364463c5cb1dbb5fe57033b0d 100644
--- a/subworkflow/prep_target_applycal.cwl
+++ b/subworkflow/prep_target_applycal.cwl
@@ -2,48 +2,28 @@ class: Workflow
cwlVersion: v1.2
id: prep_target_applycal
label: prep_target_applycal
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: steps
type: 'Any[]?'
- 'sbg:x': 1566.9437255859375
- 'sbg:y': 173.2586669921875
- id: apply_clock_correction
type: boolean
- 'sbg:x': 1622.751953125
- 'sbg:y': -235.5788116455078
- id: apply_tec_correction
type: boolean
- 'sbg:x': 1990.8035888671875
- 'sbg:y': -230.75811767578125
- id: apply_rm_correction
type: boolean
- 'sbg:x': 2502.2421875
- 'sbg:y': -225.68701171875
- id: apply_beam_correction
type: boolean
- 'sbg:x': 2273.170166015625
- 'sbg:y': -251.86672973632812
- id: apply_phase_correction
type: boolean
- 'sbg:x': 2750.948974609375
- 'sbg:y': -241.39480590820312
- id: parmdb
type: File
- 'sbg:x': 2007.115234375
- 'sbg:y': 685.0719604492188
- id: updateweights
type: boolean
- 'sbg:x': 2167.219970703125
- 'sbg:y': 422.6792297363281
outputs:
- id: selected_steps
outputSource:
- apply_phase/selected_steps
type: Any
- 'sbg:x': 3129.244873046875
- 'sbg:y': 165.6987762451172
steps:
- id: applyClock
in:
@@ -61,8 +41,6 @@ steps:
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
- 'sbg:x': 1747.8311767578125
- 'sbg:y': 285.2012634277344
- id: applyTec
in:
- id: steps
@@ -79,8 +57,6 @@ steps:
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
- 'sbg:x': 2056.49462890625
- 'sbg:y': 277.8923034667969
- id: applyPhase
in:
- id: steps
@@ -97,8 +73,6 @@ steps:
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
- 'sbg:x': 2805.44873046875
- 'sbg:y': 299.8974304199219
- id: applyRM
in:
- id: steps
@@ -115,8 +89,6 @@ steps:
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
- 'sbg:x': 2545.4775390625
- 'sbg:y': 291.2240295410156
- id: applybeam
in:
- id: steps
@@ -135,8 +107,6 @@ steps:
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyBeamStepGenerator.cwl
- 'sbg:x': 2321
- 'sbg:y': 285.3694763183594
- id: apply_beam
in:
- id: select_a
@@ -152,8 +122,6 @@ steps:
- id: selected_steps
run: ../lofar-cwl/steps/DP3.Selector.cwl
label: apply_beam
- 'sbg:x': 2441.14599609375
- 'sbg:y': 167.0730438232422
- id: apply_rm
in:
- id: select_a
@@ -169,8 +137,6 @@ steps:
- id: selected_steps
run: ../lofar-cwl/steps/DP3.Selector.cwl
label: apply_rm?
- 'sbg:x': 2648.432373046875
- 'sbg:y': 167.062255859375
- id: apply_clock
in:
- id: select_a
@@ -186,8 +152,6 @@ steps:
- id: selected_steps
run: ../lofar-cwl/steps/DP3.Selector.cwl
label: apply_clock?
- 'sbg:x': 1909.072998046875
- 'sbg:y': 167.82034301757812
- id: apply_tec
in:
- id: select_a
@@ -203,8 +167,6 @@ steps:
- id: selected_steps
run: ../lofar-cwl/steps/DP3.Selector.cwl
label: apply_tec?
- 'sbg:x': 2192.246826171875
- 'sbg:y': 166.15206909179688
- id: apply_phase
in:
- id: select_a
@@ -220,7 +182,5 @@ steps:
- id: selected_steps
run: ../lofar-cwl/steps/DP3.Selector.cwl
label: apply_phase
- 'sbg:x': 2927.22412109375
- 'sbg:y': 162.4778289794922
requirements:
- class: SubworkflowFeatureRequirement
diff --git a/subworkflow/smooth_calibrate.cwl b/subworkflow/smooth_calibrate.cwl
index fcefb39a21f25b09dd668cacb70385d1e2f84a31..a54ff95e92127317ff9d227f9864fc074481518b 100644
--- a/subworkflow/smooth_calibrate.cwl
+++ b/subworkflow/smooth_calibrate.cwl
@@ -2,13 +2,9 @@ class: Workflow
cwlVersion: v1.2
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
@@ -25,27 +21,17 @@ inputs:
- 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:
@@ -66,8 +52,6 @@ steps:
scatter:
- msin
# scatterMethod: flat_crossproduct
- 'sbg:x': -394
- 'sbg:y': -29
- id: calib_cal
in:
- id: msin
@@ -88,7 +72,5 @@ steps:
run: ../lofar-cwl/steps/ddecal.cwl
scatter:
- msin
- 'sbg:x': -124
- 'sbg:y': -43
requirements:
- class: ScatterFeatureRequirement
diff --git a/test_scatter/cat.cwl b/test_scatter/cat.cwl
index 9a3f8526eae824b963ab3379e920691c2807ec12..1a922260320be47c8b1d226fecfdf67f725b518f 100644
--- a/test_scatter/cat.cwl
+++ b/test_scatter/cat.cwl
@@ -1,7 +1,5 @@
class: CommandLineTool
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: cat
baseCommand:
- cat
diff --git a/test_scatter/scatter-workflow.cwl b/test_scatter/scatter-workflow.cwl
index 6c245545e42c4b8680ac9df73c5a2d93b9fb5418..bc20dfe6c2f307150edf567b5407f9bac38c4fc1 100644
--- a/test_scatter/scatter-workflow.cwl
+++ b/test_scatter/scatter-workflow.cwl
@@ -1,19 +1,13 @@
class: Workflow
cwlVersion: v1.2
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: message_array
type: 'string[]'
- 'sbg:x': -62
- 'sbg:y': 97
outputs:
- id: output
outputSource:
- cat_2/output
type: File
- 'sbg:x': 778.4581909179688
- 'sbg:y': 95.88174438476562
steps:
- id: echo
in:
@@ -24,8 +18,6 @@ steps:
run: 1st-tool.cwl
scatter:
- message
- 'sbg:x': 173
- 'sbg:y': -17
- id: cat
in:
- id: files
@@ -35,8 +27,6 @@ steps:
- id: output
run: ./cat.cwl
label: cat
- 'sbg:x': 378.203125
- 'sbg:y': 21.5
- id: 1st_tool
in:
- id: message
@@ -46,8 +36,6 @@ steps:
run: ./1st-tool.cwl
scatter:
- message
- 'sbg:x': 176.203125
- 'sbg:y': 231.5
- id: cat_1
in:
- id: files
@@ -57,8 +45,6 @@ steps:
- id: output
run: ./cat.cwl
label: cat
- 'sbg:x': 454.203125
- 'sbg:y': 219
- id: cat_2
in:
- id: files
@@ -69,8 +55,6 @@ steps:
- id: output
run: ./cat.cwl
label: cat
- 'sbg:x': 648.4573364257812
- 'sbg:y': 104.00638580322266
requirements:
- class: ScatterFeatureRequirement
- class: MultipleInputFeatureRequirement
diff --git a/test_scatter/scattertest.cwl b/test_scatter/scattertest.cwl
index d24cfee66b4794d2695e513bde5a16cffde89856..ef22849d1541fa6989b3dc7c05b05dfde72c9e15 100644
--- a/test_scatter/scattertest.cwl
+++ b/test_scatter/scattertest.cwl
@@ -1,5 +1,3 @@
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
id: scattertest
label: scattertest
class: Workflow
diff --git a/test_scatter/two_files.cwl b/test_scatter/two_files.cwl
index 21ca38cf1d379ed43394b7a82104658571977175..54048b48083105d754a7579fbc4652627b9dca1b 100644
--- a/test_scatter/two_files.cwl
+++ b/test_scatter/two_files.cwl
@@ -2,23 +2,15 @@ class: Workflow
cwlVersion: v1.2
id: two_files
label: two_files
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: message
type: string
- 'sbg:x': -327.3938293457031
- 'sbg:y': -142
- id: message_1
type: string
- 'sbg:x': -332.8984375
- 'sbg:y': 94
outputs:
- id: echo_out
outputSource: combine/out_files
type: 'File[]'
- 'sbg:x': 112
- 'sbg:y': -88
steps:
- id: 1st_tool
in:
@@ -27,8 +19,6 @@ steps:
out:
- id: echo_out
run: ./1st-tool.cwl
- 'sbg:x': -88
- 'sbg:y': -185
- id: 1st_tool_1
in:
- id: message
@@ -36,8 +26,6 @@ steps:
out:
- id: echo_out
run: ./1st-tool.cwl
- 'sbg:x': -89
- 'sbg:y': -27
- id: combine
in:
input_file:
diff --git a/test_workflow/flag_average.cwl b/test_workflow/flag_average.cwl
index be741ddbae807740c4d72f652e082f3114d3ea15..3f0d84ba358d5a5e308d6025b5356ea390feb947 100644
--- a/test_workflow/flag_average.cwl
+++ b/test_workflow/flag_average.cwl
@@ -2,28 +2,20 @@ class: Workflow
cwlVersion: v1.2
id: test
label: test
-$namespaces:
- sbg: 'https://www.sevenbridges.com'
inputs:
- id: msin
type: Directory
- 'sbg:x': -883.489990234375
- 'sbg:y': -201.6757354736328
outputs:
- id: msout
outputSource:
- dppp/msout
type: Directory
- 'sbg:x': -616.7398071289062
- 'sbg:y': -472
steps:
- id: aoflagger_step_generator
in: []
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.AOFlaggerStepGenerator.cwl
- 'sbg:x': -1357.640625
- 'sbg:y': -729.5
- id: average_step_generator
in:
- id: steps
@@ -32,8 +24,6 @@ steps:
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.AveragerStepGenerator.cwl
- 'sbg:x': -1125
- 'sbg:y': -729
- id: parset_generator
in:
- id: steps
@@ -46,8 +36,6 @@ steps:
- id: output_file_names
- id: output_directory_names
run: ../lofar-cwl/steps/DP3.ParsetGenerator.cwl
- 'sbg:x': -1174
- 'sbg:y': -525
- id: dppp
in:
- id: parset
@@ -66,7 +54,5 @@ steps:
- id: secondary_output_files
- id: secondary_output_directories
run: ../lofar-cwl/steps/DPPP.cwl
- 'sbg:x': -806.3514404296875
- 'sbg:y': -505.4043273925781
requirements:
- class: SubworkflowFeatureRequirement
diff --git a/test_workflow/two_steps.cwl b/test_workflow/two_steps.cwl
index d75e0b9b1669d3debbda0ddcaead172fbaabf7cd..6032b56e72ff7b9b74b986819f252bc49df43ab6 100644
--- a/test_workflow/two_steps.cwl
+++ b/test_workflow/two_steps.cwl
@@ -1,40 +1,24 @@
class: Workflow
cwlVersion: v1.2
id: prefactor
-$namespaces:
- sbg: 'https://www.sevenbridges.com'
inputs:
- id: elevation_to_flag
type: string
- 'sbg:x': -1451
- 'sbg:y': -474
- id: memoryperc
type: int
- 'sbg:x': -1456
- 'sbg:y': -576
- id: min_amplitude_to_flag
type: float
- 'sbg:x': -1442
- 'sbg:y': -712
- id: msin_array
type: 'Directory[]'
- 'sbg:x': -1482.3096923828125
- 'sbg:y': -821.4769897460938
- id: raw_data
type: boolean
- 'sbg:x': -1450
- 'sbg:y': -934.9942626953125
- id: demix
type: boolean
- 'sbg:x': -1449.65625
- 'sbg:y': -357.9942321777344
outputs:
- id: demix_parmdb
outputSource:
- ndppp_prep_cal/demix_parmdb
type: Directory
- 'sbg:x': -795.9163208007812
- 'sbg:y': -304
steps:
- id: ndppp_prep_cal
scatter: msin
@@ -56,8 +40,6 @@ steps:
- id: demix_parmdb
run: ../subworkflow/ndppp_prep_cal.cwl
label: ndppp_prep_cal
- 'sbg:x': -1057.995849609375
- 'sbg:y': -464.80194091796875
requirements:
SubworkflowFeatureRequirement: {}
ScatterFeatureRequirement: {}
diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index 51627faf57287541737db920e4c920adf6dda850..044e63712ee12a0d674c45f87c14a4a8657d1768 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -2,211 +2,129 @@ class: Workflow
cwlVersion: v1.2
id: HBA_calibrator
label: HBA_calibrator
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -1900
- id: refant
type: string?
default: 'CS00.*'
- 'sbg:x': -1000
- 'sbg:y': -1800
- id: flag_baselines
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -1700
- id: process_baselines_cal
type: string?
default: '*&'
- 'sbg:x': -1000
- 'sbg:y': -1600
- id: filter_baselines
type: string?
default: '*&'
- 'sbg:x': -1000
- 'sbg:y': -1500
- id: fit_offset_PA
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1400
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1300
- id: rfistrategy
type: string?
default: HBAdefault.rfis
- 'sbg:x': -1000
- 'sbg:y': -1200
- id: max2interpolate
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': -1100
- id: ampRange
type: 'float[]?'
default:
- 0
- 0
- 'sbg:x': -1000
- 'sbg:y': -1000
- id: skip_international
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -900
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -800
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -700
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -600
- id: maxStddev
type: float?
default: -1.0
- 'sbg:x': -1000
- 'sbg:y': -500
- id: solutions2transfer
type: File?
- 'sbg:x': -1000
- 'sbg:y': -400
- id: antennas2transfer
type: string?
default: '[FUSPID].*'
- 'sbg:x': -1000
- 'sbg:y': -300
- id: do_transfer
type: boolean
default: false
- 'sbg:x': -1000
- 'sbg:y': -200
- id: trusted_sources
type: string
default: '3C48,3C147,3C196,3C295,3C380'
- 'sbg:x': -1000
- 'sbg:y': -100
- id: demix_sources
type: 'string[]?'
default:
- CasA
- CygA
- 'sbg:x': -1000
- 'sbg:y': 0
- id: demix_target
type: string?
default: ''
- 'sbg:x': -1000
- 'sbg:y': 100
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': 200
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 300
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 400
- id: ion_3rd
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 500
- id: clock_smooth
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 600
- id: tables2export
type: string?
default: clock
- 'sbg:x': -1000
- 'sbg:y': 700
- id: final_apply
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 800
- id: max_dppp_threads
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 900
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -1000
- 'sbg:y': 1000
- id: min_length
type: int?
default: 50
- 'sbg:x': -1000
- 'sbg:y': 1100
- id: overhead
type: float?
default: 0.8
- 'sbg:x': -1000
- 'sbg:y': 1200
- id: min_separation
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': 1300
- id: max_separation_arcmin
type: float?
default: 1.0
- 'sbg:x': -1000
- 'sbg:y': 1400
- id: calibrator_path_skymodel
type: Directory?
- 'sbg:x': -1000
- 'sbg:y': 1500
- id: A-Team_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 1600
- id: avg_timeresolution
type: int?
default: 4
- 'sbg:x': -1000
- 'sbg:y': 1700
- id: avg_freqresolution
type: string?
default: 48.82kHz
- 'sbg:x': -1000
- 'sbg:y': 1800
- id: bandpass_freqresolution
type: string?
default: 195.3125kHz
- 'sbg:x': -1000
- 'sbg:y': 1900
outputs:
- id: results
outputSource:
- save_results/log_dir
type: Directory
- 'sbg:x': 1500
- 'sbg:y': 0
steps:
- id: prefactor
in:
@@ -299,8 +217,6 @@ steps:
- id: summary_file
run: ./prefactor_calibrator.cwl
label: prefactor_calibrator
- 'sbg:x': 0
- 'sbg:y': 0
- id: save_logfiles
in:
- id: log_files
@@ -313,8 +229,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_logfiles
- 'sbg:x': 1000
- 'sbg:y': -300
- id: save_inspection
in:
- id: log_files
@@ -327,8 +241,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_inspection
- 'sbg:x': 1000
- 'sbg:y': -100
- id: save_solutions
in:
- id: log_files
@@ -340,8 +252,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_solutions
- 'sbg:x': 1000
- 'sbg:y': 100
- id: save_summary
in:
- id: log_files
@@ -353,8 +263,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_summary
- 'sbg:x': 1000
- 'sbg:y': 300
- id: save_results
in:
- id: log_files
@@ -370,8 +278,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_results
- 'sbg:x': 1200
- 'sbg:y': 0
requirements:
- class: SubworkflowFeatureRequirement
- class: MultipleInputFeatureRequirement
\ No newline at end of file
diff --git a/workflows/HBA_target.cwl b/workflows/HBA_target.cwl
index 0afcf04835f07b98311ff25cbc40701241b4c488..c8045687c50408ef3c1ec0128e58d025d755c2ae 100644
--- a/workflows/HBA_target.cwl
+++ b/workflows/HBA_target.cwl
@@ -2,242 +2,146 @@ class: Workflow
cwlVersion: v1.2
id: HBA_target
label: HBA_target
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -1700
- id: cal_solutions
type: 'File'
- 'sbg:x': -1000
- 'sbg:y': -1600
- id: refant
type: string?
default: 'CS00.*'
- 'sbg:x': -1000
- 'sbg:y': -1500
- id: flag_baselines
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -1400
- id: process_baselines_target
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -1300
- id: filter_baselines
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -1200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1100
- id: rfistrategy
type: string?
default: HBAdefault.rfis
- 'sbg:x': -1000
- 'sbg:y': -1000
- id: min_unflagged_fraction
type: float?
default: 0.5
- 'sbg:x': -1000
- 'sbg:y': -900
- id: compression_bitrate
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': -800
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -700
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -600
- id: demix_sources
type: 'string[]?'
default:
- CasA
- CygA
- 'sbg:x': -1000
- 'sbg:y': -500
- id: demix_target
type: string?
default: ''
- 'sbg:x': -1000
- 'sbg:y': -400
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': -300
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': -200
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: apply_tec
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 0
- id: apply_clock
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 100
- id: apply_phase
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 200
- id: apply_RM
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 300
- id: apply_beam
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 400
- id: clipATeam
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 500
- id: gsmcal_step
type: string?
default: 'phase'
- 'sbg:x': -1000
- 'sbg:y': 600
- id: updateweights
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 700
- id: max_dppp_threads
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 800
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -1000
- 'sbg:y': 900
- id: min_length
type: int?
default: 5
- 'sbg:x': -1000
- 'sbg:y': 1000
- id: overhead
type: float?
default: 0.7
- 'sbg:x': -1000
- 'sbg:y': 1100
- id: min_separation
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': 1200
- id: A-Team_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 1300
- id: target_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 1400
- id: use_target
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 1500
- id: skymodel_source
type: string?
default: 'TGSS'
- 'sbg:x': -1000
- 'sbg:y': 1600
- id: avg_timeresolution
type: int?
default: 4
- 'sbg:x': -1000
- 'sbg:y': 1700
- id: avg_freqresolution
type: string?
default: 48.82kHz
- 'sbg:x': -1000
- 'sbg:y': 1800
- id: avg_timeresolution_concat
type: int?
default: 8
- 'sbg:x': -1000
- 'sbg:y': 1900
- id: avg_freqresolution_concat
type: string?
default: 97.64kHz
- 'sbg:x': -1000
- 'sbg:y': 2000
- id: num_SBs_per_group
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 2100
- id: reference_stationSB
type: int?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2200
- id: ionex_server
type: string?
default: 'ftp://ftp.aiub.unibe.ch/CODE/'
- 'sbg:x': -1000
- 'sbg:y': 2300
- id: ionex_prefix
type: string?
default: 'CODG'
- 'sbg:x': -1000
- 'sbg:y': 2400
- id: proxy_server
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2500
- id: proxy_port
type: int?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2600
- id: proxy_type
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2700
- id: proxy_user
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2800
- id: proxy_pass
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2900
- id: clip_sources
type: 'string[]?'
default:
@@ -245,20 +149,14 @@ inputs:
- CygAGG
- CasA_4_patch
- TauAGG
- 'sbg:x': -1000
- 'sbg:y': 3000
- id: ncores
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': 3100
outputs:
- id: results
outputSource:
- save_results/log_dir
type: Directory
- 'sbg:x': 1500
- 'sbg:y': 0
steps:
- id: prefactor
in:
@@ -369,8 +267,6 @@ steps:
- id: summary_file
run: ./prefactor_target.cwl
label: prefactor_target
- 'sbg:x': 0
- 'sbg:y': 0
- id: save_logfiles
in:
- id: log_files
@@ -383,8 +279,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_logfiles
- 'sbg:x': 1000
- 'sbg:y': -300
- id: save_inspection
in:
- id: log_files
@@ -397,8 +291,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_inspection
- 'sbg:x': 1000
- 'sbg:y': -100
- id: save_solutions
in:
- id: log_files
@@ -410,8 +302,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_solutions
- 'sbg:x': 1000
- 'sbg:y': 100
- id: save_summary
in:
- id: log_files
@@ -423,8 +313,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_summary
- 'sbg:x': 1000
- 'sbg:y': 300
- id: save_results
in:
- id: log_files
@@ -441,8 +329,6 @@ steps:
- id: log_dir
run: ./../steps/collectlog.cwl
label: save_results
- 'sbg:x': 1200
- 'sbg:y': 0
requirements:
- class: SubworkflowFeatureRequirement
- class: MultipleInputFeatureRequirement
\ No newline at end of file
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index c2926e328bf03a1658d9f67684468d99b41a9777..7b4738c8885bf0007febf3fd66c4ad5d521dd666 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -2,204 +2,124 @@ class: Workflow
cwlVersion: v1.2
id: prefactor_calibrator
label: prefactor_calibrator
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -1900
- id: refant
type: string?
default: 'CS00.*'
- 'sbg:x': -1000
- 'sbg:y': -1800
- id: flag_baselines
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -1700
- id: process_baselines_cal
type: string?
default: '*&'
- 'sbg:x': -1000
- 'sbg:y': -1600
- id: filter_baselines
type: string?
default: '*&'
- 'sbg:x': -1000
- 'sbg:y': -1500
- id: fit_offset_PA
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1400
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1300
- id: rfistrategy
type: string?
default: HBAdefault.rfis
- 'sbg:x': -1000
- 'sbg:y': -1200
- id: max2interpolate
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': -1100
- id: ampRange
type: 'float[]?'
default:
- 0
- 0
- 'sbg:x': -1000
- 'sbg:y': -1000
- id: skip_international
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -900
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -800
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -700
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -600
- id: maxStddev
type: float?
default: -1
- 'sbg:x': -1000
- 'sbg:y': -500
- id: solutions2transfer
type: File?
- 'sbg:x': -1000
- 'sbg:y': -400
- id: antennas2transfer
type: string?
default: '[FUSPID].*'
- 'sbg:x': -1000
- 'sbg:y': -300
- id: do_transfer
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -200
- id: trusted_sources
type: string
default: '3C48,3C147,3C196,3C295'
- 'sbg:x': -1000
- 'sbg:y': -100
- id: demix_sources
type: 'string[]?'
default:
- CasA
- CygA
- 'sbg:x': -1000
- 'sbg:y': 0
- id: demix_target
type: string?
default: ''
- 'sbg:x': -1000
- 'sbg:y': 100
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': 200
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 300
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 400
- id: ion_3rd
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 500
- id: clock_smooth
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 600
- id: tables2export
type: string?
default: clock
- 'sbg:x': -1000
- 'sbg:y': 700
- id: final_apply
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 800
- id: max_dppp_threads
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 900
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -1000
- 'sbg:y': 1000
- id: min_length
type: int?
default: 50
- 'sbg:x': -1000
- 'sbg:y': 1100
- id: overhead
type: float?
default: 0.8
- 'sbg:x': -1000
- 'sbg:y': 1200
- id: min_separation
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': 1300
- id: max_separation_arcmin
type: float?
default: 1
- 'sbg:x': -1000
- 'sbg:y': 1400
- id: calibrator_path_skymodel
type: Directory?
- 'sbg:x': -1000
- 'sbg:y': 1500
- id: A-Team_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 1600
- id: avg_timeresolution
type: int?
default: 4
- 'sbg:x': -1000
- 'sbg:y': 1700
- id: avg_freqresolution
type: string?
default: 48.82kHz
- 'sbg:x': -1000
- 'sbg:y': 1800
- id: bandpass_freqresolution
type: string?
default: 195.3125kHz
- 'sbg:x': -1000
- 'sbg:y': 1900
outputs:
- id: inspection
linkMerge: merge_flattened
@@ -210,14 +130,10 @@ outputs:
- bp/inspection
- ion/inspection
type: File[]
- 'sbg:x': 2000
- 'sbg:y': -600
- id: solutions
outputSource:
- ion/outsolutions
type: File
- 'sbg:x': 2000
- 'sbg:y': -500
- id: logfiles
outputSource:
- prep/logfiles
@@ -228,14 +144,10 @@ outputs:
- ion/logfiles
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 2000
- 'sbg:y': 600
- id: summary_file
outputSource:
- ion/summary_file
type: File
- 'sbg:x': 2000
- 'sbg:y': 0
steps:
- id: initial_flags_join
in:
@@ -250,8 +162,6 @@ steps:
- id: flagged_fraction_antenna
run: ./../steps/findRefAnt_join.cwl
label: initial_flags_join
- 'sbg:x': -300
- 'sbg:y': -500
- id: prep
in:
- id: msin
@@ -315,8 +225,6 @@ steps:
- id: calibrator_name
run: ./prefactor_calibrator/prep.cwl
label: prep
- 'sbg:x': 0
- 'sbg:y': 0
- id: findRefAnt_join
in:
- id: flagged_fraction_dict
@@ -328,8 +236,6 @@ steps:
- id: logfile
run: ./../steps/findRefAnt_join.cwl
label: findRefAnt_join
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_RefAnt
in:
- id: file_list
@@ -342,8 +248,6 @@ steps:
- id: output
run: ./../steps/concatenate_files.cwl
label: concat_logfiles_RefAnt
- 'sbg:x': 700
- 'sbg:y': 300
- id: pa
in:
- id: msin
@@ -374,8 +278,6 @@ steps:
- id: outh5parm_logfile
run: ./prefactor_calibrator/pa.cwl
label: PA
- 'sbg:x': 700
- 'sbg:y': 0
- id: fr
in:
- id: msin
@@ -406,8 +308,6 @@ steps:
- id: outh5parm_logfile
run: ./prefactor_calibrator/fr.cwl
label: FR
- 'sbg:x': 1000
- 'sbg:y': 0
- id: bp
in:
- id: msin
@@ -458,8 +358,6 @@ steps:
- id: final_flags_join_out
run: ./prefactor_calibrator/bp.cwl
label: BP
- 'sbg:x': 1300
- 'sbg:y': 0
- id: ion
in:
- id: h5parm
@@ -502,8 +400,6 @@ steps:
- id: logfiles
run: ./prefactor_calibrator/ion.cwl
label: ion
- 'sbg:x': 1600
- 'sbg:y': 0
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator/bp.cwl b/workflows/prefactor_calibrator/bp.cwl
index c552ebd63c89c5381d5379f465400f76629d08cd..768c1344cbe8b12398730efbdaa41cb371504ecc 100644
--- a/workflows/prefactor_calibrator/bp.cwl
+++ b/workflows/prefactor_calibrator/bp.cwl
@@ -2,106 +2,64 @@ class: Workflow
cwlVersion: v1.2
id: bp
label: BP
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: max_separation_arcmin
type: float?
default: 1.0
- 'sbg:x': -1000
- 'sbg:y': -800
- id: calibrator_name
type: string?
default: 'POINTING'
- 'sbg:x': -1000
- 'sbg:y': -700
- id: ampRange
type: 'float[]?'
- 'sbg:x': -1000
- 'sbg:y': -600
- id: skipInternational
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -500
- id: max2interpolate
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': -400
- id: bandpass_freqresolution
type: string?
default: '195.3125kHz'
- 'sbg:x': -1000
- 'sbg:y': -300
- id: avg_freqresolution
type: string?
default: '48.82kHz'
- 'sbg:x': -1000
- 'sbg:y': -200
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 0
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': 100
- id: h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 200
- id: solutions2transfer
type: File?
- 'sbg:x': -1000
- 'sbg:y': 300
- id: inh5parm_logfile
type: 'File[]'
- 'sbg:x': -1000
- 'sbg:y': 400
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 500
- id: insolutions
type: File
- 'sbg:x': -1000
- 'sbg:y': 600
- id: antennas2transfer
type: string?
default: '[FUSPID].*'
- 'sbg:x': -1000
- 'sbg:y': 700
- id: do_transfer
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 800
- id: trusted_sources
type: string?
default: '3C48,3C147,3C196,3C295,3C380'
- 'sbg:x': -1000
- 'sbg:y': 900
outputs:
- id: outh5parm
outputSource:
- h5parm_collector/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': -200
- id: final_flags_join_out
outputSource:
- final_flags_join/flagged_fraction_antenna
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: inspection
outputSource:
- losoto_plot_A1/output_plots
@@ -112,14 +70,10 @@ outputs:
- transfer_solutions/plots
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 0
- id: outsolutions
outputSource:
- transfer_solutions/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: logfiles
outputSource:
- concat_logfiles_bp/output
@@ -131,14 +85,10 @@ outputs:
- concat_logfiles_beam/output
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 200
- id: outh5parm_logfile
outputSource:
- h5parm_collector/log
type: 'File[]'
- 'sbg:x': 1000
- 'sbg:y': 300
steps:
- id: bandpass
in:
@@ -160,8 +110,6 @@ steps:
- id: logfiles
run: ../../subworkflow/bandpass.cwl
label: bandpass
- 'sbg:x': -500
- 'sbg:y': 0
- id: losoto_plot_A1
in:
- id: input_h5parm
@@ -184,8 +132,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_A1
- 'sbg:x': -200
- 'sbg:y': -200
- id: losoto_plot_A2
in:
- id: input_h5parm
@@ -208,8 +154,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_A2
- 'sbg:x': -200
- 'sbg:y': -100
- id: losoto_plot_B1
in:
- id: input_h5parm
@@ -232,8 +176,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_B1
- 'sbg:x': -200
- 'sbg:y': 0
- id: losoto_plot_B2
in:
- id: input_h5parm
@@ -262,8 +204,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_B2
- 'sbg:x': -200
- 'sbg:y': 100
- id: losoto_plot_B3
in:
- id: input_h5parm
@@ -290,8 +230,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_B3
- 'sbg:x': -200
- 'sbg:y': 200
- id: losoto_plot_B1_trans
in:
- id: input_h5parm
@@ -314,8 +252,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_B1_trans
- 'sbg:x': -200
- 'sbg:y': 300
- id: losoto_plot_B2_trans
in:
- id: input_h5parm
@@ -344,8 +280,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_B2_trans
- 'sbg:x': -200
- 'sbg:y': 400
- id: losoto_plot_B3_trans
in:
- id: input_h5parm
@@ -372,8 +306,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_B3_trans
- 'sbg:x': -200
- 'sbg:y': 500
- id: concat_logfiles_bp
in:
- id: file_list
@@ -395,8 +327,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_bp
- 'sbg:x': 500
- 'sbg:y': 500
- id: write_solutions
in:
- id: h5parmFile
@@ -416,8 +346,6 @@ steps:
- id: log
run: ../../steps/h5parmcat.cwl
label: write_solutions
- 'sbg:x': -200
- 'sbg:y': 700
- id: apply_calibrate_bp
in:
- id: msin
@@ -443,8 +371,6 @@ steps:
label: apply_calibrate_bp
scatter:
- msin
- 'sbg:x': 500
- 'sbg:y': 0
- id: final_flags_join
in:
- id: flagged_fraction_dict
@@ -458,8 +384,6 @@ steps:
- id: flagged_fraction_antenna
run: ./../../steps/findRefAnt_join.cwl
label: final_flags_join
- 'sbg:x': 750
- 'sbg:y': 150
- id: concat_logfiles_blsmooth
in:
- id: file_list
@@ -471,8 +395,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_blsmooth
- 'sbg:x': 750
- 'sbg:y': 300
- id: concat_logfiles_apply_pa
in:
- id: file_list
@@ -484,8 +406,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_apply_pa
- 'sbg:x': 750
- 'sbg:y': 400
- id: concat_logfiles_apply_fr
in:
- id: file_list
@@ -497,8 +417,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_apply_fr
- 'sbg:x': 750
- 'sbg:y': 500
- id: concat_logfiles_apply
in:
- id: file_list
@@ -510,8 +428,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_apply
- 'sbg:x': 750
- 'sbg:y': 600
- id: concat_logfiles_beam
in:
- id: file_list
@@ -523,8 +439,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_beam
- 'sbg:x': 750
- 'sbg:y': 700
- id: concat_logfiles_calib
in:
- id: file_list
@@ -536,8 +450,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_calib
- 'sbg:x': 750
- 'sbg:y': 800
- id: h5parm_collector
in:
- id: h5parmFiles
@@ -554,8 +466,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/H5ParmCollector.cwl
label: H5parm_collector
- 'sbg:x': 750
- 'sbg:y': -300
- id: h5parm_pointingname
in:
- id: h5parmFile
@@ -569,8 +479,6 @@ steps:
- id: log
run: ../../steps/h5parm_pointingname.cwl
label: h5parm_pointingname
- 'sbg:x': 0
- 'sbg:y': 300
- id: transfer_solutions
in:
- id: h5parm
@@ -601,8 +509,6 @@ steps:
- id: plots
run: ../../steps/transfer_solutions.cwl
label: transfer_solutions
- 'sbg:x': 200
- 'sbg:y': 300
- id: concat_parset
in:
- id: file_list
@@ -619,8 +525,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_parset
- 'sbg:x': 0
- 'sbg:y': 500
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator/fr.cwl b/workflows/prefactor_calibrator/fr.cwl
index 6ea804e968928ba62d0882381deeb15b804853ad..ca9ced11f7f278fbab00fda5bdfc31126067ee54 100644
--- a/workflows/prefactor_calibrator/fr.cwl
+++ b/workflows/prefactor_calibrator/fr.cwl
@@ -2,58 +2,36 @@ class: Workflow
cwlVersion: v1.2
id: fr
label: FR
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -300
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -200
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -100
- id: h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 0
- id: refant
type: string?
default: 'CS001HBA0'
- 'sbg:x': -1000
- 'sbg:y': 100
- id: inh5parm_logfile
type: 'File[]'
- 'sbg:x': -1000
- 'sbg:y': 200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 300
- id: insolutions
type: File
- 'sbg:x': -1000
- 'sbg:y': 400
outputs:
- id: outh5parm
outputSource:
- h5parm_collector/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': -200
- id: msout
outputSource:
- apply_calibrate_fr/msout
type: 'Directory[]'
- 'sbg:x': 1000
- 'sbg:y': -100
- id: inspection
outputSource:
- losoto_plot_P3/output_plots
@@ -63,14 +41,10 @@ outputs:
- losoto_plot_fr/output_plots
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 0
- id: outsolutions
outputSource:
- write_solutions/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: logfiles
outputSource:
- concat_logfiles_fr/output
@@ -79,14 +53,10 @@ outputs:
- concat_logfiles_apply/output
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 200
- id: outh5parm_logfile
outputSource:
- h5parm_collector/log
type: 'File[]'
- 'sbg:x': 1000
- 'sbg:y': 300
steps:
- id: faraday_rot
in:
@@ -100,8 +70,6 @@ steps:
- id: logfiles
run: ../../subworkflow/faraday_rotation.cwl
label: FaradayRot
- 'sbg:x': -500
- 'sbg:y': 0
- id: losoto_plot_P3
in:
- id: input_h5parm
@@ -130,8 +98,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_P3
- 'sbg:x': 0
- 'sbg:y': -200
- id: losoto_plot_Pd
in:
- id: input_h5parm
@@ -162,8 +128,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pd
- 'sbg:x': 0
- 'sbg:y': -100
- id: losoto_plot_Rot3
in:
- id: input_h5parm
@@ -188,8 +152,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Rot3
- 'sbg:x': 0
- 'sbg:y': 0
- id: losoto_plot_A3
in:
- id: input_h5parm
@@ -212,8 +174,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_A3
- 'sbg:x': 0
- 'sbg:y': 100
- id: losoto_plot_fr
in:
- id: input_h5parm
@@ -235,8 +195,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_fr
- 'sbg:x': 0
- 'sbg:y': 200
- id: concat_logfiles_fr
in:
- id: file_list
@@ -256,8 +214,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_FR
- 'sbg:x': 500
- 'sbg:y': 500
- id: write_solutions
in:
- id: h5parmFile
@@ -277,8 +233,6 @@ steps:
- id: log
run: ../../steps/h5parmcat.cwl
label: write_solutions
- 'sbg:x': 0
- 'sbg:y': 500
- id: apply_calibrate_fr
in:
- id: msin
@@ -301,8 +255,6 @@ steps:
label: apply_calibrate_fr
scatter:
- msin
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_blsmooth
in:
- id: file_list
@@ -314,8 +266,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_blsmooth
- 'sbg:x': 750
- 'sbg:y': 300
- id: concat_logfiles_apply
in:
- id: file_list
@@ -327,8 +277,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_apply
- 'sbg:x': 750
- 'sbg:y': 600
- id: concat_logfiles_calib
in:
- id: file_list
@@ -340,8 +288,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_calib
- 'sbg:x': 750
- 'sbg:y': 800
- id: h5parm_collector
in:
- id: h5parmFiles
@@ -358,8 +304,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/H5ParmCollector.cwl
label: H5parm_collector
- 'sbg:x': 750
- 'sbg:y': -300
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator/ion.cwl b/workflows/prefactor_calibrator/ion.cwl
index 29ee3d68b59b14af675e145a0bcec82c6942bbdb..9c7036c4d39e77c62c12f87f3b942f9a845eadbd 100644
--- a/workflows/prefactor_calibrator/ion.cwl
+++ b/workflows/prefactor_calibrator/ion.cwl
@@ -2,83 +2,51 @@ class: Workflow
cwlVersion: v1.2
id: ion
label: ion
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: filter_baselines
type: string?
default: '*&'
- 'sbg:x': -1000
- 'sbg:y': -600
- id: demix_sources
type: 'string[]?'
default:
- CasA
- CygA
- 'sbg:x': -1000
- 'sbg:y': -500
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -400
- id: flags
type: File[]
- 'sbg:x': -1000
- 'sbg:y': -300
- id: calibrator_name
type: string?
default: 'POINTING'
- 'sbg:x': -1000
- 'sbg:y': -200
- id: clock_smooth
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -100
- id: ion_3rd
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 0
- id: refant
type: string?
default: 'CS001HBA0'
- 'sbg:x': -1000
- 'sbg:y': 100
- id: h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 200
- id: tables2export
type: string?
default: 'clock'
- 'sbg:x': -1000
- 'sbg:y': 300
- id: inh5parm_logfile
type: 'File[]'
- 'sbg:x': -1000
- 'sbg:y': 400
- id: maxStddev
type: float?
default: -1.0
- 'sbg:x': -1000
- 'sbg:y': 500
- id: insolutions
type: File
- 'sbg:x': -1000
- 'sbg:y': 600
- id: check_Ateam_separation.json
type: File
- 'sbg:x': -1000
- 'sbg:y': 700
outputs:
- id: summary_file
outputSource:
- summary/summary_file
type: File
- 'sbg:x': 1000
- 'sbg:y': -100
- id: inspection
outputSource:
- losoto_plot_P3/output_plots
@@ -88,22 +56,16 @@ outputs:
- losoto_plot_Pr/output_plots
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 0
- id: outsolutions
outputSource:
- h5parm_pointingname/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: logfiles
outputSource:
- concat_logfiles_ion/output
- concat_logfiles_summary/output
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 200
steps:
- id: clocktec
in:
@@ -121,8 +83,6 @@ steps:
- id: parset
run: ../../subworkflow/clocktec.cwl
label: clocktec
- 'sbg:x': -500
- 'sbg:y': 0
- id: losoto_plot_P3
in:
- id: input_h5parm
@@ -151,8 +111,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_P3
- 'sbg:x': 0
- 'sbg:y': -200
- id: losoto_plot_tec
in:
- id: input_h5parm
@@ -176,8 +134,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_tec
- 'sbg:x': 0
- 'sbg:y': 0
- id: losoto_plot_tec3rd
in:
- id: input_h5parm
@@ -203,8 +159,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_tec3rd
- 'sbg:x': 0
- 'sbg:y': 100
- id: losoto_plot_clock
in:
- id: input_h5parm
@@ -228,8 +182,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_clock
- 'sbg:x': 0
- 'sbg:y': 200
- id: losoto_plot_Pr
in:
- id: input_h5parm
@@ -258,8 +210,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pr
- 'sbg:x': 0
- 'sbg:y': 300
- id: summary
in:
- id: flagFiles
@@ -287,8 +237,6 @@ steps:
- id: logfile
run: ../../steps/summary.cwl
label: summary
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_ion
in:
- id: file_list
@@ -309,8 +257,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_ion
- 'sbg:x': 500
- 'sbg:y': 500
- id: concat_logfiles_summary
in:
- id: file_list
@@ -324,8 +270,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_summary
- 'sbg:x': 700
- 'sbg:y': 500
- id: write_solutions
in:
- id: h5parmFile
@@ -345,8 +289,6 @@ steps:
- id: log
run: ../../steps/h5parmcat.cwl
label: write_solutions
- 'sbg:x': -200
- 'sbg:y': 700
- id: h5parm_pointingname
in:
- id: h5parmFile
@@ -360,8 +302,6 @@ steps:
- id: log
run: ../../steps/h5parm_pointingname.cwl
label: h5parm_pointingname
- 'sbg:x': 0
- 'sbg:y': 700
requirements:
- class: InlineJavascriptRequirement
- class: StepInputExpressionRequirement
diff --git a/workflows/prefactor_calibrator/pa.cwl b/workflows/prefactor_calibrator/pa.cwl
index 978a974e3b152119810ee041171ece0835a37478..b692cb50f11be449826b0487ee048c150507650a 100644
--- a/workflows/prefactor_calibrator/pa.cwl
+++ b/workflows/prefactor_calibrator/pa.cwl
@@ -2,59 +2,37 @@ class: Workflow
cwlVersion: v1.2
id: pa
label: PA
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -300
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -200
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -100
- id: h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': 0
- id: refant
type: string?
default: 'CS001HBA0'
- 'sbg:x': -1000
- 'sbg:y': 100
- id: inh5parm_logfile
type: 'File[]'
- 'sbg:x': -1000
- 'sbg:y': 200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 300
- id: fit_offset_PA
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 400
outputs:
- id: outh5parm
outputSource:
- h5parm_collector/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': -200
- id: msout
outputSource:
- apply_calibrate_pa/msout
type: 'Directory[]'
- 'sbg:x': 1000
- 'sbg:y': -100
- id: inspection
outputSource:
- losoto_plot_P3/output_plots
@@ -66,14 +44,10 @@ outputs:
- losoto_plot_Pr2/output_plots
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 0
- id: outsolutions
outputSource:
- write_solutions/outh5parm
type: File
- 'sbg:x': 1000
- 'sbg:y': 100
- id: logfiles
outputSource:
- concat_logfiles_pa/output
@@ -83,14 +57,10 @@ outputs:
- concat_logfiles_apply/output
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 200
- id: outh5parm_logfile
outputSource:
- h5parm_collector/log
type: 'File[]'
- 'sbg:x': 1000
- 'sbg:y': 300
steps:
- id: pol_align
in:
@@ -106,8 +76,6 @@ steps:
- id: logfiles
run: ../../subworkflow/pol_align.cwl
label: PolAlign
- 'sbg:x': -500
- 'sbg:y': 0
- id: losoto_plot_P3
in:
- id: input_h5parm
@@ -136,8 +104,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_P3
- 'sbg:x': 0
- 'sbg:y': -200
- id: losoto_plot_Pd
in:
- id: input_h5parm
@@ -168,8 +134,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pd
- 'sbg:x': 0
- 'sbg:y': -100
- id: losoto_plot_Rot3
in:
- id: input_h5parm
@@ -194,8 +158,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Rot3
- 'sbg:x': 0
- 'sbg:y': 0
- id: losoto_plot_A3
in:
- id: input_h5parm
@@ -218,8 +180,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_A3
- 'sbg:x': 0
- 'sbg:y': 100
- id: losoto_plot_Align
in:
- id: input_h5parm
@@ -250,8 +210,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Align
- 'sbg:x': 0
- 'sbg:y': 200
- id: losoto_plot_Pr
in:
- id: input_h5parm
@@ -282,8 +240,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pr
- 'sbg:x': 0
- 'sbg:y': 300
- id: losoto_plot_Pr2
in:
- id: input_h5parm
@@ -314,8 +270,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pr2
- 'sbg:x': 0
- 'sbg:y': 400
- id: concat_logfiles_pa
in:
- id: file_list
@@ -337,8 +291,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_PA
- 'sbg:x': 500
- 'sbg:y': 500
- id: write_solutions
in:
- id: h5parmFiles
@@ -359,8 +311,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/H5ParmCollector.cwl
label: write_solutions
- 'sbg:x': 0
- 'sbg:y': 500
- id: apply_calibrate_pa
in:
- id: msin
@@ -384,8 +334,6 @@ steps:
label: apply_calibrate_pa
scatter:
- msin
- 'sbg:x': 500
- 'sbg:y': 0
- id: concat_logfiles_blsmooth
in:
- id: file_list
@@ -397,8 +345,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_blsmooth
- 'sbg:x': 750
- 'sbg:y': 300
- id: concat_logfiles_beam
in:
- id: file_list
@@ -410,8 +356,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_beam
- 'sbg:x': 750
- 'sbg:y': 400
- id: concat_logfiles_apply
in:
- id: file_list
@@ -423,8 +367,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_apply
- 'sbg:x': 750
- 'sbg:y': 600
- id: concat_logfiles_calib
in:
- id: file_list
@@ -436,8 +378,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_calib
- 'sbg:x': 750
- 'sbg:y': 800
- id: h5parm_collector
in:
- id: h5parmFiles
@@ -454,8 +394,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/H5ParmCollector.cwl
label: H5parm_collector
- 'sbg:x': 750
- 'sbg:y': -300
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl
index 9ae79f97207684395fd9b377960a30482a320b25..efefe61d3a7cfe0275aaf72e5c73dc0fbcbd8e0f 100644
--- a/workflows/prefactor_calibrator/prep.cwl
+++ b/workflows/prefactor_calibrator/prep.cwl
@@ -2,180 +2,112 @@ class: Workflow
cwlVersion: v1.2
id: prep
label: prep
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -515.1839599609375
- 'sbg:y': 330.674560546875
- id: filter_baselines
type: string?
default: '*&'
- 'sbg:x': 254.234375
- 'sbg:y': 684
- id: raw_data
type: boolean?
default: false
- 'sbg:x': 0
- 'sbg:y': 563
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': 0
- 'sbg:y': 670
- id: flagunconverged
type: boolean?
default: false
- 'sbg:x': 559.319091796875
- 'sbg:y': 837.5
- id: demix
type: boolean?
default: false
- 'sbg:x': 254.234375
- 'sbg:y': 1326
- id: max_dppp_threads
type: int?
default: 10
- 'sbg:x': 254.234375
- 'sbg:y': 214
- id: memoryperc
type: int?
default: 20
- 'sbg:x': 254.234375
- 'sbg:y': 107
- id: flag_baselines
type: 'string[]?'
default: []
- 'sbg:x': 254.234375
- 'sbg:y': 442
- id: avg_timeresolution
type: int?
default: 4
- 'sbg:x': 254.234375
- 'sbg:y': 1554
- id: avg_freqresolution
type: string?
default: '48.82kHz'
- 'sbg:x': 254.234375
- 'sbg:y': 1661
- id: process_baselines_cal
type: string?
default: '*&'
- 'sbg:x': 0
- 'sbg:y': 777
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': 254.234375
- 'sbg:y': 898
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': 254.234375
- 'sbg:y': 1219
- id: demix_target
type: string?
default: ''
- 'sbg:x': 254.234375
- 'sbg:y': 1005
- id: demix_sources
type: 'string[]?'
default: []
- 'sbg:x': 254.234375
- 'sbg:y': 1112
- id: min_length
type: int?
default: 50
- 'sbg:x': 360
- 'sbg:y': 1919.42626953125
- id: overhead
type: float?
default: 0.8
- 'sbg:x': 180
- 'sbg:y': 1903.963134765625
- id: min_separation
type: int?
default: 30
- 'sbg:x': 0
- 'sbg:y': 884
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': 559.319091796875
- 'sbg:y': 944.5
- id: max_separation_arcmin
type: float?
default: 1.0
- 'sbg:x': 0
- 'sbg:y': 991
- id: calibrator_path_skymodel
type: Directory?
- 'sbg:x': 0
- 'sbg:y': 1098
- id: A-Team_skymodel
type: File?
- 'sbg:x': 0
- 'sbg:y': 1205
- id: elevation
type: string?
default: 0deg..15deg
- 'sbg:x': 254.234375
- 'sbg:y': 791
- id: amplmin
type: float?
default: 1.e-30
- 'sbg:x': 254.234375
- 'sbg:y': 1768
outputs:
- id: outh5parm
outputSource:
- h5parm_collector/outh5parm
type: File
- 'sbg:x': 1554.5106201171875
- 'sbg:y': 884
- id: check_Ateam_separation.png
outputSource:
- check_ateam_separation/output_imag
type: File
- 'sbg:x': 559.319091796875
- 'sbg:y': 1051.5
- id: msout
outputSource:
- predict_calibrate/msout
type: 'Directory[]'
- 'sbg:x': 1329.937255859375
- 'sbg:y': 663
- id: calibrator_name
outputSource:
- find_skymodel_cal/model_name
type: string
- 'sbg:x': 559.319091796875
- 'sbg:y': 1158.5
- id: outh5parm_logfile
outputSource:
- h5parm_collector/log
type: 'File[]'
- 'sbg:x': 1554.5106201171875
- 'sbg:y': 777
- id: check_Ateam_separation.json
outputSource:
- check_ateam_separation/output_json
type: File
- 'sbg:x': 1554.5106201171875
- 'sbg:y': 500
- id: flagged_fraction_dict_refant
outputSource:
- predict_calibrate/flagged_fraction_dict
type: string[]
- 'sbg:x': 1550
- 'sbg:y': 200
- id: flagged_fraction_dict
outputSource:
- ndppp_prep_cal/flagged_fraction_dict
type: string[]
- 'sbg:x': 1550
- 'sbg:y': 800
- id: logfiles
outputSource:
- concat_logfiles_calib/output
@@ -190,8 +122,6 @@ outputs:
- aoflag/logfile
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1554.5106201171875
- 'sbg:y': 991
steps:
- id: select
in:
@@ -202,8 +132,6 @@ steps:
- id: output
run: ../../steps/selectfirstdirectory.cwl
label: select_only_first
- 'sbg:x': -303.7861022949219
- 'sbg:y': 542.37646484375
- id: ndppp_prep_cal
in:
- id: baselines_to_flag
@@ -263,8 +191,6 @@ steps:
label: ndppp_prep_cal
scatter:
- msin
- 'sbg:x': 559.319091796875
- 'sbg:y': 497.5
- id: predict_calibrate
in:
- id: msin
@@ -290,8 +216,6 @@ steps:
label: predict_calibrate
scatter:
- msin
- 'sbg:x': 1027.490966796875
- 'sbg:y': 749
- id: ms_concat
in:
- id: min_length
@@ -309,8 +233,6 @@ steps:
- id: logfile
run: ../../lofar-cwl/steps/ms_concat.cwl
label: ms_concat
- 'sbg:x': 700
- 'sbg:y': 749
- id: aoflag
in:
- id: msin
@@ -330,8 +252,6 @@ steps:
- id: logfile
run: ../../steps/aoflag.cwl
label: aoflag
- 'sbg:x': 850
- 'sbg:y': 749
- id: check_ateam_separation
in:
- id: ms
@@ -345,8 +265,6 @@ steps:
- id: logfile
run: ../../steps/check_ateam_separation.cwl
label: check_Ateam_separation
- 'sbg:x': 254.234375
- 'sbg:y': 1440
- id: make_sourcedb_ateam
in:
- id: sky_model
@@ -358,8 +276,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/makesourcedb.cwl
label: make_sourcedb_ateam
- 'sbg:x': 254.234375
- 'sbg:y': 328
- id: find_skymodel_cal
in:
- id: msin
@@ -375,8 +291,6 @@ steps:
- id: logfile
run: ../../steps/find_skymodel_cal.cwl
label: find_skymodel_cal
- 'sbg:x': 254.234375
- 'sbg:y': 563
- id: make_sourcedb
in:
- id: sky_model
@@ -388,8 +302,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/makesourcedb.cwl
label: make_sourcedb
- 'sbg:x': 559.319091796875
- 'sbg:y': 723.5
- id: concat_logfiles_prep_cal
in:
- id: file_list
@@ -402,8 +314,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_prep_cal
- 'sbg:x': 1027.490966796875
- 'sbg:y': 991
- id: concat_logfiles_blsmooth
in:
- id: file_list
@@ -415,8 +325,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_blsmooth
- 'sbg:x': 1329.937255859375
- 'sbg:y': 1105
- id: concat_logfiles_predict
in:
- id: file_list
@@ -429,8 +337,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_predict
- 'sbg:x': 1329.937255859375
- 'sbg:y': 891
- id: concat_logfiles_calib
in:
- id: file_list
@@ -442,8 +348,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_calib
- 'sbg:x': 1329.937255859375
- 'sbg:y': 998
- id: h5parm_collector
in:
- id: h5parmFiles
@@ -460,8 +364,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/H5ParmCollector.cwl
label: H5parm_collector
- 'sbg:x': 1329.937255859375
- 'sbg:y': 777
requirements:
- class: InlineJavascriptRequirement
diff --git a/workflows/prefactor_target.cwl b/workflows/prefactor_target.cwl
index df95ce18890541f3c4a06c7c79ab11d14fc2954b..79525cc4f5c9f03a7a486fb029516402edbbd7f3 100644
--- a/workflows/prefactor_target.cwl
+++ b/workflows/prefactor_target.cwl
@@ -2,242 +2,146 @@ class: Workflow
cwlVersion: v1.2
id: prefactor_target
label: prefactor_target
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -1700
- id: cal_solutions
type: File
- 'sbg:x': -1000
- 'sbg:y': -1600
- id: refant
type: string?
default: CS00.*
- 'sbg:x': -1000
- 'sbg:y': -1500
- id: flag_baselines
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -1400
- id: process_baselines_target
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -1300
- id: filter_baselines
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -1200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1100
- id: rfistrategy
type: string?
default: HBAdefault.rfis
- 'sbg:x': -1000
- 'sbg:y': -1000
- id: min_unflagged_fraction
type: float?
default: 0.5
- 'sbg:x': -1000
- 'sbg:y': -900
- id: compression_bitrate
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': -800
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -700
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -600
- id: demix_sources
type: 'string[]?'
default:
- CasA
- CygA
- 'sbg:x': -1000
- 'sbg:y': -500
- id: demix_target
type: string?
default: ''
- 'sbg:x': -1000
- 'sbg:y': -400
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': -300
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': -200
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -100
- id: apply_tec
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 0
- id: apply_clock
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 100
- id: apply_phase
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 200
- id: apply_RM
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 300
- id: apply_beam
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 400
- id: clipATeam
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 500
- id: gsmcal_step
type: string?
default: phase
- 'sbg:x': -1000
- 'sbg:y': 600
- id: updateweights
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 700
- id: max_dppp_threads
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 800
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -1000
- 'sbg:y': 900
- id: min_length
type: int?
default: 5
- 'sbg:x': -1000
- 'sbg:y': 1000
- id: overhead
type: float?
default: 0.7
- 'sbg:x': -1000
- 'sbg:y': 1100
- id: min_separation
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': 1200
- id: A-Team_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 1300
- id: target_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 1400
- id: use_target
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 1500
- id: skymodel_source
type: string?
default: TGSS
- 'sbg:x': -1000
- 'sbg:y': 1600
- id: avg_timeresolution
type: int?
default: 4
- 'sbg:x': -1000
- 'sbg:y': 1700
- id: avg_freqresolution
type: string?
default: 48.82kHz
- 'sbg:x': -1000
- 'sbg:y': 1800
- id: avg_timeresolution_concat
type: int?
default: 8
- 'sbg:x': -1000
- 'sbg:y': 1900
- id: avg_freqresolution_concat
type: string?
default: 97.64kHz
- 'sbg:x': -1000
- 'sbg:y': 2000
- id: num_SBs_per_group
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 2100
- id: reference_stationSB
type: int?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2200
- id: ionex_server
type: string?
default: 'ftp://ftp.aiub.unibe.ch/CODE/'
- 'sbg:x': -1000
- 'sbg:y': 2300
- id: ionex_prefix
type: string?
default: CODG
- 'sbg:x': -1000
- 'sbg:y': 2400
- id: proxy_server
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2500
- id: proxy_port
type: int?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2600
- id: proxy_type
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2700
- id: proxy_user
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2800
- id: proxy_pass
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 2900
- id: clip_sources
type: 'string[]?'
default:
@@ -245,13 +149,9 @@ inputs:
- CygAGG
- CasA_4_patch
- TauAGG
- 'sbg:x': -1000
- 'sbg:y': 3000
- id: ncores
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': 3100
outputs:
- id: inspection
outputSource:
@@ -260,20 +160,14 @@ outputs:
- finalize/inspection
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 2000
- 'sbg:y': -600
- id: solutions
outputSource:
- finalize/solutions
type: File
- 'sbg:x': 2000
- 'sbg:y': -500
- id: msout
outputSource:
- finalize/msout
type: 'Directory[]'
- 'sbg:x': 2000
- 'sbg:y': 0
- id: logfiles
outputSource:
- prep/logfiles
@@ -281,14 +175,10 @@ outputs:
- finalize/logfiles
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 2000
- 'sbg:y': 600
- id: summary_file
outputSource:
- finalize/summary_file
type: File
- 'sbg:x': 2000
- 'sbg:y': 300
steps:
- id: prep
in:
@@ -370,8 +260,6 @@ steps:
- id: logfiles
run: ./prefactor_target/prep.cwl
label: prep
- 'sbg:x': 0
- 'sbg:y': 0
- id: gsmcal
in:
- id: msin
@@ -418,8 +306,6 @@ steps:
- id: out_refant
run: ./prefactor_target/gsmcal.cwl
label: gsmcal
- 'sbg:x': 900
- 'sbg:y': 0
- id: finalize
in:
- id: msin
@@ -477,8 +363,6 @@ steps:
- id: summary_file
run: ./prefactor_target/finalize.cwl
label: finalize
- 'sbg:x': 1200
- 'sbg:y': 0
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_target/finalize.cwl b/workflows/prefactor_target/finalize.cwl
index 674b511cd43678d00e021c8a0013c82d3e02a699..23e37388ecd48dd1eea4497eff3cde21d04c49f3 100644
--- a/workflows/prefactor_target/finalize.cwl
+++ b/workflows/prefactor_target/finalize.cwl
@@ -2,121 +2,73 @@ class: Workflow
cwlVersion: v1.2
id: finalize
label: finalize
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: refant
type: string?
default: 'CS001HBA0'
- 'sbg:x': -1000
- 'sbg:y': -1000
- id: min_unflagged_fraction
type: float?
default: 0.5
- 'sbg:x': -1000
- 'sbg:y': -900
- id: removed_bands
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -800
- id: demix_sources
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -700
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -600
- id: clip_sources
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -500
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -400
- id: input_h5parm
type: File
- 'sbg:x': -1000
- 'sbg:y': -300
- id: inh5parm_logfile
type: File
- 'sbg:x': -1000
- 'sbg:y': -200
- id: gsmcal_step
type: string?
default: 'phase'
- 'sbg:x': -1000
- 'sbg:y': -100
- id: process_baselines_target
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': 0
- id: bad_antennas
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': 100
- id: insolutions
type: File
- 'sbg:x': -1000
- 'sbg:y': 200
- id: compression_bitrate
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': 300
- id: skymodel_source
type: string?
default: 'TGSS'
- 'sbg:x': -1000
- 'sbg:y': 400
- id: total_bandwidth
type: int?
default: 50
- 'sbg:x': -1000
- 'sbg:y': 500
- id: check_Ateam_separation.json
type: File
- 'sbg:x': -1000
- 'sbg:y': 600
- id: filter_baselines
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': 700
- id: compare_stations_filter
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': 800
- id: flags
type: File[]
- 'sbg:x': -1000
- 'sbg:y': 900
- id: ncores
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': 1000
outputs:
- id: msout
outputSource:
- apply_gsmcal/msout
type: 'Directory[]'
- 'sbg:x': 1300
- 'sbg:y': 0
- id: solutions
outputSource:
- h5parm_pointingname/outh5parm
type: File
- 'sbg:x': 1300
- 'sbg:y': 200
- id: logfiles
outputSource:
- concat_logfiles_applygsm/output
@@ -127,8 +79,6 @@ outputs:
- concat_logfiles_uvplot/output
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1300
- 'sbg:y': 800
- id: inspection
outputSource:
- structure_function/structure_plot
@@ -136,14 +86,10 @@ outputs:
- uvplot/output_image
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1300
- 'sbg:y': 500
- id: summary_file
outputSource:
- summary/summary_file
type: File
- 'sbg:x': 1300
- 'sbg:y': 1000
steps:
- id: add_missing_stations
in:
@@ -172,8 +118,6 @@ steps:
- id: log
run: ../../steps/add_missing_stations.cwl
label: add_missing_stations
- 'sbg:x': -200
- 'sbg:y': -300
- id: apply_gsmcal
in:
- id: msin
@@ -210,8 +154,6 @@ steps:
- msin
- msout_name
scatterMethod: dotproduct
- 'sbg:x': 400
- 'sbg:y': 0
- id: final_flags_join
in:
- id: flagged_fraction_dict
@@ -225,8 +167,6 @@ steps:
- id: flagged_fraction_antenna
run: ./../../steps/findRefAnt_join.cwl
label: final_flags_join
- 'sbg:x': 600
- 'sbg:y': -400
- id: average
in:
- id: msin
@@ -257,8 +197,6 @@ steps:
- msin
- msout_name
scatterMethod: dotproduct
- 'sbg:x': 600
- 'sbg:y': -200
- id: summary
in:
- id: flagFiles
@@ -303,8 +241,6 @@ steps:
- id: logfile
run: ../../steps/summary.cwl
label: summary
- 'sbg:x': 800
- 'sbg:y': 0
- id: uvplot
in:
- id: MSfiles
@@ -322,8 +258,6 @@ steps:
- id: logfile
run: ../../steps/uvplot.cwl
label: uvplot
- 'sbg:x': 800
- 'sbg:y': 300
- id: wsclean
in:
- id: msin
@@ -369,8 +303,6 @@ steps:
- id: logfile
run: ../../lofar-cwl/steps/wsclean.cwl
label: wsclean
- 'sbg:x': 800
- 'sbg:y': -200
- id: merge_array_files
in:
- id: input
@@ -380,8 +312,6 @@ steps:
- id: output
run: ../../steps/merge_array_files.cwl
label: merge_array_files
- 'sbg:x': 600
- 'sbg:y': 0
- id: write_solutions
in:
- id: h5parmFile
@@ -406,8 +336,6 @@ steps:
- id: log
run: ../../steps/h5parmcat.cwl
label: write_solutions
- 'sbg:x': 200
- 'sbg:y': 500
- id: h5parm_pointingname
in:
- id: h5parmFile
@@ -421,8 +349,6 @@ steps:
- id: log
run: ../../steps/h5parm_pointingname.cwl
label: h5parm_pointingname
- 'sbg:x': 400
- 'sbg:y': 200
- id: structure_function
in:
- id: h5parmFile
@@ -442,8 +368,6 @@ steps:
- id: log
run: ../../steps/structure_function.cwl
label: structure_function
- 'sbg:x': 500
- 'sbg:y': 300
- id: concat_logfiles_applygsm
in:
- id: file_list
@@ -455,8 +379,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_applygsm
- 'sbg:x': 750
- 'sbg:y': 500
- id: concat_logfiles_solutions
in:
- id: file_list
@@ -473,8 +395,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_solutions
- 'sbg:x': 500
- 'sbg:y': 500
- id: concat_logfiles_structure
in:
- id: file_list
@@ -489,8 +409,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_structure
- 'sbg:x': 950
- 'sbg:y': 500
- id: concat_logfiles_wsclean
in:
- id: file_list
@@ -503,8 +421,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_wsclean
- 'sbg:x': 1100
- 'sbg:y': 500
- id: concat_logfiles_summary
in:
- id: file_list
@@ -518,8 +434,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_summary
- 'sbg:x': 1050
- 'sbg:y': 0
- id: concat_logfiles_uvplot
in:
- id: file_list
@@ -532,8 +446,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_uvplot
- 'sbg:x': 1050
- 'sbg:y': 300
- id: get_targetname
in:
- id: msin
@@ -545,8 +457,6 @@ steps:
- id: logfile
run: ../../steps/get_targetname.cwl
label: get_targetname
- 'sbg:x': 200
- 'sbg:y': 200
requirements:
- class: StepInputExpressionRequirement
- class: InlineJavascriptRequirement
diff --git a/workflows/prefactor_target/gsmcal.cwl b/workflows/prefactor_target/gsmcal.cwl
index b73ab15bfb925d6fe39c9f9053e276f99363bcc5..2f202b0e0ede65dc8d4d5f3e74202b7dd6236085 100644
--- a/workflows/prefactor_target/gsmcal.cwl
+++ b/workflows/prefactor_target/gsmcal.cwl
@@ -2,113 +2,71 @@ class: Workflow
cwlVersion: v1.2
id: gsmcal
label: gsmcal
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -400
- id: filter_baselines
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -300
- id: num_SBs_per_group
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': -200
- id: reference_stationSB
type: int?
default: null
- 'sbg:x': -1000
- 'sbg:y': -100
- id: use_target
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 0
- id: target_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 100
- id: skymodel_source
type: string?
default: 'TGSS'
- 'sbg:x': -1000
- 'sbg:y': 200
- id: do_smooth
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': 300
- id: propagatesolutions
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 400
- id: avg_timeresolution_concat
type: int?
default: 8
- 'sbg:x': -1000
- 'sbg:y': 500
- id: avg_freqresolution_concat
type: string?
default: '97.64kHz'
- 'sbg:x': -1000
- 'sbg:y': 600
- id: min_unflagged_fraction
type: float?
default: 0.5
- 'sbg:x': -1000
- 'sbg:y': 700
- id: refant
type: string?
default: 'CS001HBA0'
- 'sbg:x': -1000
- 'sbg:y': 800
- id: min_length
type: int?
default: 5
- 'sbg:x': -1000
- 'sbg:y': 900
- id: overhead
type: float?
default: 0.8
- 'sbg:x': -1000
- 'sbg:y': 1000
outputs:
- id: msout
outputSource:
- calibrate_target/msout
type: 'Directory[]'
- 'sbg:x': 1900
- 'sbg:y': 0
- id: outh5parm
outputSource:
- h5parm_collector/outh5parm
type: File
- 'sbg:x': 1900
- 'sbg:y': 200
- id: bad_antennas
outputSource:
- identifybadantennas_join/filter_out
type: string
- 'sbg:x': 1900
- 'sbg:y': 400
- id: outh5parm_logfile
outputSource:
- concat_logfiles_losoto/output
type: File
- 'sbg:x': 1900
- 'sbg:y': 600
- id: Ateam_flags_join_out
outputSource:
- Ateam_flags_join/flagged_fraction_antenna
type: File
- 'sbg:x': 1900
- 'sbg:y': 700
- id: inspection
outputSource:
- losoto_plot_P/output_plots
@@ -118,14 +76,10 @@ outputs:
- plot_unflagged/output_imag
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1900
- 'sbg:y': 800
- id: out_refant
outputSource:
- findRefAnt_join/refant
type: string
- 'sbg:x': 1900
- 'sbg:y': 900
- id: logfiles
outputSource:
- concat_logfiles_identify/output
@@ -141,20 +95,14 @@ outputs:
- aoflag/logfile
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1900
- 'sbg:y': 1000
- id: removed_bands
outputSource:
- check_unflagged_fraction/filenames
type: 'string[]'
- 'sbg:x': 1900
- 'sbg:y': 1100
- id: total_bandwidth
outputSource:
- sort_times_into_freqGroups/total_bandwidth
type: int
- 'sbg:x': 1900
- 'sbg:y': 1200
steps:
- id: identifybadantennas
in:
@@ -167,8 +115,6 @@ steps:
label: identifybadantennas
scatter:
- msin
- 'sbg:x': -200
- 'sbg:y': -300
- id: identifybadantennas_join
in:
- id: flaggedants
@@ -181,8 +127,6 @@ steps:
- id: logfile
run: ../../steps/identify_bad_antennas_join.cwl
label: identifybadantennas_join
- 'sbg:x': 0
- 'sbg:y': -300
- id: findRefAnt_join
in:
- id: flagged_fraction_dict
@@ -195,8 +139,6 @@ steps:
- id: logfile
run: ../../steps/findRefAnt_join.cwl
label: findRefAnt_join
- 'sbg:x': 200
- 'sbg:y': -300
- id: Ateam_flags_join
in:
- id: flagged_fraction_dict
@@ -210,8 +152,6 @@ steps:
- id: flagged_fraction_antenna
run: ../../steps/findRefAnt_join.cwl
label: Ateam_flags_join
- 'sbg:x': 400
- 'sbg:y': -300
- id: sort_times_into_freqGroups
in:
- id: msin
@@ -234,8 +174,6 @@ steps:
- id: logfile
run: ../../steps/sort_times_into_freqGroups.cwl
label: sorttimesintofreqGroups
- 'sbg:x': -200
- 'sbg:y': 0
- id: find_skymodel_target
in:
- id: msin
@@ -254,8 +192,6 @@ steps:
- id: logfile
run: ../../steps/find_skymodel_target.cwl
label: find_skymodel_target
- 'sbg:x': -200
- 'sbg:y': -500
- id: make_sourcedb_target
in:
- id: sky_model
@@ -269,8 +205,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/makesourcedb.cwl
label: make_sourcedb_target
- 'sbg:x': 0
- 'sbg:y': -500
- id: concat_logfiles_dpppconcat
in:
- id: file_list
@@ -282,8 +216,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_dpppconcat
- 'sbg:x': 1600
- 'sbg:y': 100
- id: concat_logfiles_blsmooth
in:
- id: file_list
@@ -295,8 +227,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_blsmooth
- 'sbg:x': 1600
- 'sbg:y': 300
- id: concat_logfiles_calib
in:
- id: file_list
@@ -308,8 +238,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_calib
- 'sbg:x': 1600
- 'sbg:y': 500
- id: concat_logfiles_losoto
in:
- id: file_list
@@ -326,8 +254,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_losoto
- 'sbg:x': 1600
- 'sbg:y': 700
- id: concat_logfiles_unflagged
in:
- id: file_list
@@ -341,8 +267,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_unflagged
- 'sbg:x': 1600
- 'sbg:y': 900
- id: concat_logfiles_identify
in:
- id: file_list
@@ -356,8 +280,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_identify
- 'sbg:x': 1600
- 'sbg:y': -100
- id: concat_logfiles_RefAnt
in:
- id: file_list
@@ -370,8 +292,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_RefAnt
- 'sbg:x': 1600
- 'sbg:y': -300
- id: concat
in:
- id: msin
@@ -397,8 +317,6 @@ steps:
label: concat
scatter:
- group_id
- 'sbg:x': 200
- 'sbg:y': 0
- id: ms_concat
in:
- id: min_length
@@ -415,8 +333,6 @@ steps:
- id: logfile
run: ../../lofar-cwl/steps/ms_concat.cwl
label: ms_concat
- 'sbg:x': 400
- 'sbg:y': 0
- id: aoflag
in:
- id: msin
@@ -435,8 +351,6 @@ steps:
- id: logfile
run: ../../steps/aoflag.cwl
label: aoflag
- 'sbg:x': 600
- 'sbg:y': 0
- id: check_unflagged_fraction
in:
- id: msin
@@ -452,8 +366,6 @@ steps:
label: check_unflagged_fraction
scatter:
- msin
- 'sbg:x': 800
- 'sbg:y': 0
- id: merge_array
in:
- id: input
@@ -463,8 +375,6 @@ steps:
- id: output
run: ../../steps/merge_array.cwl
label: merge_array
- 'sbg:x': 1000
- 'sbg:y': -100
- id: merge_array_files
in:
- id: input
@@ -474,8 +384,6 @@ steps:
- id: output
run: ../../steps/merge_array_files.cwl
label: merge_array_files
- 'sbg:x': 1000
- 'sbg:y': 100
- id: check_filtered_MS_array
in:
- id: input
@@ -503,8 +411,6 @@ steps:
label: calibrate_target
scatter:
- msin
- 'sbg:x': 1200
- 'sbg:y': 0
- id: h5parm_collector
in:
- id: h5parmFiles
@@ -521,8 +427,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/H5ParmCollector.cwl
label: H5parm_collector
- 'sbg:x': 1200
- 'sbg:y': -300
- id: plot_unflagged
in:
- id: msin
@@ -536,8 +440,6 @@ steps:
- id: logfile
run: ../../steps/plot_unflagged.cwl
label: plot_unflagged
- 'sbg:x': 1400
- 'sbg:y': -400
- id: losoto_plot_P
in:
- id: input_h5parm
@@ -566,8 +468,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_P
- 'sbg:x': 1400
- 'sbg:y': 200
- id: losoto_plot_P2
in:
- id: input_h5parm
@@ -597,8 +497,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_P2
- 'sbg:x': 1400
- 'sbg:y': 50
- id: losoto_plot_Pd
in:
- id: input_h5parm
@@ -629,8 +527,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pd
- 'sbg:x': 1400
- 'sbg:y': -100
- id: losoto_plot_Pd2
in:
- id: input_h5parm
@@ -660,8 +556,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_Pd2
- 'sbg:x': 1400
- 'sbg:y': -250
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_target/prep.cwl b/workflows/prefactor_target/prep.cwl
index c228d4ee5d4c4c2ff8651211d459ca328582c13b..a8316471de6c7bb0b0ee56f3fb473a6b9dccf0de 100644
--- a/workflows/prefactor_target/prep.cwl
+++ b/workflows/prefactor_target/prep.cwl
@@ -2,42 +2,26 @@ class: Workflow
cwlVersion: v1.2
id: prep
label: prep
-$namespaces:
- sbg: 'https://www.sevenbridges.com/'
inputs:
- id: msin
type: 'Directory[]'
- 'sbg:x': -1000
- 'sbg:y': -1700
- id: cal_solutions
type: File
- 'sbg:x': -1000
- 'sbg:y': -1600
- id: flag_baselines
type: 'string[]?'
default: []
- 'sbg:x': -1000
- 'sbg:y': -1500
- id: process_baselines_target
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -1400
- id: filter_baselines
type: string?
default: '[CR]S*&'
- 'sbg:x': -1000
- 'sbg:y': -1300
- id: rfistrategy
type: string?
default: HBAdefault.rfis
- 'sbg:x': -1000
- 'sbg:y': -1200
- id: raw_data
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -1100
- id: clip_sources
type: 'string[]?'
default:
@@ -45,157 +29,97 @@ inputs:
- CygAGG
- CasA_4_patch
- TauAGG
- 'sbg:x': -1000
- 'sbg:y': -1000
- id: demix_sources
type: 'string[]?'
default:
- CasA
- CygA
- 'sbg:x': -1000
- 'sbg:y': -900
- id: demix_target
type: string?
default: ''
- 'sbg:x': -1000
- 'sbg:y': -800
- id: demix_freqstep
type: int?
default: 16
- 'sbg:x': -1000
- 'sbg:y': -700
- id: demix_timestep
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': -600
- id: demix
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -500
- id: apply_tec
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -400
- id: apply_clock
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -300
- id: apply_phase
type: boolean?
default: false
- 'sbg:x': -1000
- 'sbg:y': -200
- id: apply_RM
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': -100
- id: apply_beam
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 0
- id: clipATeam
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 100
- id: updateweights
type: boolean?
default: true
- 'sbg:x': -1000
- 'sbg:y': 200
- id: max_dppp_threads
type: int?
default: 10
- 'sbg:x': -1000
- 'sbg:y': 300
- id: memoryperc
type: int?
default: 20
- 'sbg:x': -1000
- 'sbg:y': 400
- id: min_separation
type: int?
default: 30
- 'sbg:x': -1000
- 'sbg:y': 500
- id: A-Team_skymodel
type: File?
- 'sbg:x': -1000
- 'sbg:y': 600
- id: avg_timeresolution
type: int?
default: 4
- 'sbg:x': -1000
- 'sbg:y': 700
- id: avg_freqresolution
type: string?
default: 48.82kHz
- 'sbg:x': -1000
- 'sbg:y': 800
- id: ionex_server
type: string?
default: 'ftp://ftp.aiub.unibe.ch/CODE/'
- 'sbg:x': -1000
- 'sbg:y': 900
- id: ionex_prefix
type: string?
default: CODG
- 'sbg:x': -1000
- 'sbg:y': 1000
- id: proxy_server
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 1100
- id: proxy_port
type: int?
default: null
- 'sbg:x': -1000
- 'sbg:y': 1200
- id: proxy_type
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 1300
- id: proxy_user
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 1400
- id: proxy_pass
type: string?
default: null
- 'sbg:x': -1000
- 'sbg:y': 1500
- id: elevation
type: string?
default: 0deg..15deg
- 'sbg:x': -1000
- 'sbg:y': 1600
- id: amplmin
type: float?
default: 1.e-30
- 'sbg:x': -1000
- 'sbg:y': 1700
outputs:
- id: compare_stations_filter
outputSource:
- compare_station_list/filter_out
type: string
- 'sbg:x': 1000
- 'sbg:y': -800
- id: outh5parm
outputSource:
- createRMh5parm/h5parmout
type: File
- 'sbg:x': 1000
- 'sbg:y': -500
- id: inspection
outputSource:
- check_ateam_separation/output_imag
@@ -203,20 +127,14 @@ outputs:
- plot_Ateamclipper/output_imag
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': -300
- id: msout
outputSource:
- dppp_prep_target/msout
type: 'Directory[]'
- 'sbg:x': 1000
- 'sbg:y': 0
- id: check_Ateam_separation.json
outputSource:
- check_ateam_separation/output_json
type: File
- 'sbg:x': 1000
- 'sbg:y': 500
- id: logfiles
outputSource:
- make_sourcedb_ateam/log
@@ -228,20 +146,14 @@ outputs:
- concat_logfiles_clipper_targ/output
type: 'File[]'
linkMerge: merge_flattened
- 'sbg:x': 1000
- 'sbg:y': 800
- id: initial_flags_join_out
outputSource:
- initial_flags_join/flagged_fraction_antenna
type: File
- 'sbg:x': 1000
- 'sbg:y': 1000
- id: prep_flags_join_out
outputSource:
- prep_flags_join/flagged_fraction_antenna
type: File
- 'sbg:x': 1000
- 'sbg:y': 1200
steps:
- id: initial_flags_join
in:
@@ -257,8 +169,6 @@ steps:
- id: logfile
run: ./../../steps/findRefAnt_join.cwl
label: initial_flags_join
- 'sbg:x': 600
- 'sbg:y': -200
- id: prep_flags_join
in:
- id: flagged_fraction_dict
@@ -273,8 +183,6 @@ steps:
- id: logfile
run: ./../../steps/findRefAnt_join.cwl
label: prep_flags_join
- 'sbg:x': 400
- 'sbg:y': -200
- id: check_ateam_separation
in:
- id: ms
@@ -288,8 +196,6 @@ steps:
- id: logfile
run: ../../steps/check_ateam_separation.cwl
label: check_Ateam_separation
- 'sbg:x': -500
- 'sbg:y': -300
- id: compare_station_list
in:
- id: msin
@@ -306,8 +212,6 @@ steps:
- id: logfile
run: ../../steps/compare_station_list.cwl
label: compare_station_list
- 'sbg:x': -500
- 'sbg:y': -500
- id: make_sourcedb_ateam
in:
- id: sky_model
@@ -319,8 +223,6 @@ steps:
- id: log
run: ../../lofar-cwl/steps/makesourcedb.cwl
label: make_sourcedb_ateam
- 'sbg:x': -500
- 'sbg:y': 300
- id: createRMh5parm
in:
- id: msin
@@ -349,8 +251,6 @@ steps:
- id: logfile
run: ../../steps/createRMh5parm.cwl
label: createRMh5parm
- 'sbg:x': -500
- 'sbg:y': 0
- id: losoto_plot_RM
in:
- id: input_h5parm
@@ -370,8 +270,6 @@ steps:
- id: parset
run: ../../lofar-cwl/steps/LoSoTo.Plot.cwl
label: losoto_plot_RM
- 'sbg:x': 0
- 'sbg:y': -300
- id: dppp_prep_target
in:
- id: baselines_to_flag
@@ -455,8 +353,6 @@ steps:
label: ndppp_prep_target
scatter:
- msin
- 'sbg:x': 0
- 'sbg:y': 0
- id: plot_Ateamclipper
in:
- id: clipper_output
@@ -465,8 +361,6 @@ steps:
- id: output_imag
run: ../../steps/plot_Ateamclipper.cwl
label: concat_logfiles_clipper_output
- 'sbg:x': 600
- 'sbg:y': 200
- id: concat_logfiles_clipper_output
in:
- id: file_list
@@ -481,8 +375,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_clipper_output
- 'sbg:x': 400
- 'sbg:y': 200
- id: concat_logfiles_prep_targ
in:
- id: file_list
@@ -495,8 +387,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_prep_target
- 'sbg:x': 400
- 'sbg:y': 300
- id: concat_logfiles_predict_targ
in:
- id: file_list
@@ -509,8 +399,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_predict_targ
- 'sbg:x': 400
- 'sbg:y': 400
- id: concat_logfiles_clipper_targ
in:
- id: file_list
@@ -523,8 +411,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_clipper_targ
- 'sbg:x': 400
- 'sbg:y': 500
- id: concat_logfiles_RMextract
in:
- id: file_list
@@ -538,8 +424,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_RMextract
- 'sbg:x': 400
- 'sbg:y': 600
- id: concat_logfiles_stationlist
in:
- id: file_list
@@ -552,8 +436,6 @@ steps:
- id: output
run: ../../steps/concatenate_files.cwl
label: concat_logfiles_stationlist
- 'sbg:x': 400
- 'sbg:y': 700
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement