Refactor

Former-commit-id: e90243dd [formerly 16c60d13]
Former-commit-id: e9dfa88e
Former-commit-id: 4ed4d05f

subworkflow/bandpass.cwl

@@ -33,22 +33,6 @@ inputs:
     type: string?
     'sbg:x': 985.4193725585938
     'sbg:y': 183.84898376464844
-  - id: msin
-    type: 'Directory[]'
-    'sbg:x': 61.43736267089844
-    'sbg:y': -38.334991455078125
-  - id: propagate_solutions
-    type: boolean
-    'sbg:x': 56.69083023071289
-    'sbg:y': -292.27447509765625
-  - id: flagunconverged
-    type: boolean
-    'sbg:x': -13.930643081665039
-    'sbg:y': 73.78814697265625
-  - id: do_smooth
-    type: boolean
-    'sbg:x': 137.3818817138672
-    'sbg:y': 210.85794067382812
 outputs:
   - id: output
     outputSource:
@@ -59,9 +43,6 @@ outputs:
 steps:
   - id: h5imp_cal_bandpass
     in:
-      - id: h5parmFiles
-        source:
-          - smooth_calibrate/h5parm
       - id: insolset
         default: bandpass
       - id: squeeze
@@ -148,25 +129,6 @@ steps:
     label: losoto_bandpass
     'sbg:x': 747.5215454101562
     'sbg:y': -46.37216567993164
-  - id: smooth_calibrate
-    in:
-      - id: msin
-        source:
-          - msin
-      - id: mode
-        default: diagonal
-      - id: propagate_solutions
-        source: propagate_solutions
-      - id: flagunconverged
-        source: flagunconverged
-      - id: do_smooth
-        source: do_smooth
-    out:
-      - id: h5parm
-    run: ./smooth_calibrate.cwl
-    label: smooth_calibrate
-    'sbg:x': 297.36822509765625
-    'sbg:y': -42.97225570678711
 requirements:
   - class: SubworkflowFeatureRequirement
   - class: ScatterFeatureRequirement

subworkflow/faraday_rotation.cwl

@@ -13,18 +13,6 @@ inputs:
     type: string?
     'sbg:x': -468.52337646484375
     'sbg:y': -415.06396484375
-  - id: propagate_solutions
-    type: boolean
-    'sbg:x': -980.18701171875
-    'sbg:y': -452.49566650390625
-  - id: flagunconverged
-    type: boolean
-    'sbg:x': -1034.012939453125
-    'sbg:y': -66.9654769897461
-  - id: do_smooth
-    type: boolean
-    'sbg:x': -869.2564086914062
-    'sbg:y': 72.52835083007812
 outputs:
   - id: msout
     outputSource:
@@ -37,8 +25,6 @@ steps:
     in:
       - id: h5parmFiles
         linkMerge: merge_flattened
-        source:
-          - smooth_calibrate/h5parm
       - id: squeeze
         default: true
       - id: verbose
@@ -107,25 +93,5 @@ steps:
       - msin
     'sbg:x': 291.55780029296875
     'sbg:y': -384.2626647949219
-  - id: smooth_calibrate
-    in:
-      - id: msin
-        source:
-          - msin
-      - id: mode
-        default: rotation+diagonal
-      - id: propagate_solutions
-        source: propagate_solutions
-      - id: flagunconverged
-        source: flagunconverged
-      - id: do_smooth
-        source: do_smooth
-    out:
-      - id: h5parm
-    run: ./smooth_calibrate.cwl
-    label: smooth_calibrate
-    'sbg:x': -750.2130126953125
-    'sbg:y': -139.6724090576172
 requirements:
-  - class: SubworkflowFeatureRequirement
   - class: ScatterFeatureRequirement