Add HBA self calibration

.gitlab-ci.yml

@@ -11,6 +11,7 @@ variables:
   TEST_HBA_DATASET_NAME: "test_data.tar.gz"
   CALIBRATOR_HBA_RESULTS_NAME: "results_calibrator.tar.gz"
   TARGET_HBA_RESULTS_NAME: "results_target.tar.gz"
+  TARGET_HBA_SELFCAL_RESULTS_NAME: "results_target_selfcal.tar.gz"
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   BUILD_DOCKER_IMAGE: "1"
 
@@ -105,6 +106,7 @@ download_data:
     - wget -nv https://support.astron.nl/software/ci_data/linc/$TEST_HBA_DATASET_NAME -O $TEST_HBA_DATASET_NAME && tar xfz $TEST_HBA_DATASET_NAME && rm -f $TEST_HBA_DATASET_NAME
     - wget -nv https://support.astron.nl/software/ci_data/linc/$CALIBRATOR_HBA_RESULTS_NAME -O $CALIBRATOR_HBA_RESULTS_NAME && tar xfz $CALIBRATOR_HBA_RESULTS_NAME && rm -f $CALIBRATOR_HBA_RESULTS_NAME
     - wget -nv https://support.astron.nl/software/ci_data/linc/$TARGET_HBA_RESULTS_NAME -O $TARGET_HBA_RESULTS_NAME && tar xfz $TARGET_HBA_RESULTS_NAME && rm -f $TARGET_HBA_RESULTS_NAME
+    - wget -nv https://support.astron.nl/software/ci_data/linc/$TARGET_HBA_SELFCAL_RESULTS_NAME -O $TARGET_HBA_SELFCAL_RESULTS_NAME && tar xfz $TARGET_HBA_SELFCAL_RESULTS_NAME && rm -f $TARGET_HBA_SELFCAL_RESULTS_NAME
   artifacts:
     paths:
     - data
@@ -167,6 +169,20 @@ run_hba_target:
       - hba_target_logs.tar.gz
     when: on_failure
 
+run_hba_target_selfcal:
+  stage: tests
+  needs: ["versioning", "download_data"]
+  image: $INTEGRATION_IMAGE
+  script:
+    - cwltool --no-container --preserve-environment PATH --preserve-environment LINC_DATA_ROOT --preserve-environment PYTHONPATH --outdir results --leave-tmpdir --tmpdir-prefix /tmp/run_hba_target/ workflows/HBA_target.cwl test_jobs/HBA_target_selfcal.json
+    - test_jobs/check_workflow_results.py results /builds/RD/LINC/data/results_target_selfcal
+  after_script:
+    - find /tmp/run_hba_target -name "*.log" -print0 | tar czf hba_target_selfcal_logs.tar.gz --null -T -
+  artifacts:
+    paths:
+      - hba_target_selfcal_logs.tar.gz
+    when: on_failure
+
 build_doc:
   stage: docs
   needs: ["versioning", "download_data"]

docs/source/target.rst

@@ -283,8 +283,13 @@ User-defined parameter configuration
 - ``use_target``: enable downloading of a target skymodel (default: ``true``)
 - ``skymodel_source``: choose the target skymodel from `TGSS ADR`_ or the new `Global Sky Model`_ (GSM) (default: ``TGSS``)
 - ``skymodel_fluxlimit``: limits the input skymodel to sources that exceed the given flux density limit in Jy (default: None for **HBA**, i.e. all sources of the catalogue will be kept, and 1.0 for **LBA**)
