add parameters/defaults to prep_target

lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl

@@ -14,7 +14,7 @@ inputs:
     default: applycal
 
   - id: parmdb
-    type: string
+    type: File
     doc: Path of parmdb in which the parameters are stored. This can also be an H5Parm file, in that case the filename has to end in '.h5'
   - id: solset
     type: string?
@@ -36,6 +36,8 @@ inputs:
        - scalaramplitude
        - rotationmeasure
        - fulljones
+       - polalign
+       - bandpass
     doc: |
       Type of correction to perform, can be one of 'gain', 'tec', 'clock',
       '(common)rotationangle' / 'rotation', '(common)scalarphase',

subworkflow/ndppp_prep_targ.cwl

@@ -70,7 +70,7 @@ inputs:
     'sbg:x': 1257.9327392578125
     'sbg:y': -290.095703125
   - id: parmdb
-    type: string
+    type: File
     'sbg:x': 1930.5469970703125
     'sbg:y': 298.99664306640625
   - id: apply_tec_correction
@@ -93,6 +93,10 @@ inputs:
     type: boolean
     'sbg:x': 2391.738037109375
     'sbg:y': 585.3051147460938
+  - id: filter_baselines
+    type: string
+    'sbg:x': 1880
+    'sbg:y': -380
 outputs:
   - id: logfile
     outputSource:
@@ -276,6 +280,9 @@ steps:
     'sbg:y': -6.564670085906982
   - id: dp3_execute
     in:
+      - id: msout_name
+        source: msin
+        valueFrom: $("out_"+self.basename)
       - id: msin
         source: msin
       - id: steps
@@ -298,6 +305,10 @@ steps:
       - id: steps
         source:
           - demix_select/selected_steps
+      - id: baseline
+        source: filter_baselines
+      - id: remove
+        default: true
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.FilterStepGenerator.cwl
@@ -310,6 +321,8 @@ steps:
           - filter/augmented_steps
       - id: parmdb
         source: parmdb
+      - id: correction
+        default: polalign
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -320,6 +333,10 @@ steps:
       - id: steps
         source:
           - applyPA/augmented_steps
+      - id: parmdb
+        source: parmdb
+      - id: correction
+        default: bandpass
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl

subworkflow/prep_target_applycal.cwl

@@ -30,7 +30,7 @@ inputs:
     'sbg:x': 2750.948974609375
     'sbg:y': -241.39480590820312
   - id: parmdb
-    type: string
+    type: File
     'sbg:x': 2007.115234375
     'sbg:y': 685.0719604492188
 outputs:
@@ -48,6 +48,8 @@ steps:
           - steps
       - id: parmdb
         source: parmdb
+      - id: correction
+        default: 'clock'
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -60,6 +62,8 @@ steps:
           - apply_clock/selected_steps
       - id: parmdb
         source: parmdb
+      - id: correction
+        default: 'tec'
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -72,6 +76,8 @@ steps:
           - apply_beam/selected_steps
       - id: parmdb
         source: parmdb
+      - id: correction
+        default: 'phaseOrig'
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -84,6 +90,8 @@ steps:
           - apply_tec/selected_steps
       - id: parmdb
         source: parmdb
+      - id: correction
+        default: 'RMextract'
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyCalStepGenerator.cwl
@@ -94,6 +102,8 @@ steps:
       - id: steps
         source:
           - apply_rm/selected_steps
+      - id: beammode
+        default: 'default'
     out:
       - id: augmented_steps
     run: ../lofar-cwl/steps/DP3.ApplyBeamStepGenerator.cwl

workflows/prefactor_target/prep.cwl

@@ -179,10 +179,6 @@ inputs:
     default: 1.e-30
     'sbg:x': -1000
     'sbg:y': 1700
-  - id: process_baselines_cal
-    type: string
-    'sbg:x': -1000
-    'sbg:y': 1800
 outputs:
   - id: outh5parm
     outputSource:
@@ -353,7 +349,7 @@ steps:
         source: demix_freqstep
       - id: demix_baseline
         default: '*'
-        source: process_baselines_cal
+        source: process_baselines_target
       - id: target_source
         source: demix_target
       - id: ntimechunk
@@ -379,6 +375,8 @@ steps:
       - id: apply_beam_correction
         source: apply_beam
         default: true
+      - id: filter_baselines
+        source: compare_station_list/filter_out
     out:
       - id: msout
       - id: logfile
@@ -402,4 +400,5 @@ steps:
     label: concat_logfiles_prep_targ
     'sbg:x': 250
     'sbg:y': 300
-requirements: []
+requirements:
+  - class: ScatterFeatureRequirement
\ No newline at end of file