workflows/linc_target/gsmcal.cwl

@@ -726,6 +726,8 @@ steps:
         source: findRefAnt_join/refant
       - id: prefix
         default: ph_
+      - id: selfcal_strategy
+        source: selfcal_strategy
       - id: execute
         source: selfcal
         valueFrom: '$(self ? (false || inputs.selfcal_strategy == "HBA") : true)'
@@ -808,7 +810,7 @@ steps:
       - id: parset
     run: ../../steps/LoSoTo.Plot.cwl
     label: losoto_plot_Pd2
-    when: $(!inputs.execute)
+    when: $(inputs.execute)
 requirements:
   - class: SubworkflowFeatureRequirement
   - class: ScatterFeatureRequirement

workflows/linc_target/selfcal_targ_hba.cwl

@@ -44,16 +44,16 @@ outputs:
     type: File[]
   - id: inspection
     outputSource:
-      - losoto_plot_P/output_plots
-      - losoto_plot_P2/output_plots
-      - losoto_plot_Pd/output_plots
-      - losoto_plot_Pd2/output_plots
+      - losoto_plot_selfcal_P/output_plots
+      - losoto_plot_selfcal_P2/output_plots
+      - losoto_plot_selfcal_Pd/output_plots
+      - losoto_plot_selfcal_Pd2/output_plots
     type: File[]
     linkMerge: merge_flattened
     pickValue: all_non_null
 steps:
   # START image target field
-  - id: h5parm_collector_skysolve
+  - id: h5parm_collector_selfcal_skysolve
     in:
       - id: h5parmFiles
         source: preapply_h5parm
@@ -68,7 +68,7 @@ steps:
       - id: outh5parm
       - id: log
     run: ../../steps/H5ParmCollector.cwl
-    label: h5parm_collector_skysolve
+    label: h5parm_collector_selfcal_skysolve
 
   - id: apply_skysolve
     in:
@@ -79,7 +79,7 @@ steps:
       - id: msin_datacolumn
         default: DATA
       - id: parmdb
-        source: h5parm_collector_skysolve/outh5parm
+        source: h5parm_collector_selfcal_skysolve/outh5parm
       - id: msout_datacolumn
         default: CORRECTED_DATA
       - id: storagemanager
@@ -189,7 +189,7 @@ steps:
       - msin
   # END HBA selfcal
 
-  - id: h5parm_collector
+  - id: h5parm_collector_selfcal
     in:
       - id: h5parmFiles
         source:
@@ -206,14 +206,14 @@ steps:
       - id: outh5parm
       - id: log
     run: ../../steps/H5ParmCollector.cwl
-    label: H5parm_collector
+    label: h5parm_collector_selfcal
 
   # START Plot selfcal solutions
-  - id: losoto_plot_P
+  - id: losoto_plot_selfcal_P
     in:
       - id: input_h5parm
         source:
-          - h5parm_collector/outh5parm
+          - h5parm_collector_selfcal/outh5parm
         pickValue: first_non_null
         linkMerge: merge_flattened
       - id: soltab
@@ -239,13 +239,13 @@ steps:
       - id: logfile
       - id: parset
     run: ../../steps/LoSoTo.Plot.cwl
-    label: losoto_plot_P
+    label: losoto_plot_selfcal_P
 
-  - id: losoto_plot_P2
+  - id: losoto_plot_selfcal_P2
     in:
       - id: input_h5parm
         source:
-          - h5parm_collector/outh5parm
+          - h5parm_collector_selfcal/outh5parm
       - id: soltab
         default: sol000/phase000
       - id: axesInPlot
@@ -270,13 +270,13 @@ steps:
       - id: logfile
       - id: parset
     run: ../../steps/LoSoTo.Plot.cwl
-    label: losoto_plot_P2
+    label: losoto_plot_selfcal_P2
 
-  - id: losoto_plot_Pd
+  - id: losoto_plot_selfcal_Pd
     in:
       - id: input_h5parm
         source:
-          - h5parm_collector/outh5parm
+          - h5parm_collector_selfcal/outh5parm
       - id: soltab
         default: sol000/phase000
       - id: axesInPlot
@@ -302,13 +302,13 @@ steps:
       - id: logfile
       - id: parset
     run: ../../steps/LoSoTo.Plot.cwl
-    label: losoto_plot_Pd
+    label: losoto_plot_selfcal_Pd
 
-  - id: losoto_plot_Pd2
+  - id: losoto_plot_selfcal_Pd2
     in:
       - id: input_h5parm
         source:
-          - h5parm_collector/outh5parm
+          - h5parm_collector_selfcal/outh5parm
       - id: soltab
         default: sol000/phase000
       - id: axesInPlot
@@ -333,7 +333,7 @@ steps:
       - id: logfile
       - id: parset
     run: ../../steps/LoSoTo.Plot.cwl
-    label: losoto_plot_Pd2
+    label: losoto_plot_selfcal_Pd2
   # END plot selfcal solutions
 requirements:
   - class: ScatterFeatureRequirement