-- ``selfcal``: perform extensive self-calibration according to the `LiLF`_ scheme (recommended for **LBA** observations) (default: ``false``)
-- ``selfcal_region``: ds9-compatible region file to select the image regions used for the self-calibration
+- ``selfcal``: perform self-calibration (default: ``false``)
+- ``selfcal_strategy``: sets the strategy for selfcal. If set to ``HBA``. If set to ``LBA``, selfcal will perform extensive self-calibration according to the `LiLF`_ scheme (recommended for **LBA** observations). (default: ``HBA``)
+- ``selfcal_region``: ds9-compatible region file to select the image regions used for the self-calibration in case of LBA self-calibration.
+- ``selfcal_hba_uvlambdamin``: specify the minimum uv-distance in units of wavelength to be used when performing selfcal with HBA (default: 200)
+- ``selfcal_hba_imsize``: specifies the image size in pixels, as a list, to use during HBA self-calibration (default: ``[20000, 20000]``).
+- ``output_channels_per_chunk``: HBA only. Sets the number of frequency channels to chunk data in after self-calibration (default: 20).
+- ``calib_nchan``: number of channels to be combined when calibration (default: ``0`` (one solution per group) if `selfcal = false`, otherwise `1` (one solution per channel))
 
 A comprehensive explanation of the baseline selection syntax can be found `here`_.
 
@@ -324,11 +329,10 @@ A comprehensive explanation of the baseline selection syntax can be found `here`
 - ``avg_freqresolution`` : intermediate frequency resolution of the data after averaging (default: 48.82kHz, which translates to 4 channels per subband)
 - ``avg_timeresolution_concat``: final time resolution of the data in seconds after averaging and concatenation (default: 8)
 - ``avg_freqresolution_concat``: final frequency resolution of the data after averaging and concatenation (default: 97.64kHz, which translates to 2 channels per subband)
-- ``num_SBs_per_group``: make concatenated measurement-sets with that many subbands, choose a high number if running LBA (default: 10)
 
 *Concatenating of the target data*
 
-- ``num_SBs_per_group``: make concatenated measurement-sets with that many subbands (default: 10)
+- ``num_SBs_per_group``: make concatenated measurement-sets with that many subbands (default: 10 normally, -1 for HBA selfcal)
 - ``reference_stationSB``: station-subband number to use as reference for grouping (default: ``None`` -> use lowest frequency input data as reference)
 - ``chunkduration``: Duration (in seconds) after which to start writing a next measurement set while concatenating (default: 0.0, no chunking in time)
 

scripts/sort_times_into_freqGroups.py

