Skip to content

Commit 0ed4180

Browse files
committed
refactor(prepare_genome): bundle fasta_fai as a tuple emit
Per review feedback (#1851 r3209803147), emit fasta+fai as [meta, fasta, fai] from PREPARE_GENOME_REFERENCES. INDICES, main.nf, and the RNASEQ workflow take block updated to consume the tuple directly; the previous ad-hoc combine in workflows/rnaseq/main.nf that rebuilt this triple is dropped. Snapshots regenerated.
1 parent 20c098d commit 0ed4180

9 files changed

Lines changed: 508 additions & 549 deletions

File tree

main.nf

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ workflow NFCORE_RNASEQ {
8888
// SUBWORKFLOW: Build or load aligner / pseudo-aligner / filtering indices
8989
//
9090
PREPARE_GENOME_INDICES (
91-
PREPARE_GENOME_REFERENCES.out.fasta,
91+
PREPARE_GENOME_REFERENCES.out.fasta_fai,
9292
PREPARE_GENOME_REFERENCES.out.gtf,
9393
PREPARE_GENOME_REFERENCES.out.transcript_fasta,
9494
PREPARE_GENOME_REFERENCES.out.rrna_fastas,
@@ -118,8 +118,8 @@ workflow NFCORE_RNASEQ {
118118
if (!params.skip_alignment && !params.bam_csi_index) {
119119
PREPARE_GENOME_REFERENCES
120120
.out
121-
.fai
122-
.map { fai -> checkMaxContigSize(fai) }
121+
.fasta_fai
122+
.map { _meta, _fasta, fai -> checkMaxContigSize(fai) }
123123
}
124124

125125
//
@@ -135,9 +135,8 @@ workflow NFCORE_RNASEQ {
135135

136136
RNASEQ (
137137
ch_samplesheet,
138-
PREPARE_GENOME_REFERENCES.out.fasta,
138+
PREPARE_GENOME_REFERENCES.out.fasta_fai,
139139
PREPARE_GENOME_REFERENCES.out.gtf,
140-
PREPARE_GENOME_REFERENCES.out.fai,
141140
PREPARE_GENOME_REFERENCES.out.chrom_sizes,
142141
PREPARE_GENOME_REFERENCES.out.gene_bed,
143142
PREPARE_GENOME_REFERENCES.out.transcript_fasta,

subworkflows/local/prepare_genome_indices/main.nf

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ include { STAR_GENOMEPARAMS_UPGRADE } from '../../../modules/local/star_
2828
workflow PREPARE_GENOME_INDICES {
2929

3030
take:
31-
ch_fasta // channel: path(genome.fasta) - emitted from PREPARE_GENOME_REFERENCES
31+
ch_fasta_fai // channel: [ meta, path(genome.fasta), path(genome.fai) ] - emitted from PREPARE_GENOME_REFERENCES
3232
ch_gtf // channel: path(genome.gtf) - emitted from PREPARE_GENOME_REFERENCES
3333
ch_transcript_fasta // channel: path(transcript.fasta) - emitted from PREPARE_GENOME_REFERENCES
3434
ch_rrna_fastas // channel: path(rrna_fastas) - emitted from PREPARE_GENOME_REFERENCES
@@ -54,6 +54,8 @@ workflow PREPARE_GENOME_INDICES {
5454
star_index_legacy // boolean: whether the supplied star_index was built with STAR 2.6.x and needs genomeParameters.txt upgraded to the 2.7.4a metadata schema
5555

5656
main:
57+
ch_fasta = ch_fasta_fai.map { _meta, fasta_file, _fai -> fasta_file }
58+
5759
//------------------------------------------------
5860
// 1) Determine which indices we actually want built
5961
//------------------------------------------------

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

Lines changed: 42 additions & 42 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)