Skip to content

Commit 4b8cd3d

Browse files
authored
Merge pull request #127 from agrima2010/alignment_tools
Added alignment tools - bwamem index and mem
2 parents da768fb + e0d8f54 commit 4b8cd3d

45 files changed

Lines changed: 2885 additions & 68 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

conf/modules.config

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,21 @@ process {
3535
]
3636
}
3737

38+
withName: 'BWAMEM2_INDEX' {
39+
publishDir = [
40+
path: { "${params.outdir}/bwamem2_index" },
41+
mode: params.publish_dir_mode,
42+
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
43+
]
44+
}
45+
withName: 'BWAMEM2_MEM' {
46+
publishDir = [
47+
path: { "${params.outdir}/bwamem2_mem" },
48+
mode: params.publish_dir_mode,
49+
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
50+
]
51+
}
52+
3853
withName: 'MULTIQC_GLOBAL' {
3954
ext.args = { params.multiqc_title ? "--title \"$params.multiqc_title\"" : '' }
4055
publishDir = [

conf/test.config

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010
----------------------------------------------------------------------------------------
1111
*/
1212

13-
process {
14-
resourceLimits = [
15-
cpus: 4,
16-
memory: '15.GB',
17-
time: '1.h'
18-
]
19-
}
20-
2113
params {
2214
config_profile_name = 'Test profile'
2315
config_profile_description = 'Minimal test dataset to check pipeline function'
@@ -31,3 +23,13 @@ params {
3123
// Genome references
3224
genome = 'R64-1-1'
3325
}
26+
27+
process {
28+
resourceLimits = [
29+
cpus: 4,
30+
memory: '15.GB',
31+
time: '1.h'
32+
]
33+
34+
}
35+

main.nf

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,29 +7,24 @@
77
Website: https://nf-co.re/seqinspector
88
Slack : https://nfcore.slack.com/channels/seqinspector
99
----------------------------------------------------------------------------------------
10-
*/
1110
1211
/*
1312
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
14-
IMPORT FUNCTIONS / MODULES / SUBWORKFLOWS / WORKFLOWS
13+
GENOME PARAMETER VALUES
1514
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1615
*/
1716

18-
include { SEQINSPECTOR } from './workflows/seqinspector'
19-
include { PIPELINE_INITIALISATION } from './subworkflows/local/utils_nfcore_seqinspector_pipeline'
20-
include { PIPELINE_COMPLETION } from './subworkflows/local/utils_nfcore_seqinspector_pipeline'
21-
include { getGenomeAttribute } from './subworkflows/local/utils_nfcore_seqinspector_pipeline'
17+
params.fasta = getGenomeAttribute('fasta')
2218

2319
/*
2420
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
25-
GENOME PARAMETER VALUES
21+
IMPORT FUNCTIONS / MODULES / SUBWORKFLOWS / WORKFLOWS
2622
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2723
*/
2824

29-
// TODO nf-core: Remove this line if you don't need a FASTA file
30-
// This is an example of how to use getGenomeAttribute() to fetch parameters
31-
// from igenomes.config using `--genome`
32-
// params.fasta = getGenomeAttribute('fasta')
25+
include { SEQINSPECTOR } from './workflows/seqinspector'
26+
include { PIPELINE_INITIALISATION } from './subworkflows/local/utils_nfcore_seqinspector_pipeline'
27+
include { PIPELINE_COMPLETION } from './subworkflows/local/utils_nfcore_seqinspector_pipeline'
3328

3429
/*
3530
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -50,6 +45,7 @@ workflow NFCORE_SEQINSPECTOR {
5045
//
5146
// WORKFLOW: Run pipeline
5247
//
48+
5349
SEQINSPECTOR (
5450
samplesheet
5551
)
@@ -67,9 +63,12 @@ workflow NFCORE_SEQINSPECTOR {
6763
workflow {
6864

6965
main:
66+
67+
7068
//
7169
// SUBWORKFLOW: Run initialisation tasks
7270
//
71+
7372
PIPELINE_INITIALISATION (
7473
params.version,
7574
params.validate_params,
@@ -83,7 +82,7 @@ workflow {
8382
// WORKFLOW: Run main workflow
8483
//
8584
NFCORE_SEQINSPECTOR (
86-
PIPELINE_INITIALISATION.out.samplesheet
85+
PIPELINE_INITIALISATION.out.samplesheet,
8786
)
8887
//
8988
// SUBWORKFLOW: Run completion tasks
@@ -99,6 +98,25 @@ workflow {
9998
)
10099
}
101100

101+
/*
102+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
103+
FUNCTIONS
104+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
105+
*/
106+
107+
//
108+
// Get attribute from genome config file e.g. fasta
109+
//
110+
111+
def getGenomeAttribute(attribute) {
112+
if (params.genomes && params.genome && params.genomes.containsKey(params.genome)) {
113+
if (params.genomes[params.genome].containsKey(attribute)) {
114+
return params.genomes[params.genome][attribute]
115+
}
116+
}
117+
return null
118+
}
119+
102120
/*
103121
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
104122
THE END

modules.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,17 @@
1010
"git_sha": "666652151335353eef2fcd58880bcef5bc2928e1",
1111
"installed_by": ["modules"]
1212
},
13+
"bwamem2/index": {
14+
"branch": "master",
15+
"git_sha": "b2902040b9cb9b7b32b62400f1c024a709bd4812",
16+
"installed_by": ["modules"]
17+
},
18+
"bwamem2/mem": {
19+
"branch": "master",
20+
"git_sha": "41dfa3f7c0ffabb96a6a813fe321c6d1cc5b6e46",
21+
"installed_by": ["modules"],
22+
"patch": "modules/nf-core/bwamem2/mem/bwamem2-mem.diff"
23+
},
1324
"fastqc": {
1425
"branch": "master",
1526
"git_sha": "08108058ea36a63f141c25c4e75f9f872a5b2296",

modules/nf-core/bwamem2/index/environment.yml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/bwamem2/index/main.nf

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/bwamem2/index/meta.yml

Lines changed: 52 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/bwamem2/index/tests/main.nf.test

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)