try to add avg step to dppp_prep_cal

Former-commit-id: 56c1d83a

steps/DP3.AveragerStepGenerator.cwl

@@ -41,7 +41,7 @@ inputs:
       zero, it overrides <step>.timestep
     default: 0
   - id: freqresolution
-    type: float
+    type: string
     doc: >-
       Target frequency resolution, in Hz (or append "MHz" or "kHz" to specify it
       in those units). If this is given, and bigger than zero, it overrides

steps/check_ateam_separation.cwl

@@ -15,7 +15,7 @@ inputs:
     inputBinding:
       position: 0
     doc: Input measurement set
-  - default: ateam_separation.png
+  - default: Ateam_separation.png
     id: output_image_name
     type: string?
     inputBinding:

subworkflow/ndppp_prep_cal.cwl

@@ -31,12 +31,22 @@ inputs:
     'sbg:y': -298.45196533203125
   - id: msin
     type: Directory?
-    'sbg:x': 2129.6337890625
-    'sbg:y': 149.5590362548828
+    'sbg:x': 2306.83056640625
+    'sbg:y': 318.2810363769531
   - id: skymodel
     type: File
     'sbg:x': 1428.3411865234375
     'sbg:y': 273.64007568359375
+  - id: timeresolution
+    type: float
+    default: 4.
+    'sbg:x': 2021.81787109375
+    'sbg:y': -352.4759216308594
+  - id: freqresolution
+    type: string
+    default: '48.82kHz '
+    'sbg:x': 1999.5889892578125
+    'sbg:y': 170.7563934326172
 outputs:
   - id: msout
     outputSource:
@@ -50,6 +60,12 @@ outputs:
     type: File?
     'sbg:x': 2857.9423828125
     'sbg:y': 253.50680541992188
+  - id: parset
+    outputSource:
+      - parsetgenerator/parset
+    type: File
+    'sbg:x': 2598.6884765625
+    'sbg:y': -303.1161804199219
 steps:
   - id: flagbaseline
     in:
@@ -152,8 +168,8 @@ steps:
       - id: selected_steps
     run: ../steps/DP3.Selector.cwl
     label: demix?
-    'sbg:x': 1985.5047607421875
-    'sbg:y': -44.651588439941406
+    'sbg:x': 1974.7406005859375
+    'sbg:y': -32.03063201904297
   - id: demixstepgenerator
     in:
       - id: steps
@@ -170,7 +186,7 @@ steps:
     in:
       - id: steps
         source:
-          - demix_select/selected_steps
+          - average_step_generator/augmented_steps
     out:
       - id: parset
       - id: input_files
@@ -178,8 +194,8 @@ steps:
       - id: output_file_names
       - id: output_directory_names
     run: ../steps/DP3.ParsetGenerator.cwl
-    'sbg:x': 2228
-    'sbg:y': -40.012325286865234
+    'sbg:x': 2340.85400390625
+    'sbg:y': -79.32791900634766
   - id: dppp
     in:
       - id: parset
@@ -205,9 +221,21 @@ steps:
       - id: secondary_output_directories
       - id: logfile
     run: ../steps/DPPP.cwl
-    'sbg:x': 2548.738037109375
-    'sbg:y': -37.388668060302734
+    'sbg:x': 2669.29345703125
+    'sbg:y': -42.129730224609375
+  - id: average_step_generator
+    in:
+      - id: steps
+        source:
+          - demix_select/selected_steps
+      - id: timeresolution
+        source: timeresolution
+      - id: freqresolution
+        source: freqresolution
+    out:
+      - id: augmented_steps
+    run: ../steps/DP3.AveragerStepGenerator.cwl
+    'sbg:x': 2158.297119140625
+    'sbg:y': -55.93873977661133
 requirements:
   - class: SubworkflowFeatureRequirement
-  - class: StepInputExpressionRequirement
-  - class: InlineJavascriptRequirement

workflows/HBA_calibrator.cwl

@@ -38,11 +38,19 @@ inputs:
     type: File?
     'sbg:x': -509
     'sbg:y': 679.407958984375
+  - id: freqresolution
+    type: string
+    'sbg:x': -499.0240478515625
+    'sbg:y': 231.7971649169922
+  - id: timeresolution
+    type: float
+    'sbg:x': -502.6177673339844
+    'sbg:y': -846.1633911132812
 outputs:
   - id: msout
     outputSource:
       - prefactor/msout
-    type: Directory[]
+    type: 'Directory[]'
     'sbg:x': 289.5600891113281
     'sbg:y': -144.01869201660156
   - id: make_sourcedb_ateam.log
@@ -54,21 +62,27 @@ outputs:
   - id: logfile_prep_cal
     outputSource:
       - prefactor/logfile_prep_cal
-    type: File[]?
+    type: 'File[]?'
     'sbg:x': 315.0741882324219
     'sbg:y': 180.26284790039062
   - id: check_Ateam_separation.png
     outputSource:
       - prefactor/check_Ateam_separation.png
