From d2b891f9ea5f7a68cf9c3c3e469130d93b0ae06e Mon Sep 17 00:00:00 2001
From: Marcel Loose <loose@astron.nl>
Date: Fri, 21 May 2021 12:49:28 +0000
Subject: [PATCH] Make all DockerRequirements hints
A few CWL-files list the DockerRequirement under requirements,
instead of hints, which precludes running the workflow as
`cwltool --no-container`. This has been fixed.
Former-commit-id: 088e9c30cdbd7968c3d7f7af927ba36d8658053d
---
lofar-cwl/steps/ms_concat.cwl | 5 +++--
lofar-cwl/steps/wsclean.cwl | 3 ++-
steps/find_skymodel_cal.cwl | 2 +-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lofar-cwl/steps/ms_concat.cwl b/lofar-cwl/steps/ms_concat.cwl
index 6fd74a46..fc61241c 100644
--- a/lofar-cwl/steps/ms_concat.cwl
+++ b/lofar-cwl/steps/ms_concat.cwl
@@ -54,10 +54,11 @@ outputs:
outputBinding:
glob: ms_concat.log
label: ms_concat
-requirements:
- - class: ShellCommandRequirement
+hints:
- class: DockerRequirement
dockerPull: 'lofareosc/prefactor:HBAcalibrator'
+requirements:
+ - class: ShellCommandRequirement
- class: InitialWorkDirRequirement
listing:
- entry: $(inputs.msin)
diff --git a/lofar-cwl/steps/wsclean.cwl b/lofar-cwl/steps/wsclean.cwl
index 08d1e3d6..24af8bd9 100644
--- a/lofar-cwl/steps/wsclean.cwl
+++ b/lofar-cwl/steps/wsclean.cwl
@@ -41,7 +41,8 @@ outputs:
outputBinding:
glob: $(inputs.image_name)-image.fits
label: WSClean
-requirements:
+hints:
- class: DockerRequirement
dockerPull: 'lofareosc/prefactor:HBAcalibrator'
+requirements:
- class: InlineJavascriptRequirement
diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl
index 4d095695..98c665d5 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -68,7 +68,7 @@ requirements:
skymodels = $(inputs.skymodels)
max_separation_arcmin = $(inputs.max_separation_arcmin)
- max_separation_arcmin = 1.0 if max_separation_arcmin else max_separation_arcmin
+ max_separation_arcmin = 1.0 if max_separation_arcmin is None else max_separation_arcmin
extension = "$(inputs.skymodels_extension)"
if skymodels is None:
skymodels = "/data/skymodels"
--
GitLab