Skip to content

Commit 51866a3

Browse files
committed
Working subworkflow
1 parent c5db86a commit 51866a3

5 files changed

Lines changed: 8 additions & 98 deletions

File tree

conf/modules.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1860,5 +1860,9 @@ process {
18601860
]
18611861
]
18621862
}
1863-
//
1863+
1864+
// Add configuration for HAPLOGREP3_CLASSIFY in HAPLOTYPE_HUMAN_MTDNA
1865+
withName: 'NFCORE_EAGER:EAGER:HAPLOTYPE_HUMAN_MTDNA:HAPLOGREP3_CLASSIFY' {
1866+
ext.args = '--tree phylotree-fu-rcrs@1.2'
1867+
}
18641868
}

subworkflows/local/haplotype_human_mtdna/main.nf renamed to subworkflows/local/haplotype_human_mtdna.nf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ workflow HAPLOTYPE_HUMAN_MTDNA {
1919
// Prepare input for haplogrep3
2020
// The module requires a tuple with [meta, inputfile]
2121
ch_input_haplogrep3 = ch_mtdna_vcf
22-
.map {
23-
// Prepend a new meta that contains the meta.reference value as the new_meta.reference attribute
24-
addNewMetaFromAttributes( it, "reference", "reference", false )
25-
}
2622

2723
// Run mtDNA haplogroup classification with haplogrep3
2824
HAPLOGREP3_CLASSIFY(ch_input_haplogrep3)
@@ -33,6 +29,3 @@ workflow HAPLOTYPE_HUMAN_MTDNA {
3329
haplogroups = ch_haplogroups // channel: [ val(meta), path("*.txt") ]
3430
versions = ch_versions // channel: path(versions.yml)
3531
}
36-
37-
38-
workflow HAPLOGREP3_CLASSIFY {

subworkflows/local/haplotype_human_mtdna/meta.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

subworkflows/local/haplotype_human_mtdna/tests/main.nf.test

Lines changed: 0 additions & 36 deletions
This file was deleted.

workflows/eager.nf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ include { METAGENOMICS } from '../subwork
3232
include { ESTIMATE_CONTAMINATION } from '../subworkflows/local/estimate_contamination'
3333
include { CALCULATE_DAMAGE } from '../subworkflows/local/calculate_damage'
3434
include { RUN_SEXDETERRMINE } from '../subworkflows/local/run_sex_determination'
35-
include { CLASSIFY_MTDNA_HAPLOGROUP } from '../subworkflows/local/classify_mtdna_haplogroup'
35+
include { HAPLOTYPE_HUMAN_MTDNA } from '../subworkflows/local/haplotype_human_mtdna'
3636
include { MERGE_LIBRARIES } from '../subworkflows/local/merge_libraries'
3737
include { MERGE_LIBRARIES as MERGE_LIBRARIES_GENOTYPING } from '../subworkflows/local/merge_libraries'
3838
include { GENOTYPE } from '../subworkflows/local/genotype'
@@ -594,8 +594,8 @@ workflow EAGER {
594594
[ meta, vcf ]
595595
}
596596

597-
CLASSIFY_MTDNA_HAPLOGROUP(ch_mtdna_haplogroup_input)
598-
ch_versions = ch_versions.mix(CLASSIFY_MTDNA_HAPLOGROUP.out.versions)
597+
HAPLOTYPE_HUMAN_MTDNA(ch_mtdna_haplogroup_input)
598+
ch_versions = ch_versions.mix(HAPLOTYPE_HUMAN_MTDNA.out.versions)
599599
}
600600

601601
//

0 commit comments

Comments
 (0)