Resolve RAP-193

Former-commit-id: ecd93897 [formerly bf300328]
Former-commit-id: e6e41513
Former-commit-id: ea677ae2

workflows/HBA_target.cwl

@@ -238,6 +238,11 @@ inputs:
     default: null
     'sbg:x': -1000
     'sbg:y': 2900
+  - id: ncores
+    type: int?
+    default: 1
+    'sbg:x': -1000
+    'sbg:y': 3000
 outputs:
   - id: results
     outputSource:
@@ -343,6 +348,8 @@ steps:
         source: proxy_user
       - id: proxy_pass
         source: proxy_pass
+      - id: ncores
+        source: ncores
     out:
       - id: logfiles
       - id: msout

workflows/prefactor_target.cwl

@@ -238,6 +238,11 @@ inputs:
     default: null
     'sbg:x': -1000
     'sbg:y': 2900
+  - id: ncores
+    type: int?
+    default: 1
+    'sbg:x': -1000
+    'sbg:y': 3000
 outputs:
   - id: inspection
     outputSource:
@@ -459,6 +464,8 @@ steps:
         source: skymodel_source
       - id: total_bandwidth
         source: gsmcal/total_bandwidth
+      - id: ncores
+        source: ncores
     out:
       - id: msout
       - id: solutions

workflows/prefactor_target/finalize.cwl

@@ -45,6 +45,11 @@ inputs:
     type: int
     'sbg:x': -1000
     'sbg:y': 500
+  - id: ncores
+    type: int?
+    default: 1
+    'sbg:x': -1000
+    'sbg:y': 600
 outputs:
   - id: msout
     outputSource:
@@ -191,9 +196,10 @@ steps:
       - id: mgain
         default: 0.8
       - id: ncpu
-        default: 4
+        source: ncores
       - id: parallel-gridding
-        default: 1
+        source: ncores
+        valueFrom: $(Math.round((self+1)/4))
       - id: parallel-deconvolution
         default: 1500
       - id: parallel-reordering