Skip to content

Commit

Permalink
Refactor of line lenght >127 cols for in- and outputs
Browse files Browse the repository at this point in the history
  • Loading branch information
BasMonkey committed Jan 29, 2024
1 parent de29560 commit 42b7f7e
Show file tree
Hide file tree
Showing 26 changed files with 56 additions and 28 deletions.
3 changes: 2 additions & 1 deletion ControlFREEC/11.5/Freec.nf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ process Freec {

output:
tuple(val(sample_id), path("${bam_file.name}_ratio.txt"), path("${bam_file.name}_CNVs"), emit: cnv)
tuple(val(sample_id), path("${bam_file.name}_sample.cpn"), path("${bam_file.name}_ratio.BedGraph"), path("${bam_file.name}_info.txt"), emit: other)
tuple(val(sample_id), path("${bam_file.name}_sample.cpn"), path("${bam_file.name}_ratio.BedGraph"),
path("${bam_file.name}_info.txt"), emit: other)

script:
def config = "${sample_id}.config"
Expand Down
3 changes: 2 additions & 1 deletion GATK/3.8-1-0-gf15c1c3ef/BaseRecalibrator.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process BaseRecalibrator {
tuple(val(sample_id), path(bam_file), path(bai_file), val(chr))

output:
tuple(val(sample_id), path("${bam_file.baseName}.bqsr.${chr}.bam"), path("${bam_file.baseName}.bqsr.${chr}.bai"), emit: bam_file)
tuple(val(sample_id), path("${bam_file.baseName}.bqsr.${chr}.bam"), path("${bam_file.baseName}.bqsr.${chr}.bai"),
emit: bam_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion GATK/3.8-1-0-gf15c1c3ef/GenotypeGVCFs.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process GenotypeGVCFs {
tuple(val(analysis_id), path(gvcf_files), path(gvcf_idx_files), path(interval_file))

output:
tuple(val(analysis_id), path("${analysis_id}_${interval_file.baseName}.vcf"), path("${analysis_id}_${interval_file.baseName}.vcf.idx"), emit:vcf_file)
tuple(val(analysis_id), path("${analysis_id}_${interval_file.baseName}.vcf"),
path("${analysis_id}_${interval_file.baseName}.vcf.idx"), emit: vcf_file)

script:
def input_files = gvcf_files.collect{"$it"}.join(" -V ")
Expand Down
6 changes: 4 additions & 2 deletions GATK/3.8-1-0-gf15c1c3ef/HaplotypeCaller.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process HaplotypeCaller {
tuple(val(analysis_id), path(bam_files), path(bai_files), path(interval_file))

output:
tuple(val(analysis_id), path("${analysis_id}.${interval_file.baseName}.vcf"), path("${analysis_id}.${interval_file.baseName}.vcf.idx"), emit: vcf_file)
tuple(val(analysis_id), path("${analysis_id}.${interval_file.baseName}.vcf"),
path("${analysis_id}.${interval_file.baseName}.vcf.idx"), emit: vcf_file)

script:
def input_files = bam_files.collect{"$it"}.join(" --input_file ")
Expand All @@ -34,7 +35,8 @@ process HaplotypeCallerGVCF {
tuple(val(sample_id), path(bam_file), path(bai_file), path(interval_file))

output:
tuple(val(sample_id), path("${sample_id}_${interval_file.baseName}.g.vcf"), path("${sample_id}_${interval_file.baseName}.g.vcf.idx"), path(interval_file), emit: vcf_file)
tuple(val(sample_id), path("${sample_id}_${interval_file.baseName}.g.vcf"),
path("${sample_id}_${interval_file.baseName}.g.vcf.idx"), path(interval_file), emit: vcf_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion GATK/3.8-1-0-gf15c1c3ef/IndelRealigner.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process IndelRealigner {
tuple(val(sample_id), path(bam_file), path(bai_file), val(chr), path(target_intervals))

output:
tuple(val(sample_id), path("${bam_file.baseName}.realigned.${chr}.bam"), path("${bam_file.baseName}.realigned.${chr}.bai"), emit: bam_file)
tuple(val(sample_id), path("${bam_file.baseName}.realigned.${chr}.bam"),
path("${bam_file.baseName}.realigned.${chr}.bai"), emit: bam_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion GATK/3.8-1-0-gf15c1c3ef/SelectVariants.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process SelectVariantsSample {
tuple(val(analysis_id), path(vcf_file), path(vcf_idx_file), val(sample_id))

output:
tuple(val(sample_id), path("${sample_id}_${vcf_file.baseName}.vcf"), path("${sample_id}_${vcf_file.baseName}.vcf.idx"), emit: vcf_file)
tuple(val(sample_id), path("${sample_id}_${vcf_file.baseName}.vcf"),
path("${sample_id}_${vcf_file.baseName}.vcf.idx"), emit: vcf_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion GATK/3.8-1-0-gf15c1c3ef/VariantFiltration.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process VariantFiltrationSnpIndel {
tuple(val(analysis_id), path(vcf_file), path(vcf_idx_file))

output:
tuple(val(analysis_id), path("${vcf_file.baseName}.filter.vcf"), path("${vcf_file.baseName}.filter.vcf.idx"), emit: vcf_file)
tuple(val(analysis_id), path("${vcf_file.baseName}.filter.vcf"), path("${vcf_file.baseName}.filter.vcf.idx"),
emit: vcf_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.1.3.0/CombineGVCFs.nf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ process CombineGVCFs {
input:
tuple(val(run_id), val(interval), path(gvcf_chunks), path(gvcf_chunk_idxs), path(interval_file))
output:
tuple(val(run_id), val(interval), path("${run_id}.${interval}.g.vcf"), path("${run_id}.${interval}.g.vcf.idx"), path(interval_file), emit: combined_gvcfs)
tuple(val(run_id), val(interval), path("${run_id}.${interval}.g.vcf"), path("${run_id}.${interval}.g.vcf.idx"),
path(interval_file), emit: combined_gvcfs)

script:
vcfs = gvcf_chunks.join(' -V ')
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.1.3.0/GenotypeGVCFs.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process GenotypeGVCFs {
tuple(val(run_id), val(interval), path(gvcf), path(gvcfidx), path(interval_file))

output:
tuple(val(run_id), val(interval), path("${run_id}.${interval}.vcf"),path("${run_id}.${interval}.vcf.idx"),path(interval_file), emit : genotyped_vcfs)
tuple(val(run_id), val(interval), path("${run_id}.${interval}.vcf"),path("${run_id}.${interval}.vcf.idx"),
path(interval_file), emit: genotyped_vcfs)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.1.3.0/HaplotypeCaller.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process HaplotypeCaller {
tuple(val(sample_id), path(bam), path(bai), path(interval_file))

output:
tuple(val(sample_id), val(int_tag) ,path("${sample_id}.${int_tag}${ext}"), path("${sample_id}.${int_tag}${ext}.idx"), path(interval_file), emit: htcaller_vcfs)
tuple(val(sample_id), val(int_tag) ,path("${sample_id}.${int_tag}${ext}"), path("${sample_id}.${int_tag}${ext}.idx"),
path(interval_file), emit: htcaller_vcfs)

script:
int_tag = interval_file.toRealPath().toString().split("/")[-2]
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.1.3.0/SelectVariants.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process SelectVariants {
tuple(val(run_id), val(interval), path(vcf), path(vcfidx), val(type))

output:
tuple(val(run_id), val(interval), val(type), path("${run_id}.${interval}.${type}.tmp.vcf"), path("${run_id}.${interval}.${type}.tmp.vcf.idx"), emit: selected_vcfs)
tuple(val(run_id), val(interval), val(type), path("${run_id}.${interval}.${type}.tmp.vcf"),
path("${run_id}.${interval}.${type}.tmp.vcf.idx"), emit: selected_vcfs)

script:
select_type = type == 'SNP' ? '--select-type SNP --select-type NO_VARIATION' : '--select-type INDEL --select-type MIXED'
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.1.3.0/VariantAnnotator.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process VariantAnnotator {
tuple(val(run_id), path(vcf), path(vcfidx))

output:
tuple(val(run_id), path("${vcf.baseName}_${db_name}.vcf"), path("${vcf.baseName}_${db_name}.vcf.idx"), emit: annotated_vcfs)
tuple(val(run_id), path("${vcf.baseName}_${db_name}.vcf"), path("${vcf.baseName}_${db_name}.vcf.idx"),
emit: annotated_vcfs)

script:
db_file = file(params.genome_variant_annotator_db).getBaseName()
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.1.3.0/VariantFiltration.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process VariantFiltration {
tuple(val(run_id), val(interval), val(type), path(vcf), path(vcfidx))

output:
tuple(val(run_id), val(interval), val(type), path("${run_id}.${interval}.${type}.filtered_variants.vcf"), path("${run_id}.${interval}.${type}.filtered_variants.vcf.idx"), emit: filtered_vcfs)
tuple(val(run_id), val(interval), val(type), path("${run_id}.${interval}.${type}.filtered_variants.vcf"),
path("${run_id}.${interval}.${type}.filtered_variants.vcf.idx"), emit: filtered_vcfs)

script:
if (type == 'SNP'){
Expand Down
6 changes: 4 additions & 2 deletions GATK/4.2.1.0/MergeVcfs.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process MergeVcfs {
tuple(val(output_name), path(vcf_files), path(vcf_idx_files))

output:
tuple(val(output_name), path("${output_name}${ext_vcf}"), path("${output_name}${ext_vcf}${ext_vcf_index}"), emit:vcf_file)
tuple(val(output_name), path("${output_name}${ext_vcf}"), path("${output_name}${ext_vcf}${ext_vcf_index}"),
emit: vcf_file)

script:
def input_files = vcf_files.collect{"$it"}.join(" --INPUT ")
Expand All @@ -35,7 +36,8 @@ process MergeGvcfs {
tuple(val(output_name), path(vcf_files), path(vcf_idx_files))

output:
tuple(val(output_name), path("${output_name}${ext_gvcf}"), path("${output_name}${ext_gvcf}${ext_gvcf_index}"), emit:vcf_file)
tuple(val(output_name), path("${output_name}${ext_gvcf}"), path("${output_name}${ext_gvcf}${ext_gvcf_index}"),
emit: vcf_file)

script:
def input_files = vcf_files.collect{"$it"}.join(" --INPUT ")
Expand Down
3 changes: 2 additions & 1 deletion GATK/4.2.1.0/VariantFiltration.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process VariantFiltrationSnpIndel {
tuple(val(analysis_id), path(vcf_file), path(vcf_idx_file))

output:
tuple(val(analysis_id), path("${vcf_file.simpleName}.filter${ext_vcf}"), path("${vcf_file.simpleName}.filter${ext_vcf}${ext_vcf_index}"), emit: vcf_file)
tuple(val(analysis_id), path("${vcf_file.simpleName}.filter${ext_vcf}"),
path("${vcf_file.simpleName}.filter${ext_vcf}${ext_vcf_index}"), emit: vcf_file)

script:
ext_vcf = params.compress || vcf_file.getExtension() == ".gz" ? ".vcf.gz" : ".vcf"
Expand Down
3 changes: 2 additions & 1 deletion Sambamba/0.7.0/Markdup.nf
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ process Markdup {
input:
tuple(val(sample_id), val(rg_id), path(bam_file), path(bai_file))
output:
tuple(val(sample_id), val(rg_id), path("${bam_file.baseName}.markdup.bam"), path("${bam_file.baseName}.markdup.bam.bai"), emit: bam_file)
tuple(val(sample_id), val(rg_id), path("${bam_file.baseName}.markdup.bam"),
path("${bam_file.baseName}.markdup.bam.bai"), emit: bam_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion Sambamba/0.7.0/ViewSort.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process ViewSort {
tuple(val(sample_id), val(rg_id), path(sam_file))

output:
tuple(val(sample_id), val(rg_id), path("${sam_file.baseName}.sort.bam"), path("${sam_file.baseName}.sort.bam.bai"), emit: bam_file)
tuple(val(sample_id), val(rg_id), path("${sam_file.baseName}.sort.bam"), path("${sam_file.baseName}.sort.bam.bai"),
emit: bam_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion Sambamba/0.7.0/ViewSubsample.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process Subsample {
tuple(val(sample_id), val(fraction), path(bam_file), path(bai_file))

output:
tuple(val(sample_id), path("${bam_file.baseName}.subsample.bam"), path("${bam_file.baseName}.subsample.bam.bai"), emit: bam_file)
tuple(val(sample_id), path("${bam_file.baseName}.subsample.bam"), path("${bam_file.baseName}.subsample.bam.bai"),
emit: bam_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion Sambamba/0.7.0/ViewUnmapped.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process ViewUnmapped {
tuple(val(sample_id), path(bam_file), path(bai_file))

output:
tuple(val(sample_id), path("${bam_file.baseName}.unmapped.bam"), path("${bam_file.baseName}.unmapped.bam.bai"), emit: bam_file)
tuple(val(sample_id), path("${bam_file.baseName}.unmapped.bam"), path("${bam_file.baseName}.unmapped.bam.bai"),
emit: bam_file)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion bash/MergeFastQs.nf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ process MergeFastqs {
tuple(val(sample_id), val(flowcell), path(fastq))

output:
tuple(val(sample_id), val(flowcell), val(read_nr) ,path("${sample_id}_${flowcell}_${read_nr}.fastq.gz"), emit : merged_fastqs)
tuple(val(sample_id), val(flowcell), val(read_nr) ,path("${sample_id}_${flowcell}_${read_nr}.fastq.gz"),
emit: merged_fastqs)


script:
Expand Down
3 changes: 2 additions & 1 deletion fgbio/1.1.0/CallMolecularConsensusReads.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process CallMolecularConsensusReads {
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path(bam))

output:
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path("${sample_id}.u.consensus.bam"), emit : consensus_bams)
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path("${sample_id}.u.consensus.bam"),
emit: consensus_bams)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion fgbio/1.1.0/FilterConsensusReads.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process FilterConsensusReads {
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path(bam))

output:
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path("${sample_id}.u.consensus.filtered.bam"), emit: filtered_bams)
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path("${sample_id}.u.consensus.filtered.bam"),
emit: filtered_bams)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion fgbio/1.1.0/SortBam.nf
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ process SortBam {
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path(bam))

output:
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path("${sample_id}.u.grouped.sorted.bam"), emit: sorted_bams)
tuple(val(sample_id), val(flowcell), val(machine), val(run_nr), path("${sample_id}.u.grouped.sorted.bam"),
emit: sorted_bams)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion snpEff/4.3t/SnpSiftAnnotate.nf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ process SNPSiftAnnotate {
tuple(val(run_id), path(vcf), path(vcfidx))

output:
tuple(val(run_id), path("${vcf.baseName}_${db_name}.vcf"), path("${vcf.baseName}_${db_name}.vcf.idx"), emit: snpsift_annoted_vcfs)
tuple(val(run_id), path("${vcf.baseName}_${db_name}.vcf"), path("${vcf.baseName}_${db_name}.vcf.idx"),
emit: snpsift_annoted_vcfs)

script:
db_file = file(params.genome_snpsift_annotate_db).getBaseName()
Expand Down
3 changes: 2 additions & 1 deletion snpEff/4.3t/SnpSiftDbnsfp.nf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ process SNPSiftDbnsfp {
tuple(val(run_id), path(vcf), path(vcfidx))

output:
tuple(val(run_id), path("${vcf.baseName}_dbnsfp.vcf"), path("${vcf.baseName}_dbnsfp.vcf.idx"), emit : snpsift_dbnsfp_vcfs)
tuple(val(run_id), path("${vcf.baseName}_dbnsfp.vcf"), path("${vcf.baseName}_dbnsfp.vcf.idx"),
emit: snpsift_dbnsfp_vcfs)

script:
"""
Expand Down
3 changes: 2 additions & 1 deletion snpEff/4.3t/snpEffFilter.nf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ process SNPEffFilter {
tuple(val(run_id), path(vcf), path(vcfidx))

output:
tuple(val(run_id), path("${vcf.baseName}.filtered_variants.vcf"), path("${vcf.baseName}.filtered_variants.vcf.idx"), emit: snpeff_filtered_vcfs)
tuple(val(run_id), path("${vcf.baseName}.filtered_variants.vcf"), path("${vcf.baseName}.filtered_variants.vcf.idx"),
emit: snpeff_filtered_vcfs)

script:
"""
Expand Down

0 comments on commit 42b7f7e

Please sign in to comment.