Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- [#388](https://github.com/nf-core/sarek/pull/388) - Add cram support + read splitting with `SeqKit` for speedup
- [#394](https://github.com/nf-core/sarek/pull/394) - Add `DeepVariant`
- [#411](https://github.com/nf-core/sarek/pull/411) - cram in csv samplesheet
- [#448](https://github.com/nf-core/sarek/pull/448) - Allow to skip base quality recalibration with `--skip_bqsr`
- [#449](https://github.com/nf-core/sarek/pull/449) - @FriederikeHanssen is now a `CODEOWNERS`
- [#449](https://github.com/nf-core/sarek/pull/449) - [@FriederikeHanssen](https://github.com/FriederikeHanssen) is now a `CODEOWNERS`
- [#460](https://github.com/nf-core/sarek/pull/460) - Add posters
- [#463](https://github.com/nf-core/sarek/pull/463) - Add dark/light logo versions
- [#464](https://github.com/nf-core/sarek/pull/464), [#514](https://github.com/nf-core/sarek/pull/514) - Add `DRAGMAP` as a possible aligner
Expand All @@ -22,12 +23,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#512](https://github.com/nf-core/sarek/pull/512), [#531](https://github.com/nf-core/sarek/pull/531), [#537](https://github.com/nf-core/sarek/pull/537) - Subway map for pipeline
- [#522](https://github.com/nf-core/sarek/pull/522) - Add QC for vcf files & MultiQC
- [#533](https://github.com/nf-core/sarek/pull/533) - Add param `--only_paired_variant_calling` to allow skipping of germline variantcalling for paired samples
- [#538](https://github.com/nf-core/sarek/pull/538) - Add param `--seq_platform`, default: `ILLUMINA`

### Changed

- [#383](https://github.com/nf-core/sarek/pull/383), [#528](https://github.com/nf-core/sarek/pull/528) - Update `CHANGELOG`
- [#390](https://github.com/nf-core/sarek/pull/390) - Update `nextflow_schema.json`
- [#394](https://github.com/nf-core/sarek/pull/394) - Add `DeepVariant`
- [#408](https://github.com/nf-core/sarek/pull/408) - Sync `TEMPLATE` with `tools` `2.0.1`
- [#416](https://github.com/nf-core/sarek/pull/416) - Sync `TEMPLATE` with `tools` `2.1`
- [#417](https://github.com/nf-core/sarek/pull/417) - Merge `dsl2` and `dev` branches
Expand All @@ -40,6 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#466](https://github.com/nf-core/sarek/pull/466), [#485](https://github.com/nf-core/sarek/pull/485), [#492](https://github.com/nf-core/sarek/pull/492), [#494](https://github.com/nf-core/sarek/pull/494), [#515](https://github.com/nf-core/sarek/pull/515) - Improve preprocessing subworkflows
- [#474](https://github.com/nf-core/sarek/pull/474), [#475](https://github.com/nf-core/sarek/pull/475) - Sync `TEMPLATE` with `tools` `2.2`
- [#487](https://github.com/nf-core/sarek/pull/487), [#489](https://github.com/nf-core/sarek/pull/489), [#492](https://github.com/nf-core/sarek/pull/492), [#497](https://github.com/nf-core/sarek/pull/497), [#522](https://github.com/nf-core/sarek/pull/522) - Improve variant calling subworkflows
- [#498](https://github.com/nf-core/sarek/pull/498) - Update docs
- [#501](https://github.com/nf-core/sarek/pull/501) - Sync `TEMPLATE` with `tools` `2.3`
- [#511](https://github.com/nf-core/sarek/pull/511) - Sync `TEMPLATE` with `tools` `2.3.2`
- [#520](https://github.com/nf-core/sarek/pull/520) - Improve annotation subworkflows
Expand Down Expand Up @@ -73,6 +75,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Removed

- [#485](https://github.com/nf-core/sarek/pull/485) - `--skip_qc`, `--skip_markduplicates` and `--skip_bqsr` is now `--skip_tools`
- [#538](https://github.com/nf-core/sarek/pull/538) - `--sequencing_center` is now `--seq_center`
- [#538](https://github.com/nf-core/sarek/pull/538) - `--markdup_java_options` has been removed

## [2.7.1](https://github.com/nf-core/sarek/releases/tag/2.7.1) - Pårtejekna

Expand Down
4 changes: 2 additions & 2 deletions nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ params {

// Preprocessing
aligner = 'bwa-mem' // Default is bwa-mem, bwa-mem2 and dragmap can be used too
markdup_java_options = '"-Xms4000m -Xmx7g"' // Established values for markDuplicates memory consumption, see https://github.com/SciLifeLab/Sarek/pull/689 for details
use_gatk_spark = null // GATK Spark implementation of their tools in local mode not used by default
save_bam_mapped = false // Mapped BAMs not saved
sequencing_center = null // No sequencing center to be written in BAM header by aligner
seq_center = null // No sequencing center to be written in read group CN field by aligner
seq_platform = 'ILLUMINA' // Default platform written in read group PL field by aligner

// Variant Calling
only_paired_variant_calling = false //if true, skips germline variant calling for normal-paired samples
Expand Down
21 changes: 10 additions & 11 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,6 @@
"help_text": "> **WARNING** Current indices for `bwa` in AWS iGenomes are not compatible with `bwa-mem2` and `dragmap`.\n> Use `--bwa=false` to have `Sarek` build them automatically.\n\n> **WARNING** BWA-mem2 is in active development\n> Sarek might not be able to require the right amount of resources for it at the moment\n> We recommend to use pre-built indexes",
"hidden": true
},
"markdup_java_options": {
"type": "string",
"default": "\"-Xms4000m -Xmx7g\"",
"fa_icon": "fas fa-memory",
"description": "Establish values for GATK MarkDuplicates memory consumption",
"help_text": "See [SciLifeLab/Sarek/pull/689](https://github.com/SciLifeLab/Sarek/pull/689)",
"hidden": true
},
"use_gatk_spark": {
"type": "string",
"fa_icon": "fas fa-forward",
Expand Down Expand Up @@ -607,11 +599,18 @@
"hidden": true,
"fa_icon": "fas fa-users-cog"
},
"sequencing_center": {
"seq_center": {
"type": "string",
"fa_icon": "fas fa-university",
"description": "Sequencing center information to be added to read group (CN field).",
"hidden": true
},
"seq_platform": {
"type": "string",
"fa_icon": "fas fa-university",
"description": "Name of sequencing center to be displayed in BAM file",
"help_text": "It will be in the CN field",
"default": "ILLUMINA",
"description": "Sequencing platform information to be added to read group (PL field).",
"help_text": "Default: ILLUMINA. Will be used to create a proper header for further GATK4 downstream analysis",
"hidden": true
}
}
Expand Down
11 changes: 7 additions & 4 deletions workflows/sarek.nf
Original file line number Diff line number Diff line change
Expand Up @@ -842,19 +842,22 @@ def extract_csv(csv_file) {
meta.id = "${row.sample}-${row.lane}".toString()
def fastq_1 = file(row.fastq_1, checkIfExists: true)
def fastq_2 = file(row.fastq_2, checkIfExists: true)
def CN = params.sequencing_center ? "CN:${params.sequencing_center}\\t" : ''
def read_group = "\"@RG\\tID:${row.lane}\\t${CN}PU:${row.lane}\\tSM:${row.sample}\\tLB:${row.sample}\\tPL:ILLUMINA\""
def CN = params.seq_center ? "CN:${params.seq_center}\\t" : ''
def read_group = "\"@RG\\tID:${row.lane}\\t${CN}PU:${row.lane}\\tSM:${row.sample}\\tLB:${row.sample}\\tPL:${params.seq_platform}\""
meta.numLanes = numLanes.toInteger()
meta.read_group = read_group.toString()

println read_group

meta.data_type = "fastq"
meta.size = 1 // default number of splitted fastq
return [meta, [fastq_1, fastq_2]]
// start from BAM
} else if (row.lane && row.bam) {
meta.id = "${row.sample}-${row.lane}".toString()
def bam = file(row.bam, checkIfExists: true)
def CN = params.sequencing_center ? "CN:${params.sequencing_center}\\t" : ''
def read_group = "\"@RG\\tID:${row.lane}\\t${CN}PU:${row.lane}\\tSM:${row.sample}\\tLB:${row.sample}\\tPL:ILLUMINA\""
def CN = params.seq_center ? "CN:${params.seq_center}\\t" : ''
def read_group = "\"@RG\\tID:${row.lane}\\t${CN}PU:${row.lane}\\tSM:${row.sample}\\tLB:${row.sample}\\tPL:${params.seq_platform}\""
meta.numLanes = numLanes.toInteger()
meta.read_group = read_group.toString()
meta.data_type = "bam"
Expand Down