-    type: File[]?
+    type: 'File[]?'
     'sbg:x': 287.6455078125
     'sbg:y': 344.1313171386719
   - id: check_Ateam_separation.log
     outputSource:
       - prefactor/check_Ateam_separation.log
-    type: File[]?
+    type: 'File[]?'
     'sbg:x': 315.5941467285156
     'sbg:y': 494.9656982421875
+  - id: parset
+    outputSource:
+      - prefactor/parset
+    type: 'File[]'
+    'sbg:x': 293.33331298828125
+    'sbg:y': -305.4627990722656
 steps:
   - id: prefactor
     in:
@@ -88,12 +102,17 @@ steps:
         source: min_separation
       - id: A-Team_sky_model
         source: A-Team_sky_model
+      - id: timeresolution
+        source: timeresolution
+      - id: freqresolution
+        source: freqresolution
     out:
       - id: check_Ateam_separation.png
       - id: check_Ateam_separation.log
       - id: make_sourcedb_ateam.log
       - id: msout
       - id: logfile_prep_cal
+      - id: parset
     run: ./prefactor_calibrator_test.cwl
     label: prefactor_calibrator
     'sbg:x': -107.87364959716797

workflows/prefactor_calibrator_test.cwl

@@ -11,8 +11,8 @@ inputs:
     'sbg:y': -688
   - id: demix
     type: boolean
-    'sbg:x': -639.3313598632812
-    'sbg:y': -271
+    'sbg:x': -639
+    'sbg:y': -206.68032836914062
   - id: msin
     type: 'Directory[]'
     'sbg:x': -635
@@ -23,30 +23,38 @@ inputs:
     'sbg:y': -411
   - id: baselines_to_flag
     type: 'string[]'
-    'sbg:x': -635.8651123046875
-    'sbg:y': -148
+    'sbg:x': -635
+    'sbg:y': -100.83224487304688
   - id: min_separation
     type: float?
     'sbg:x': -638.4987182617188
     'sbg:y': 31.238996505737305
   - id: A-Team_sky_model
+    default: /data/skymodels/Ateam_LBA_CC.skymodel
     type:
       - string?
       - File?
-    default: '/data/skymodels/Ateam_LBA_CC.skymodel'
-    'sbg:x': -889.9927978515625
-    'sbg:y': -845.9927978515625
+    'sbg:x': -889
+    'sbg:y': -983.5078735351562
+  - id: timeresolution
+    type: float
+    'sbg:x': -634.4667358398438
+    'sbg:y': -817.0217895507812
+  - id: freqresolution
+    type: string
+    'sbg:x': -641.6406860351562
+    'sbg:y': -298.1281433105469
 outputs:
   - id: check_Ateam_separation.png
     outputSource:
       - check_ateam_separation/output_imag
-    type: File[]?
+    type: 'File[]?'
     'sbg:x': 68.06497955322266
     'sbg:y': -3.1985559463500977
   - id: check_Ateam_separation.log
     outputSource:
       - check_ateam_separation/logfile
-    type: File[]?
+    type: 'File[]?'
     'sbg:x': 83.07220458984375
     'sbg:y': 136.60289001464844
   - id: make_sourcedb_ateam.log
@@ -58,15 +66,21 @@ outputs:
   - id: msout
     outputSource:
       - ndppp_prep_cal/msout
-    type: Directory[]
+    type: 'Directory[]'
     'sbg:x': 52.33274459838867
     'sbg:y': -546.0951538085938
   - id: logfile_prep_cal
     outputSource:
       - ndppp_prep_cal/logfile
-    type: File[]?
+    type: 'File[]?'
     'sbg:x': 43.325523376464844
     'sbg:y': -371.35504150390625
+  - id: parset
+    outputSource:
+      - ndppp_prep_cal/parset
+    type: 'File[]'
+    'sbg:x': 49.54720687866211
+    'sbg:y': -680.8679809570312
 steps:
   - id: ndppp_prep_cal
     in:
@@ -91,9 +105,14 @@ steps:
           - msin
       - id: skymodel
         source: make_sourcedb/sourcedb
+      - id: timeresolution
+        source: timeresolution
+      - id: freqresolution
+        source: freqresolution
     out:
       - id: msout
       - id: logfile
+      - id: parset
     run: ../subworkflow/ndppp_prep_cal.cwl
     label: ndppp_prep_cal
     scatter:
@@ -123,8 +142,8 @@ steps:
       - id: log
     run: ../steps/makesourcedb.cwl
     label: make_sourcedb_ateam
-    'sbg:x': -628.7400512695312
-    'sbg:y': -847.117919921875
+    'sbg:x': -647.0108642578125
+    'sbg:y': -981.3153076171875
 requirements:
   - class: SubworkflowFeatureRequirement
   - class: ScatterFeatureRequirement