From 6ae52688bf9f5c05e3b6da484485cfc61dc4015c Mon Sep 17 00:00:00 2001
From: mancini <mancini@astron.nl>
Date: Wed, 30 Oct 2019 14:46:29 +0100
Subject: [PATCH] Add H5ParmCollector to prefactor
---
prefactor_calibrator.cwl | 21 ++++++++++++++++-----
steps/H5ParmCollector.cwl | 2 +-
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/prefactor_calibrator.cwl b/prefactor_calibrator.cwl
index 6537806e..895265e5 100644
--- a/prefactor_calibrator.cwl
+++ b/prefactor_calibrator.cwl
@@ -32,12 +32,12 @@ outputs:
items: Directory
'sbg:x': -67.85011291503906
'sbg:y': -356.76287841796875
- - id: h5parm
+ - id: outh5parm
outputSource:
- - calib_cal/h5parm
- type: File[]
- 'sbg:x': 270.10113525390625
- 'sbg:y': -464.5
+ - h5parm_collector/outh5parm
+ type: File
+ 'sbg:x': 477
+ 'sbg:y': -546.076171875
steps:
- id: ndppp_prep_cal
in:
@@ -93,6 +93,17 @@ steps:
- msin
'sbg:x': 47
'sbg:y': -583
+ - id: h5parm_collector
+ in:
+ - id: h5parmFiles
+ source:
+ - calib_cal/h5parm
+ out:
+ - id: outh5parm
+ run: steps/H5ParmCollector.cwl
+ label: H5parm_collector
+ 'sbg:x': 292.1979675292969
+ 'sbg:y': -543.7208251953125
requirements:
- class: SubworkflowFeatureRequirement
- class: ScatterFeatureRequirement
diff --git a/steps/H5ParmCollector.cwl b/steps/H5ParmCollector.cwl
index 46442b33..2ab2ad1c 100755
--- a/steps/H5ParmCollector.cwl
+++ b/steps/H5ParmCollector.cwl
@@ -6,7 +6,7 @@ id: h5parm_collector
hints:
DockerRequirement:
- dockerPull: tammojan/lofar-pipeline
+ dockerPull: lofareosc/prefactor-ci
baseCommand:
- H5parm_collector.py
--
GitLab