Skip to content

Commit

Permalink
Adding GENERATE_GENOME subworkflow to main
Browse files Browse the repository at this point in the history
  • Loading branch information
DLBPointon authored and weaglesBio committed Aug 31, 2022
1 parent 69c56ff commit 3630fbb
Show file tree
Hide file tree
Showing 6 changed files with 128 additions and 10 deletions.
3 changes: 3 additions & 0 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
},
"minimap2/align": {
"git_sha": "1a5a9e7b4009dcf34e6867dd1a5a1d9a718b027b"
},
"samtools/faidx": {
"git_sha": "ce06694af8ca2f7453206aa974c2c9a2b99ec093"
}
}
}
Expand Down
15 changes: 15 additions & 0 deletions modules/local/generate_genome_file.nf
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
process GENERATE_GENOME_FILE {
tag "${meta}"
label "process_small"

input:
tuple val( meta ), path( fai )

output:
tuple val( meta ), file( "my.genome" ), emit: dotgenome

script:
"""
cut -f1,2 $fai | sort -k2,2 -nr > my.genome
"""
}
43 changes: 43 additions & 0 deletions modules/nf-core/modules/samtools/faidx/main.nf

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 43 additions & 0 deletions modules/nf-core/modules/samtools/faidx/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions subworkflows/local/generate_genome.nf
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
include { SAMTOOLS_FAIDX } from '../../modules/nf-core/modules/samtools/faidx/main'
include { GENERATE_GENOME_FILE } from '../../modules/local/genome_file_generator'

workflow GENERATE_GENOME {

main:
ch_versions = Channel.empty()

SAMTOOLS_FAIDX ( [[params.assembly.sample], params.reference] )
ch_versions = ch_versions.mix(SAMTOOLS_FAIDX.out.versions)

GENERATE_GENOME_FILE ( SAMTOOLS_FAIDX.out.fai )

emit:
dot_genome = GENERATE_GENOME_FILE.out.dotgenome

versions = ch_versions.ifEmpty(null)

}
15 changes: 5 additions & 10 deletions workflows/treeval.nf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ WorkflowTreeval.initialise(params, log)

// TODO nf-core: Add all file path parameters for the pipeline to the list below
// Check input path parameters to see if they exist
def checkPathParamList = [ params.input, params.multiqc_config, params.fasta ]
def checkPathParamList = [ params.fasta ]
for (param in checkPathParamList) { if (param) { file(param, checkIfExists: true) } }

// Check mandatory parameters
Expand All @@ -26,7 +26,7 @@ if (params.input) { ch_input = file(params.input) } else { exit 1, 'Input sample
//
// SUBWORKFLOW: Consisting of a mix of local and nf-core/modules
//
include { INPUT_CHECK } from '../subworkflows/local/input_check'
include { GENERATE_GENOME } from '../subworkflows/local/generate_genome'

/*
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -37,7 +37,6 @@ include { INPUT_CHECK } from '../subworkflows/local/input_check'
//
// MODULE: Installed directly from nf-core/modules
//

include { CUSTOM_DUMPSOFTWAREVERSIONS } from '../modules/nf-core/modules/custom/dumpsoftwareversions/main'

/*
Expand All @@ -53,14 +52,10 @@ workflow TREEVAL {

ch_versions = Channel.empty()

//
// SUBWORKFLOW: Read in samplesheet, validate and stage input files
//
INPUT_CHECK (
ch_input
)
ch_versions = ch_versions.mix(INPUT_CHECK.out.versions)
GENERATE_GENOME ()
ch_versions = ch_versions.mix(GENERATE_GENOME.out.versions)

// TO PASS .genome INTO SUBWORKFLOW add `GENERATE_GENOME.out.dot_genome`

CUSTOM_DUMPSOFTWAREVERSIONS (
ch_versions.unique().collectFile(name: 'collated_versions.yml')
Expand Down

0 comments on commit 3630fbb

Please # to comment.