From fe48151894ac571ab25cb510562c437e08628a45 Mon Sep 17 00:00:00 2001
From: Alexander Drabent <alex@tls-tautenburg.de>
Date: Fri, 31 Jul 2020 11:56:55 +0200
Subject: [PATCH] add parameters/defaults to prep_target
Former-commit-id: bb2bf0f2e9a1c78c5c0ac5383bbbaf56cc285af4
---
lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl | 4 +++-
subworkflow/ndppp_prep_targ.cwl | 19 ++++++++++++++++++-
subworkflow/prep_target_applycal.cwl | 12 +++++++++++-
workflows/prefactor_target/prep.cwl | 11 +++++------
4 files changed, 37 insertions(+), 9 deletions(-)
diff --git a/lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl b/lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
index 04e01359..4ddf0328 100755
--- a/lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
+++ b/lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -14,7 +14,7 @@ inputs:
default: applycal
- id: parmdb
- type: string
+ type: File
doc: Path of parmdb in which the parameters are stored. This can also be an H5Parm file, in that case the filename has to end in '.h5'
- id: solset
type: string?
@@ -36,6 +36,8 @@ inputs:
- scalaramplitude
- rotationmeasure
- fulljones
+ - polalign
+ - bandpass
doc: |
Type of correction to perform, can be one of 'gain', 'tec', 'clock',
'(common)rotationangle' / 'rotation', '(common)scalarphase',
diff --git a/subworkflow/ndppp_prep_targ.cwl b/subworkflow/ndppp_prep_targ.cwl
index 36e9e523..a6d509bf 100644
--- a/subworkflow/ndppp_prep_targ.cwl
+++ b/subworkflow/ndppp_prep_targ.cwl
@@ -70,7 +70,7 @@ inputs:
'sbg:x': 1257.9327392578125
'sbg:y': -290.095703125
- id: parmdb
- type: string
+ type: File
'sbg:x': 1930.5469970703125
'sbg:y': 298.99664306640625
- id: apply_tec_correction
@@ -93,6 +93,10 @@ inputs:
type: boolean
'sbg:x': 2391.738037109375
'sbg:y': 585.3051147460938
+ - id: filter_baselines
+ type: string
+ 'sbg:x': 1880
+ 'sbg:y': -380
outputs:
- id: logfile
outputSource:
@@ -276,6 +280,9 @@ steps:
'sbg:y': -6.564670085906982
- id: dp3_execute
in:
+ - id: msout_name
+ source: msin
+ valueFrom: $("out_"+self.basename)
- id: msin
source: msin
- id: steps
@@ -298,6 +305,10 @@ steps:
- id: steps
source:
- demix_select/selected_steps
+ - id: baseline
+ source: filter_baselines
+ - id: remove
+ default: true
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.FilterStepGenerator.cwl
@@ -310,6 +321,8 @@ steps:
- filter/augmented_steps
- id: parmdb
source: parmdb
+ - id: correction
+ default: polalign
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -320,6 +333,10 @@ steps:
- id: steps
source:
- applyPA/augmented_steps
+ - id: parmdb
+ source: parmdb
+ - id: correction
+ default: bandpass
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
diff --git a/subworkflow/prep_target_applycal.cwl b/subworkflow/prep_target_applycal.cwl
index a35cbf07..c88a868f 100644
--- a/subworkflow/prep_target_applycal.cwl
+++ b/subworkflow/prep_target_applycal.cwl
@@ -30,7 +30,7 @@ inputs:
'sbg:x': 2750.948974609375
'sbg:y': -241.39480590820312
- id: parmdb
- type: string
+ type: File
'sbg:x': 2007.115234375
'sbg:y': 685.0719604492188
outputs:
@@ -48,6 +48,8 @@ steps:
- steps
- id: parmdb
source: parmdb
+ - id: correction
+ default: 'clock'
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -60,6 +62,8 @@ steps:
- apply_clock/selected_steps
- id: parmdb
source: parmdb
+ - id: correction
+ default: 'tec'
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -72,6 +76,8 @@ steps:
- apply_beam/selected_steps
- id: parmdb
source: parmdb
+ - id: correction
+ default: 'phaseOrig'
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -84,6 +90,8 @@ steps:
- apply_tec/selected_steps
- id: parmdb
source: parmdb
+ - id: correction
+ default: 'RMextract'
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -94,6 +102,8 @@ steps:
- id: steps
source:
- apply_rm/selected_steps
+ - id: beammode
+ default: 'default'
out:
- id: augmented_steps
run: ../lofar-cwl/steps/DP3.ApplyBeamStepGenerator.cwl
diff --git a/workflows/prefactor_target/prep.cwl b/workflows/prefactor_target/prep.cwl
index 69b9b8e5..2fd96332 100644
--- a/workflows/prefactor_target/prep.cwl
+++ b/workflows/prefactor_target/prep.cwl
@@ -179,10 +179,6 @@ inputs:
default: 1.e-30
'sbg:x': -1000
'sbg:y': 1700
- - id: process_baselines_cal
- type: string
- 'sbg:x': -1000
- 'sbg:y': 1800
outputs:
- id: outh5parm
outputSource:
@@ -353,7 +349,7 @@ steps:
source: demix_freqstep
- id: demix_baseline
default: '*'
- source: process_baselines_cal
+ source: process_baselines_target
- id: target_source
source: demix_target
- id: ntimechunk
@@ -379,6 +375,8 @@ steps:
- id: apply_beam_correction
source: apply_beam
default: true
+ - id: filter_baselines
+ source: compare_station_list/filter_out
out:
- id: msout
- id: logfile
@@ -402,4 +400,5 @@ steps:
label: concat_logfiles_prep_targ
'sbg:x': 250
'sbg:y': 300
-requirements: []
+requirements:
+ - class: ScatterFeatureRequirement
\ No newline at end of file
--
GitLab