From 8f69f4421d227ec89698fad2d1ab98f539d2101c Mon Sep 17 00:00:00 2001
From: Alexander Drabent <alex@tls-tautenburg.de>
Date: Thu, 2 Apr 2020 11:17:47 +0200
Subject: [PATCH] add logfile, max_separation_arcmin
---
steps/find_skymodel_cal.cwl | 14 ++++++--------
workflows/prefactor_calibrator.cwl | 2 ++
workflows/prefactor_calibrator/prep.cwl | 9 +++++++++
3 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/steps/find_skymodel_cal.cwl b/steps/find_skymodel_cal.cwl
index ae6ca606..0928a2e2 100644
--- a/steps/find_skymodel_cal.cwl
+++ b/steps/find_skymodel_cal.cwl
@@ -15,11 +15,7 @@ inputs:
type:
- Directory?
- File?
-<<<<<<< HEAD
- doc: Directory containing the sky models
-=======
doc: Directory or file containing the sky models
->>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276
- id: skymodels_extension
type: string?
doc: path extension of the sky models
@@ -80,13 +76,15 @@ outputs:
loadContents: true
glob: 'out.json'
outputEval: $(JSON.parse(self[0].contents).skymodel_name)
+ - id: logfile
+ type: File?
+ outputBinding:
+ glob: find_skymodel_cal.log
+
requirements:
- class: InlineJavascriptRequirement
hints:
DockerRequirement:
-<<<<<<< HEAD
- dockerPull: lofareosc/prefactor:master
-=======
dockerPull: lofareosc/prefactor:HBAcalibrator
->>>>>>> 58858c575a22ca21b06d1284dbcf4634e3bf9276
+stdout: find_skymodel_cal.log
\ No newline at end of file
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 3355c043..6900feb7 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -264,6 +264,8 @@ steps:
- demix_sources
- id: do_smooth
source: do_smooth
+ - id: max_separation_arcmin
+ source: max_separation_arcmin
- id: min_separation
source: min_separation
- id: A-Team_skymodel
diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl
index 6bdaed1d..015ecc8c 100644
--- a/workflows/prefactor_calibrator/prep.cwl
+++ b/workflows/prefactor_calibrator/prep.cwl
@@ -129,6 +129,12 @@ outputs:
type: 'File[]'
'sbg:x': 1000
'sbg:y': 200
+ - id: find_skymodel_cal.log
+ outputSource:
+ - find_skymodel_cal/logfile
+ type: 'File[]?'
+ 'sbg:x': 1000
+ 'sbg:y': 300
steps:
- id: ndppp_prep_cal
in:
@@ -222,8 +228,11 @@ steps:
source: msin
- id: skymodels
source: calibrator_path_skymodel
+ - id: max_separation_arcmin
+ source: max_separation_arcmin
out:
- id: output_models
+ - id: logfile
run: ../../steps/find_skymodel_cal.cwl
label: find_skymodel_cal
'sbg:x': -500
--
GitLab