From 41cba76f46afbbdb8675e927fa3d2a3e4bf446db Mon Sep 17 00:00:00 2001
From: Alexander Drabent <alex@tls-tautenburg.de>
Date: Tue, 10 Nov 2020 09:50:07 +0100
Subject: [PATCH] bugfix
Former-commit-id: 459f8d3cb7494cf8c2355d3a2297e6cc40278165 [formerly 26d41da81e9cf34bcb5b79131943dce77dc297ca]
Former-commit-id: e3a80e6d31f26ae68d5558ffd586cd43e135c4e0
Former-commit-id: 6c810fbb9fdd453ff16e6077c55ac465a0324001
---
lofar-cwl/steps/gaincal.cwl | 8 ++++++--
subworkflow/calib_targ.cwl | 2 ++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/lofar-cwl/steps/gaincal.cwl b/lofar-cwl/steps/gaincal.cwl
index 894068f5..843045b5 100644
--- a/lofar-cwl/steps/gaincal.cwl
+++ b/lofar-cwl/steps/gaincal.cwl
@@ -8,7 +8,7 @@ baseCommand:
- DPPP
inputs:
- id: msin
- type: Directory?
+ type: Directory
inputBinding:
position: 0
prefix: msin=
@@ -110,7 +110,7 @@ outputs:
doc: Output Measurement Set
type: Directory
outputBinding:
- glob: '$(inputs.msout_name=="."?inputs.msin:inputs.msout_name)'
+ glob: '$(inputs.msout_name=="."?inputs.msin.basename:inputs.msout_name)'
- id: h5parm
doc: Filename of output H5Parm (to be read by e.g. losoto)
type: File
@@ -129,6 +129,10 @@ hints:
- class: DockerRequirement
dockerPull: 'lofareosc/prefactor:HBAcalibrator'
requirements:
+ - class: InitialWorkDirRequirement
+ listing:
+ - entry: $(inputs.msin)
+ writable: true
- class: InlineJavascriptRequirement
$schema:
- 'https://git.astron.nl/eosc/ontologies/raw/master/schema/lofar.owl'
diff --git a/subworkflow/calib_targ.cwl b/subworkflow/calib_targ.cwl
index 953822e5..706c5ab7 100644
--- a/subworkflow/calib_targ.cwl
+++ b/subworkflow/calib_targ.cwl
@@ -71,6 +71,8 @@ steps:
source: BLsmooth/msout
- id: msin_datacolumn
default: SMOOTHED_DATA
+ - id: msout_name
+ default: '.'
- id: sourcedb
source: skymodel
- id: parmdb
--
GitLab