Skip to content

Commit 0dd79b6

Browse files
committed
fixing up channel logic, doing more tests
1 parent 4a1a1cd commit 0dd79b6

3 files changed

Lines changed: 10 additions & 5 deletions

File tree

conf/test_full.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ params {
2222
//input = "test/samplesheets/samplesheet_test_local_bam.csv"
2323
sequencing_type = "ont-drna" // sequencing molecule [ont-drna OR ont-cdna]
2424
bam_input = false
25+
transcriptome_mapping = false
2526
// Genome references
2627
// These channel names have to match those in the full workflow also
2728
genome_fasta = "assets/fulltest_data/hg38.analysisSet.fa.gz"
@@ -34,7 +35,6 @@ params {
3435
annotation_gtf = "assets/fulltest_data/Homo_sapiens.GRCh38.112_chr.gtf.gz"
3536
skip_prepare_reference = false
3637
skip_mapping = false
37-
transcriptome_mapping = true
3838
skip_bam_to_bigwig = false
3939
skip_qc = false
4040
skip_bam_qc = false

workflows/directrna.nf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ workflow DIRECTRNA{
261261
ch_transcriptome_minimap2_index )
262262
ch_bam = MAPPING.out.bam.view()
263263
ch_bam_index = MAPPING.out.bai
264-
ch_bam_index_path = MAPPING.out.bai.flatten().last().view()
264+
ch_bam_index_path = MAPPING.out.bai.flatten().last()
265265
ch_mixed_bam = ch_bam.combine(ch_bam_index_path)
266266
SAMTOOLS_FASTA( ch_bam )
267267
ch_unmapped_reads = SAMTOOLS_FASTA.out.fasta
@@ -270,10 +270,11 @@ workflow DIRECTRNA{
270270
ch_bam = ch_sample
271271
ch_bam.view()
272272
SAMTOOLS_INDEX( ch_sample )
273-
ch_bam_index = SAMTOOLS_INDEX.out.bai.flatten().last()
273+
ch_bam_index_path = SAMTOOLS_INDEX.out.bai.flatten().last().view()
274+
//ch_bam_index_path = ch_bam_index
274275
SAMTOOLS_FASTA( ch_sample )
275276
ch_unmapped_reads = SAMTOOLS_FASTA.out.fasta
276-
ch_mixed_bam = ch_bam.combine(ch_bam_index).view()
277+
ch_mixed_bam = ch_bam.combine(ch_bam_index_path).view()
277278
}
278279

279280
// BAM TO BIGWIG for visualisation

workflows/nextflow.config

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ includeConfig "../modules/local/sequali/sequali/nextflow.config"
55
includeConfig "../modules/local/minimap2/align/nextflow.config"
66
includeConfig "../modules/local/samtools/sort/nextflow.config"
77
includeConfig "../modules/local/samtools/index/nextflow.config"
8+
includeConfig "../modules/local/samtools/fasta/nextflow.config"
89
includeConfig "../modules/local/bedtools/bam_to_bedgraph/nextflow.config"
910
includeConfig "../modules/local/bedtools/bam_to_bedgraph/nextflow.config"
1011
includeConfig "../modules/local/ucsc/bedgraphtobigwig/nextflow.config"
@@ -31,7 +32,10 @@ includeConfig "../modules/local/unzip/unzip/nextflow.config"
3132
includeConfig "../modules/nf-core/gunzip/nextflow.config"
3233
includeConfig "../modules/nf-core/custom/getchromsizes/nextflow.config"
3334
includeConfig "../modules/local/isoquant/gtf2db/nextflow.config"
34-
35+
includeConfig "../modules/local/sylph/get_tax_database/nextflow.config"
36+
includeConfig "../modules/local/sylph/prepare_reference/nextflow.config"
37+
includeConfig "../modules/local/sylph/profile/nextflow.config"
38+
includeConfig "../modules/local/sylph/tax/nextflow.config"
3539

3640
//TODO
3741
// don't forget prepare reference and other subworkflows

0 commit comments

Comments
 (0)