@@ -172,8 +172,8 @@ def main(MSfile, numSB=10, DP3fill=True, stepname=None, mergeLastGroup=False, tr
         logging.warning("Bandwidth of files is smaller than 51% of the minimum frequency step between two files! (More than about half the data is missing.)")
     #the new output map
 
-    # add 1% of the SB badwidth in case maxfreq might be "exactly" on a group-border
-    maxfreq = np.max(freqliste)+freq_width*0.51
+    # add 1% of the SB badwidth in case maxfreq might be "exactly" on a group-border # set back to exactly 50%, otherwise we add dummy data unnecessarily if using numSB = -1
+    maxfreq = np.max(freqliste)+freq_width*0.50
     if firstSB != None:
         if freqliste[0] < 100e6:
             # LBA Data

steps/LoSoTo.Plot.cwl

@@ -18,7 +18,7 @@ requirements:
         entry: $(get_losoto_config('PLOT').join('\n'))
       - entryname: $(inputs.input_h5parm.basename)
         entry: $(inputs.input_h5parm)
-        writable: true
+        writable: false
       - entryname: run_losoto_plot.sh
         entry: |
           #!/bin/bash
@@ -48,6 +48,8 @@ inputs:
   - id: execute
     type: boolean?
     default: true
+  - id: selfcal_strategy
+    type: string?
   - id: soltab
     type: string
     doc: "Tabs to plot"

steps/applybeam.cwl

@@ -54,22 +54,26 @@ inputs:
        prefix: msout.storagemanager.databitrate=
        separate: false
   - id: updateweights
-    type: string?
+    type: boolean?
     inputBinding:
       position: 0
-      prefix: applybeam.updateweights=
+      prefix: applybeam.updateweights=True
       separate: false
   - id: usechannelfreq
-    type: string?
+    type: boolean?
+    default: true
     inputBinding:
+      valueFrom: $(!self)
       position: 0
-      prefix: applybeam.usechannelfreq=
+      prefix: applybeam.usechannelfreq=False
       separate: false
   - id: invert
-    type: string?
+    type: boolean?
+    default: true
     inputBinding:
+      valueFrom: $(!self)
       position: 0
-      prefix: applybeam.invert=
+      prefix: applybeam.invert=False
       separate: false
   - id: beammode
     type: string?

steps/chunk_ms.cwl

+class: CommandLineTool
+cwlVersion: v1.2
+id: chunkms
+label: ChunkMS
+
+baseCommand:
+  - MSChunker.py
+
+inputs:
+  - id: ms
+    type: Directory
+    inputBinding:
+      position: 6
+    doc: Input MeasurementSet.
+  - id: mode
+    type: string
+    inputBinding:
+      position: 1
+      prefix: --mode
+    doc: Mode to split the MeasurementSet in, time or frequency.
+  - id: timefraction
+    type: float?
+    default: 1.0
+    inputBinding:
+      position: 2
+      prefix: --timefraction
+    doc: The fraction of data to split off, evenly distributed in time.
+  - id: mintime
+    type: int?
+    default: -1
+    inputBinding:
+      position: 3
+      prefix: --mintime
+    doc: Minimum number of seconds per split off time chunk.
+  - id: chan_per_chunk
+    type: int?
+    default: 0
+    inputBinding:
+      position: 4
+      prefix: --chan_per_chunk
+    doc: Number of channels per split off frequency chunk.
+  - id: round_freq
+    type: boolean
+    default: true
+    inputBinding:
+      position: 5
+      prefix: --round_freq
+    doc: Rounds the frequency in the directory name to an integer.
+
+outputs:
+  - id: msouts
+    type: Directory[]
+    doc: Output MeasurementSets.
+    outputBinding:
+      glob: '*MHz.ms'
+
+hints:
+ - class: DockerRequirement
+   dockerPull: astronrd/linc
+
+requirements:
+ - class: InitialWorkDirRequirement
+   listing:
+    - entry: $(inputs.ms)
+ - class: InlineJavascriptRequirement
+stderr: chunk_ms.log
+

steps/ddecal.cwl

@@ -235,6 +235,35 @@ inputs:
       position: 0
       prefix: ddecal.approxtolerance=
       separate: false
+  - id: sourcedb
+    type:
+      - File?
+      - Directory?
+    inputBinding:
+      position: 0
+      prefix: ddecal.sourcedb=
+      separate: false
+  - id: usebeammodel
+    default: false
+    type: boolean?
+    inputBinding:
+      position: 0
+      prefix: ddecal.usebeammodel=True
+      separate: false
+  - id: usechannelfreq
+    default: true
+    type: boolean?
+    inputBinding:
+      valueFrom: $(!self)
+      position: 0
+      prefix: ddecal.usechannelfreq=False
+      separate: false
+  - id: beammode
+    type: string?
+    inputBinding:
+      position: 0
+      prefix: ddecal.beammode=
+      separate: false
 
 #--------------------
   - id: save2json

steps/filter_predict.cwl

@@ -55,6 +55,13 @@ inputs:
     inputBinding:
       position: 0
       prefix: predict.usebeammodel=True
+  - id: usechannelfreq
+    default: true
+    type: boolean?
+    inputBinding:
+      valueFrom: $(!self)
+      position: 0
+      prefix: predict.usechannelfreq=False
   - default: false
     id: onebeamperpatch
     type: boolean?
@@ -118,7 +125,6 @@ outputs:
       glob: 'filter_predict*.log'
 arguments:
   - steps=[filter,predict,count]
-  - predict.usechannelfreq=False
   - msout=.
 requirements:
   - class: InitialWorkDirRequirement

steps/gaincal.cwl

@@ -114,9 +114,11 @@ inputs:
   - default: true
     id: usechannelfreq
     type: boolean?
+    default: true
     inputBinding:
+      valueFrom: $(!self)
       position: 0
-      prefix: gaincal.usechannelfreq=True
+      prefix: gaincal.usechannelfreq=False
       separate: false
   - default: array_factor
     id: beammode

steps/predict.cwl

@@ -56,11 +56,12 @@ inputs:
       position: 0
       prefix: predict.usebeammodel=True
   - id: usechannelfreq
-    default: false
+    default: true
     type: boolean?
     inputBinding:
+      valueFrom: $(!self)
       position: 0
-      prefix: predict.usechannelfreq=True
+      prefix: predict.usechannelfreq=False
   - id: onebeamperpatch
     default: false
     type: boolean?

steps/wsclean.cwl

@@ -16,7 +16,7 @@ inputs:
       - 2500
       - 2500
     type: 
-      - int[]
+      - int[]?
     inputBinding:
       position: 1
       shellQuote: false
@@ -315,6 +315,10 @@ inputs:
   - id: fits_image
     type: File?
 outputs:
+  - id: sourcelist
+    type: File?
+    outputBinding:
+      glob: [$(inputs.image_name)-sources.txt]
   - id: dirty_image
     type: File?
     outputBinding:

test_jobs/HBA_target_selfcal.json

+{
+    "msin": [
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB000_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB001_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB002_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB003_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB004_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB005_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB006_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB007_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB008_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB009_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB010_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB011_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB012_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB013_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB014_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB015_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB016_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB017_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB018_uv.MS"
+        },
+        {
+            "class": "Directory",
+            "path": "../data/L667520_SB019_uv.MS"
+        }
+    ],
+    "avg_timeresolution_concat": 4,
+    "ncores": 12,
+    "cal_solutions": {
+        "class": "File",
+        "path": "../data/results_calibrator/cal_solutions.h5"
+    },
+    "A-Team_skymodel": {
+        "class": "File",
+        "path": "/usr/local/share/linc/skymodels/Ateam_LBA_CC.skymodel"
+    },
+    "calibrator_path_skymodel": {
+        "class": "Directory",
+        "path": "/usr/local/share/linc/skymodels"
+    },
+    "selfcal": true,
+    "selfcal_strategy": "HBA",
+    "selfcal_hba_imsize": [2000,2000],
+    "num_SBs_per_group": -1
+}

