change to right docker

Former-commit-id: c1055571 [formerly 5b2617bf]
Former-commit-id: f30afa5b
Former-commit-id: 337f613d

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

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

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

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

workflows/prefactor_calibrator.cwl

@@ -283,4 +283,3 @@ steps:
     'sbg:y': 0
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: ScatterFeatureRequirement