Skip to content

Commit d40e650

Browse files
committed
only one samplesheetToList
1 parent ea70b71 commit d40e650

File tree

2 files changed

+3
-25
lines changed
  • subworkflows/local/utils_nfcore_rnaseq_pipeline
  • workflows/rnaseq

2 files changed

+3
-25
lines changed

subworkflows/local/utils_nfcore_rnaseq_pipeline/main.nf

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import groovy.json.JsonSlurper
1212

1313
include { UTILS_NFSCHEMA_PLUGIN } from '../../nf-core/utils_nfschema_plugin'
1414
include { paramsSummaryMap } from 'plugin/nf-schema'
15-
include { samplesheetToList } from 'plugin/nf-schema'
1615
include { completionEmail } from '../../nf-core/utils_nfcore_pipeline'
1716
include { completionSummary } from '../../nf-core/utils_nfcore_pipeline'
1817
include { imNotification } from '../../nf-core/utils_nfcore_pipeline'
@@ -73,28 +72,7 @@ workflow PIPELINE_INITIALISATION {
7372
//
7473
validateInputParameters()
7574

76-
//
77-
// Create channel from input file provided through params.input
78-
//
79-
80-
Channel
81-
.fromList(samplesheetToList(params.input, "${projectDir}/assets/schema_input.json"))
82-
.map {
83-
meta, fastq_1, fastq_2 ->
84-
if (!fastq_2) {
85-
return [ meta.id, meta + [ single_end:true ], [ fastq_1 ] ]
86-
} else {
87-
return [ meta.id, meta + [ single_end:false ], [ fastq_1, fastq_2 ] ]
88-
}
89-
}
90-
.groupTuple()
91-
.map {
92-
checkSamplesAfterGrouping(it)
93-
}
94-
.set{ ch_samplesheet }
95-
9675
emit:
97-
samplesheet = ch_samplesheet
9876
versions = ch_versions
9977
}
10078

workflows/rnaseq/main.nf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ workflow RNASEQ {
121121
}
122122
}
123123
.groupTuple()
124-
.map {
125-
checkSamplesAfterGrouping(it)
124+
.map { samplesheet ->
125+
checkSamplesAfterGrouping(samplesheet)
126126
}
127-
.set{ ch_fastq }
127+
.set { ch_fastq }
128128

129129
//
130130
// Run RNA-seq FASTQ preprocessing subworkflow

0 commit comments

Comments
 (0)