workflows/HBA_target.cwl

@@ -108,7 +108,8 @@ inputs:
     default: 97.64kHz
   - id: num_SBs_per_group
     type: int?
-    default: 10
+  - id: calib_nchan
+    type: int?
   - id: reference_stationSB
     type: int?
     default: null
@@ -161,6 +162,20 @@ inputs:
   - id: selfcal
     type: boolean?
     default: false
+  - id: selfcal_strategy
+    type: string?
+    default: 'HBA'
+  - id: selfcal_hba_imsize
+    type: int[]?
+    default: [20000,20000]
+  - id: selfcal_hba_uvlambdamin
+    type: float?
+    default: 200.
+  - id: output_channels_per_chunk
+    type: int?
+    default: 20
+  - id: selfcal_region
+    type: File?
   - id: chunkduration
     type: float?
     default: 0.0
@@ -169,8 +184,6 @@ inputs:
   - id: make_structure_plot
     type: boolean?
     default: true
-  - id: selfcal_region
-    type: File?
   - id: skymodel_fluxlimit
     type: float?
 outputs:
@@ -267,6 +280,8 @@ steps:
         source: avg_freqresolution_concat
       - id: num_SBs_per_group
         source: num_SBs_per_group
+      - id: calib_nchan
+        source: calib_nchan
       - id: reference_stationSB
         source: reference_stationSB
       - id: ionex_server
@@ -301,16 +316,24 @@ steps:
         source: aoflag_freqconcat
       - id: selfcal
         source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+      - id: selfcal_hba_imsize
+        source: selfcal_hba_imsize
+      - id: selfcal_region
+        source: selfcal_region
       - id: chunkduration
         source: chunkduration
       - id: wsclean_tmpdir
         source: wsclean_tmpdir
       - id: make_structure_plot
         source: make_structure_plot
-      - id: selfcal_region
-        source: selfcal_region
       - id: skymodel_fluxlimit
         source: skymodel_fluxlimit
