From 0cc1eef8ab927f7042b09fff56794328f8c0deeb Mon Sep 17 00:00:00 2001
From: Alexander Drabent <alex@tls-tautenburg.de>
Date: Tue, 13 Oct 2020 11:20:28 +0200
Subject: [PATCH] add variables
---
workflows/prefactor_target.cwl | 4 +++-
workflows/prefactor_target/finalize.cwl | 24 +++++++++++++++---------
2 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/workflows/prefactor_target.cwl b/workflows/prefactor_target.cwl
index 90b1bec1..b1ab4477 100644
--- a/workflows/prefactor_target.cwl
+++ b/workflows/prefactor_target.cwl
@@ -122,7 +122,7 @@ inputs:
'sbg:y': 500
- id: gsmcal_step
type: string?
- default: phase
+ default: 'phase'
'sbg:x': -1000
'sbg:y': 600
- id: updateweights
@@ -399,6 +399,8 @@ steps:
source: prep/outh5parm
- id: compression_bitrate
source: compression_bitrate
+ - id: skymodel_source
+ source: skymodel_source
out:
- id: msout
- id: solutions
diff --git a/workflows/prefactor_target/finalize.cwl b/workflows/prefactor_target/finalize.cwl
index d660be8d..eca05da6 100644
--- a/workflows/prefactor_target/finalize.cwl
+++ b/workflows/prefactor_target/finalize.cwl
@@ -20,24 +20,27 @@ inputs:
- id: gsmcal_step
type: string
'sbg:x': -1000
- 'sbg:y': -200
+ 'sbg:y': -100
- id: process_baselines_target
type: string
'sbg:x': -1000
- 'sbg:y': -100
+ 'sbg:y': 0
- id: bad_antennas
type: string
'sbg:x': -1000
- 'sbg:y': 0
+ 'sbg:y': 100
- id: insolutions
type: File
'sbg:x': -1000
- 'sbg:y': 100
+ 'sbg:y': 200
- id: compression_bitrate
type: int
'sbg:x': -1000
- 'sbg:y': 200
-
+ 'sbg:y': 300
+ - id: skymodel_source
+ type: string
+ 'sbg:x': -1000
+ 'sbg:y': 400
outputs:
- id: msout
outputSource:
@@ -74,7 +77,8 @@ steps:
source: gsmcal_step
valueFrom: $(self+'000')
- id: soltab_out
- default: 'TGSSphase'
+ source: gsmcal_step
+ valueFrom: $(inputs.skymodel_source+self)
- id: filter
source: process_baselines_target
- id: bad_antennas
@@ -102,7 +106,8 @@ steps:
- id: databitrate
source: compression_bitrate
- id: correction
- default: 'TGSSphase'
+ source: gsmcal_step
+ valueFrom: $(inputs.skymodel_source+self)
- id: solset
default: 'target'
- id: msout_name
@@ -124,7 +129,8 @@ steps:
- id: outsolset
default: target
- id: insoltab
- default: 'TGSSphase'
+ source: gsmcal_step
+ valueFrom: $(inputs.skymodel_source+self)
- id: input_file
source: insolutions
- id: squeeze
--
GitLab