From 349daa6afa61f186d588fcf226fb90b96a1d3027 Mon Sep 17 00:00:00 2001
From: Alexander Drabent <alex@tls-tautenburg.de>
Date: Wed, 25 Mar 2020 18:17:30 +0100
Subject: [PATCH] find_skymodel_cal bugfixes
Former-commit-id: 58858c575a22ca21b06d1284dbcf4634e3bf9276
---
steps/blsmooth.cwl | 2 +-
steps/find_skymodel_cal.cwl | 12 ++----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/steps/blsmooth.cwl b/steps/blsmooth.cwl
index 835664af..3629744d 100644
--- a/steps/blsmooth.cwl
+++ b/steps/blsmooth.cwl
@@ -82,7 +82,7 @@ outputs:
glob: $(inputs.msin.basename)
hints:
- class: DockerRequirement
- dockerPull: lofareosc/prefactor:HBAcalibrator-ci:master
+ dockerPull: lofareosc/prefactor:HBAcalibrator
requirements:
- class: InitialWorkDirRequirement
listing:
diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl
index f9d69b5c..6debf140 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -12,14 +12,10 @@ inputs:
inputBinding:
position: 0
- id: skymodels
-<<<<<<< HEAD
type:
- Directory?
- File?
-=======
- type: Directory?
->>>>>>> 648aff693fcd8267a3f707ad8fc9609715cddaa2
- doc: Directory containing the sky models
+ doc: Directory or file containing the sky models
- id: skymodels_extension
type: string?
doc: path extension of the sky models
@@ -81,8 +77,4 @@ requirements:
hints:
DockerRequirement:
-<<<<<<< HEAD
- dockerPull: lofareosc/prefactor:latest
-=======
- dockerPull: lofareosc/prefactor-ci:master
->>>>>>> 648aff693fcd8267a3f707ad8fc9609715cddaa2
+ dockerPull: lofareosc/prefactor:HBAcalibrator
--
GitLab