+      - id: output_channels_per_chunk
+        source: output_channels_per_chunk
+      - id: selfcal_hba_uvlambdamin
+        source: selfcal_hba_uvlambdamin
     out:
       - id: logfiles
       - id: msout

workflows/LBA_target.cwl

@@ -108,7 +108,8 @@ inputs:
     default: 48.82kHz
   - id: num_SBs_per_group
     type: int?
-    default: -1
+  - id: calib_nchan
+    type: int?
   - id: reference_stationSB
     type: int?
     default: null
@@ -161,6 +162,14 @@ inputs:
   - id: selfcal
     type: boolean?
     default: true
+  - id: selfcal_strategy
+    type: string?
+    default: 'LBA'
+  - id: selfcal_region
+    type: File?
+  - id: selfcal_hba_imsize
+    type: int[]?
+    default: [20000,20000]
   - id: chunkduration
     type: float?
     default: 3600.0
@@ -169,8 +178,6 @@ inputs:
   - id: make_structure_plot
     type: boolean?
     default: true
-  - id: selfcal_region
-    type: File?
   - id: skymodel_fluxlimit
     type: float?
     default: 1.0
@@ -268,6 +275,8 @@ steps:
         source: avg_freqresolution_concat
       - id: num_SBs_per_group
         source: num_SBs_per_group
+      - id: calib_nchan
+        source: calib_nchan
       - id: reference_stationSB
         source: reference_stationSB
       - id: ionex_server
@@ -302,14 +311,18 @@ steps:
         source: aoflag_freqconcat
       - id: selfcal
         source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+      - id: selfcal_hba_imsize
+        source: selfcal_hba_imsize
+      - id: selfcal_region
+        source: selfcal_region
       - id: chunkduration
         source: chunkduration
       - id: wsclean_tmpdir
         source: wsclean_tmpdir
       - id: make_structure_plot
         source: make_structure_plot
-      - id: selfcal_region
-        source: selfcal_region
       - id: skymodel_fluxlimit
         source: skymodel_fluxlimit
     out:

workflows/linc_calibrator/apply_calibrate_bp.cwl

@@ -121,11 +121,11 @@ steps:
       - id: databitrate
         default: 0
       - id: updateweights
-        default: 'true'
+        default: true
       - id: usechannelfreq
-        default: 'false'
+        default: false
       - id: invert
-        default: 'true'
+        default: true
       - id: beammode
         default: element
     out:

workflows/linc_calibrator/apply_calibrate_pa.cwl

@@ -82,13 +82,13 @@ steps:
       - id: databitrate
         default: 0
       - id: updateweights
-        default: 'true'
+        default: true
       - id: invert
-        default: 'true'
+        default: true
       - id: beammode
         default: element
       - id: usechannelfreq
-        default: 'false'
+        default: false
       - id: msin
         source: applyPA/msout
       - id: type

workflows/linc_target.cwl

@@ -108,7 +108,8 @@ inputs:
     default: 97.64kHz
   - id: num_SBs_per_group
     type: int?
-    default: 10
+  - id: calib_nchan
+    type: int?
   - id: reference_stationSB
     type: int?
     default: null
@@ -161,6 +162,18 @@ inputs:
   - id: selfcal
     type: boolean?
     default: false
+  - id: selfcal_strategy
+    type: string?
+    default: 'HBA'
+  - id: selfcal_hba_imsize
+    type: int[]?
+    default: [20000,20000]
+  - id: selfcal_hba_uvlambdamin
+    type: float?
+    default: 200
+  - id: output_channels_per_chunk
+    type: int?
+    default: 20
   - id: chunkduration
     type: float?
     default: 0.0
@@ -225,7 +238,10 @@ steps:
       - id: process_baselines_target
         source: process_baselines_target
       - id: num_SBs_per_group
-        source: num_SBs_per_group
+        source: 
+          - num_SBs_per_group
+          - selfcal
+        valueFrom: '$(self[0] == null ? (self[-1] ? -1 : null) : self[0])'
       - id: reference_stationSB
         source: reference_stationSB
       - id: filter_baselines
