Refactor main workflow

workflows/HBA.cwl

-class: Workflow
-cwlVersion: v1.0
-id: HBA
-label: HBA.cwl
-$namespaces:
-  sbg: 'https://www.sevenbridges.com/'
-inputs:
-  - id: msin_calibrator
-    type: 'Directory[]'
-    'sbg:x': -245
-    'sbg:y': -44
-  - id: min_separation_Ateam
-    type: float
-    default: 30
-    'sbg:x': -265
-    'sbg:y': -153
-  - id: filter_baseline
-    type: string
-    default: '*&'
-    'sbg:x': 145
-    'sbg:y': 85
-  - id: flag_baselines
-    type: string
-    default: '[]'
-    'sbg:x': 9
-    'sbg:y': 232
-  - id: process_baselines_cal
-    type: string
-    default: '*&'
-    'sbg:x': -320
-    'sbg:y': 220
-  - id: raw_data
-    type: boolean
-    default: false
-    'sbg:x': 258
-    'sbg:y': -49
-  - id: memoryperc
-    type: int
-    default: 90
-    'sbg:x': 206
-    'sbg:y': 212
-  - id: avg_timeresolution
-    type: float
-    default: 4.0
-    'sbg:x': -534
-    'sbg:y': 175
-  - id: avg_freqresolution
-    type: string
-    default: '48.82kHz'
-    'sbg:x': -459
-    'sbg:y': -47
-  - id: demix
-    type: boolean
-    'sbg:x': 255
-    'sbg:y': 96
-  - id: demix_timestep
-    type: int
-    default: 16
-    'sbg:x': 92
-    'sbg:y': 158
-  - id: demix_freqstep
-    type: boolean
-    default: 16
-    'sbg:x': -387
-    'sbg:y': 103
-  - id: demix_target
-    type: string
-    default: ''
-    'sbg:x': -70
-    'sbg:y': 157
-  - id: demix_sources
-    type: string
-    default: '[CasA,CygA]'
-    'sbg:x': -182
-    'sbg:y': 135
-outputs:
-  - id: solutions
-    outputSource:
-      - prefactor/solutions
-    type: File
-    'sbg:x': 99
-    'sbg:y': -44
-steps:
-  - id: prefactor
-    in:
-      - id: msin
-        source:
-          - msin_calibrator
-    out:
-      - id: solutions
-    run: ./prefactor.cwl
-    label: prefactor.cwl
-    'sbg:x': -72.39886474609375
-    'sbg:y': -44.5
-requirements:
-  - class: SubworkflowFeatureRequirement

workflows/prefactor.cwl → workflows/HBA_calibrator.cwl

 class: Workflow
 cwlVersion: v1.0
-id: prefactor
-label: prefactor.cwl
+id: _h_b_a
+label: HBA.cwl
 $namespaces:
   sbg: 'https://www.sevenbridges.com/'
 inputs:
-  - id: msin
+  - id: msin_calibrator
     type: 'Directory[]'
-    'sbg:x': -708.0858764648438
-    'sbg:y': -306
+    'sbg:x': -245
+    'sbg:y': -44
 outputs:
   - id: solutions
     outputSource:
-      - prefactor_target/solutions
+      - prefactor/solutions
     type: File
-    'sbg:x': -169.21875
-    'sbg:y': -319.5
+    'sbg:x': 99
+    'sbg:y': -44
 steps:
-  - id: prefactor_target
-    in:
-      - id: cal_solutions
-        source: prefactor_calibrator/outh5parm
-    out:
-      - id: solutions
-    run: ./prefactor_target.cwl
-    label: prefactor_target
-    'sbg:x': -345
-    'sbg:y': -321
-  - id: prefactor_calibrator
+  - id: prefactor
     in:
       - id: msin
         source:
-          - msin
+          - msin_calibrator
     out:
-      - id: outh5parm
+      - id: solutions
     run: ./prefactor_calibrator.cwl
     label: prefactor_calibrator
-    'sbg:x': -520
-    'sbg:y': -324
+    'sbg:x': -72.39886474609375
+    'sbg:y': -44.5
 requirements:
   - class: SubworkflowFeatureRequirement