From f30afa5b67ff07f4d855290b94944078d06bb28a Mon Sep 17 00:00:00 2001
From: Alexander Drabent <alex@tls-tautenburg.de>
Date: Mon, 17 Feb 2020 15:03:14 +0100
Subject: [PATCH] change to right docker

Former-commit-id: 5b2617bfcd71f49a60f93be680e9c8cbc1047e2b
---
 lofar-cwl/steps/DPPP.cwl                   | 2 +-
 lofar-cwl/steps/check_ateam_separation.cwl | 2 +-
 lofar-cwl/steps/makesourcedb.cwl           | 2 +-
 subworkflow/ndppp_prep_cal.cwl             | 6 +++++-
 workflows/HBA_calibrator.cwl               | 3 ++-
 workflows/prefactor_calibrator.cwl         | 1 -
 workflows/prefactor_calibrator/prep.cwl    | 2 +-
 7 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/lofar-cwl/steps/DPPP.cwl b/lofar-cwl/steps/DPPP.cwl
index a756093a..47e4cf1f 100755
--- a/lofar-cwl/steps/DPPP.cwl
+++ b/lofar-cwl/steps/DPPP.cwl
@@ -97,4 +97,4 @@ hints:
     dockerPull: lofareosc/lofar-pipeline
 stdout: DPPP.log
 requirements:
-  - class: InlineJavascriptRequirement
+  - class: InlineJavascriptRequirement
\ No newline at end of file
diff --git a/lofar-cwl/steps/check_ateam_separation.cwl b/lofar-cwl/steps/check_ateam_separation.cwl
index 1c383d46..977d9f86 100755
--- a/lofar-cwl/steps/check_ateam_separation.cwl
+++ b/lofar-cwl/steps/check_ateam_separation.cwl
@@ -39,6 +39,6 @@ outputs:
 label: check_Ateam_separation
 hints:
   - class: DockerRequirement
-    dockerPull: lofareosc/lofar-pipeline
+    dockerPull: lofareosc/prefactor
   - class: InlineJavascriptRequirement
 stdout: Ateam_separation.log
diff --git a/lofar-cwl/steps/makesourcedb.cwl b/lofar-cwl/steps/makesourcedb.cwl
index fec1acf4..eb5c2e7c 100755
--- a/lofar-cwl/steps/makesourcedb.cwl
+++ b/lofar-cwl/steps/makesourcedb.cwl
@@ -50,7 +50,7 @@ outputs:
 label: make_sourcedb_ateam
 hints:
   - class: DockerRequirement
-    dockerPull: 'lofareosc/lofar-pipeline:latest'
+    dockerPull: 'lofareosc/prefactor:latest'
 stdout: make_sourcedb_ateam.log
 requirements:
   - class: InlineJavascriptRequirement
diff --git a/subworkflow/ndppp_prep_cal.cwl b/subworkflow/ndppp_prep_cal.cwl
index 9efd9f7f..7bbc7900 100644
--- a/subworkflow/ndppp_prep_cal.cwl
+++ b/subworkflow/ndppp_prep_cal.cwl
@@ -257,7 +257,8 @@ steps:
       - id: output_directory_names
         source: parsetgenerator/output_directory_names
       - id: baseline
-        source: msin_baseline
+        source: 
+          - msin_baseline
     out:
       - id: msout
       - id: secondary_output_files
@@ -284,3 +285,6 @@ steps:
     'sbg:y': -55.93873977661133
 requirements:
   - class: SubworkflowFeatureRequirement
+  - class: ScatterFeatureRequirement
+  - class: StepInputExpressionRequirement
+  - class: InlineJavascriptRequirement
\ No newline at end of file
diff --git a/workflows/HBA_calibrator.cwl b/workflows/HBA_calibrator.cwl
index c7f4f9ed..1e84665e 100644
--- a/workflows/HBA_calibrator.cwl
+++ b/workflows/HBA_calibrator.cwl
@@ -154,7 +154,7 @@ inputs:
     'sbg:x': -1000
     'sbg:y': 1100
   - id: min_separation
-    type: float?
+    type: int?
     default: 30
     'sbg:x': -1000
     'sbg:y': 1200
@@ -320,3 +320,4 @@ steps:
     'sbg:y': 0
 requirements:
   - class: SubworkflowFeatureRequirement
+  - class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator.cwl b/workflows/prefactor_calibrator.cwl
index 2dda40da..d71d33b4 100644
--- a/workflows/prefactor_calibrator.cwl
+++ b/workflows/prefactor_calibrator.cwl
@@ -283,4 +283,3 @@ steps:
     'sbg:y': 0
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: ScatterFeatureRequirement
diff --git a/workflows/prefactor_calibrator/prep.cwl b/workflows/prefactor_calibrator/prep.cwl
index 0b0b193e..511b6adb 100644
--- a/workflows/prefactor_calibrator/prep.cwl
+++ b/workflows/prefactor_calibrator/prep.cwl
@@ -209,4 +209,4 @@ steps:
     'sbg:y': 300
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: ScatterFeatureRequirement
+  - class: ScatterFeatureRequirement
\ No newline at end of file
-- 
GitLab