diff --git a/compress_pipeline.cwl b/compress_pipeline.cwl index 41634ee811e8e1d650677dfa474a7e086110e00a..f755e5530608cbe2e2bb00c37745f7e0c2b53f72 100644 --- a/compress_pipeline.cwl +++ b/compress_pipeline.cwl @@ -16,6 +16,8 @@ inputs: type: boolean? - id: msin type: Directory +- id: flag_elevation + type: string? outputs: - id: inspect @@ -110,7 +112,7 @@ steps: - id: extract_sip_meta in: - id: msin - source: + source: - dppp/msout - msin pickValue: first_non_null @@ -167,6 +169,8 @@ steps: source: flag_autocorrelation - id: is_raw source: identify_issues/is_raw + - id: flag_elevation + source: flag_elevation run: steps/define_parset.cwl out: - id: output @@ -174,7 +178,7 @@ steps: label: compress in: - id: directory - source: + source: - dppp/msout - msin pickValue: first_non_null @@ -187,12 +191,12 @@ steps: - id: inspect_step in: - id: msin - source: + source: - dppp/msout - msin pickValue: first_non_null - id: inspect_file_name - source: + source: - dppp/msout - msin pickValue: first_non_null diff --git a/docker/Dockerfile b/docker/Dockerfile index e17c1f261144f5bc9ad0864ce3ee438473f62b39..337459bf814ed62b358404f30e28e619d98414fc 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -112,7 +112,7 @@ RUN git clone --no-checkout https://git.astron.nl/RD/DP3.git && \ git -C DP3 checkout ${DP3_COMMIT} && \ mkdir DP3/build && \ cd DP3/build && \ - cmake .. -DPORTABLE=${PORTABLE} -DLIBDIRAC_PREFIX=/usr/local/ -DMETADATA_COMPRESSION_DEFAULT=True && \ + cmake .. -DPORTABLE=${PORTABLE} -DLIBDIRAC_PREFIX=/usr/local/ && \ make install -j$(nproc) && \ cd ../.. && rm -rf DP3 diff --git a/download_and_compress_pipeline.cwl b/download_and_compress_pipeline.cwl index 6ad92e490c30c68c199d78122005af24d9ed3394..cc6b6bc95be776163f41209fc5e50cec2f34b403 100644 --- a/download_and_compress_pipeline.cwl +++ b/download_and_compress_pipeline.cwl @@ -17,6 +17,8 @@ inputs: type: string[] - id: is_long_baseline type: boolean? +- id: flag_elevation + type: string? outputs: - id: compressed @@ -67,6 +69,8 @@ steps: source: flag_autocorrelation - id: is_long_baseline source: is_long_baseline + - id: flag_elevation + source: flag_elevation scatter: - msin run: ./compress_pipeline.cwl diff --git a/steps/define_parset.cwl b/steps/define_parset.cwl index 79ca3f47e29dc982b8f113615bea517df53892f6..d59f3f67dfe505f12f426a5f6ef98f347ebf9e4f 100644 --- a/steps/define_parset.cwl +++ b/steps/define_parset.cwl @@ -22,7 +22,7 @@ requirements: aoflag.strategy=/usr/local/share/aoflagger/strategies/lofar-default.lua # flagelev.type=preflagger - flagelev.elevation=0deg..20deg + flagelev.elevation=$(inputs.flag_elevation) # flagamp.amplmin=1e-30 flagamp.type=preflagger @@ -35,6 +35,9 @@ inputs: - id: is_raw type: boolean default: true +- id: flag_elevation + type: string + default: '0deg..20deg' outputs: - id: output