@@ -358,6 +374,10 @@ steps:
         source: prep/outh5parm
       - id: selfcal
         source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+      - id: selfcal_hba_imsize
+        source: selfcal_hba_imsize
       - id: chunkduration
         source: chunkduration
       - id: wsclean_tmpdir
@@ -372,6 +392,13 @@ steps:
         source: prep/filenames
       - id: selfcal_region
         source: selfcal_region
+      - id: calib_nchan
+        source: 
+          - calib_nchan
+          - selfcal
+        valueFrom: '$(self[0] == null ? (self[1] ? null : 0) : self[0])'
+      - id: selfcal_hba_uvlambdamin
+        source: selfcal_hba_uvlambdamin
     out:
       - id: msout
       - id: outh5parm
@@ -438,6 +465,12 @@ steps:
         source: wsclean_tmpdir
       - id: make_structure_plot
         source: make_structure_plot
+      - id: selfcal
+        source: selfcal
+      - id: selfcal_strategy
+        source: selfcal_strategy
+      - id: output_channels_per_chunk
+        source: output_channels_per_chunk
     out:
       - id: msout
       - id: solutions
@@ -449,4 +482,6 @@ steps:
 requirements:
   - class: SubworkflowFeatureRequirement
   - class: ScatterFeatureRequirement
-  - class: MultipleInputFeatureRequirement
\ No newline at end of file
+  - class: MultipleInputFeatureRequirement
+  - class: StepInputExpressionRequirement
+  - class: InlineJavascriptRequirement

workflows/linc_target/calib_targ.cwl

@@ -9,8 +9,8 @@ inputs:
     type: Directory
   - id: skymodel
     type:
-      - File
-      - Directory
+      - File?
+      - Directory?
   - id: do_smooth
     type: boolean?
     default: false
@@ -20,9 +20,22 @@ inputs:
   - id: gsmcal_step
     type: string?
     default: 'phase'
-  - id: execute
-    type: boolean?
-    default: true
+  - id: smoothnessconstraint
+    type: float?
+    default: 0.
+  - id: smoothnessreffrequency
+    type: float?
+    default: 0.
+  - id: beammode
+    type: string?
+  - id: nchan
+    type: int?
+    default: 1
+  - id: model_column
+    type: string[]?
+    default: []
+  - id: uvlambdamin
+    type: float?
 outputs:
   - id: msout
     outputSource:
@@ -64,13 +77,9 @@ steps:
         source: BLsmooth/msout
       - id: msin_datacolumn
         default: SMOOTHED_DATA
-      - id: msout_name
-        default: '.'
-      - id: blrange
-        default:
-          - 150
-          - 9999999
-      - id: caltype
+      - id: uvlambdamin
+        source: uvlambdamin
+      - id: mode
         source: gsmcal_step
         valueFrom: '$(self == "phase" ? "phaseonly" : self)'
       - id: sourcedb
@@ -80,22 +89,28 @@ steps:
       - id: solint
         default: 1
       - id: nchan
-        default: 0
+        source: nchan
       - id: tolerance
         default: 1e-3
-      - id: propagatesolutions
+      - id: propagate_solutions
         source: propagatesolutions
       - id: usebeammodel
         default: true
       - id: usechannelfreq
         default: true
       - id: beammode
-        default: array_factor
+        source: beammode
+      - id: smoothnessconstraint
+        source: smoothnessconstraint
+      - id: smoothnessreffrequency
+        source: smoothnessreffrequency
+      - id: modeldatacolumns
+        source: model_column
     out:
       - id: msout
       - id: h5parm
       - id: logfile
-    run: ../../steps/gaincal.cwl
+    run: ../../steps/ddecal.cwl
   - id: concat_logfiles_gaincal
     in:
       - id: file_list

workflows/linc_target/dp3_prep_targ.cwl

@@ -281,6 +281,8 @@ steps:
         default: 0
       - id: filter_baselines
         source: process_baselines_target
+      - id: usechannelfreq
+        default: false
       - id: execute
         source: clipAteam
     out: