Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix unique lanes for freebayes, groupKey, add new indices, copy meta maps #549

Merged
merged 39 commits into from
May 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
20b9cf1
Publish pileuptables to tumor_vs_normal results dir
FriederikeHanssen May 16, 2022
7476ec1
fix output path
FriederikeHanssen May 16, 2022
f59312f
update modules
FriederikeHanssen May 16, 2022
def2fc7
Add freebayes paired
FriederikeHanssen May 16, 2022
61f5f4b
Update subway map with freebayes & cnvkit
FriederikeHanssen May 16, 2022
7738eeb
Add freebayes paired
FriederikeHanssen May 16, 2022
1fe6a20
Update subway map with freebayes & cnvkit
FriederikeHanssen May 16, 2022
5c33893
Merge remote-tracking branch 'origin/freebayes' into freebayes
FriederikeHanssen May 16, 2022
dc15c76
Publish pileuptables to tumor_vs_normal results dir
FriederikeHanssen May 16, 2022
fbc06a6
fix output path
FriederikeHanssen May 16, 2022
95773f3
Empty channel for optional output
FriederikeHanssen May 16, 2022
a48d95e
Merge remote-tracking branch 'origin/freebayes' into freebayes
FriederikeHanssen May 16, 2022
e097905
Test out readgroupID with sample & add freebayes tests that run through
FriederikeHanssen May 16, 2022
2c380fe
Merge remote-tracking branch 'origin/dev' into freebayes
FriederikeHanssen May 17, 2022
6de25cf
Fix paired test with new lane numbe testing for uniqueness
FriederikeHanssen May 17, 2022
5e07918
add bcftools sort
FriederikeHanssen May 17, 2022
0faa9bf
test with intervals
FriederikeHanssen May 17, 2022
b9a727c
Use new_meta for all groupKeys
FriederikeHanssen May 17, 2022
2861cee
only publish after sorting
FriederikeHanssen May 17, 2022
a424889
Conditional output naming for paired or single
FriederikeHanssen May 17, 2022
eb5b628
add flowcell code
FriederikeHanssen May 18, 2022
33abb06
remove println statements
FriederikeHanssen May 18, 2022
ec4f519
replace clone everywhere, the weird meta error is back
FriederikeHanssen May 19, 2022
8064849
fix some id tags
FriederikeHanssen May 19, 2022
705103c
fix some id tags
FriederikeHanssen May 19, 2022
f9e3eb9
Fix new_meta
FriederikeHanssen May 19, 2022
b2e2db0
Update changelog
FriederikeHanssen May 19, 2022
581f8f8
Update changelog
FriederikeHanssen May 19, 2022
ab99229
Groupkey issue, workflow stalling
FriederikeHanssen May 19, 2022
7bff603
revert groupkey changes, save for new PR
FriederikeHanssen May 19, 2022
3b5a95a
Actually use groupKey
FriederikeHanssen May 20, 2022
bb22bf3
typo
FriederikeHanssen May 20, 2022
6b17c4b
copy meta also for variantcaller to make it work
FriederikeHanssen May 20, 2022
d8c4eac
typo
FriederikeHanssen May 20, 2022
df2fe42
fix meta for manta
FriederikeHanssen May 20, 2022
3874667
typo strelka sw
FriederikeHanssen May 21, 2022
4bc38ea
variantcaller copy for mutect2
FriederikeHanssen May 21, 2022
d832dd2
rename hashtable to dragmap
FriederikeHanssen May 23, 2022
cf11408
add pon default file to igenomoes
FriederikeHanssen May 23, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#513](https://github.com/nf-core/sarek/pull/513), [#527](https://github.com/nf-core/sarek/pull/527) - CNV is back
- [#529](https://github.com/nf-core/sarek/pull/529) - Do not save `versions.yml` files
- [#524](https://github.com/nf-core/sarek/pull/524) - Fix intervals usage by counting the actual list of scatter/gather files produced and not overall number of intervals
- [#549](https://github.com/nf-core/sarek/pull/549) - Fix unique lanes required for Freebayes: issue [#311](https://github.com/nf-core/sarek/issues/311), replaces `meta.clone()` with actual copy of map to avoid issues with https://nfcore.slack.com/archives/C027CM7P08M/p1644241819942339

### Deprecated

Expand Down
4 changes: 3 additions & 1 deletion conf/igenomes.config
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ params {
ac_loci_gc = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/ASCAT/1000G_phase3_GRCh38_maf0.3.loci.gc"
bwa = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Sequence/BWAIndex/"
bwamem2 = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Sequence/BWAmem2Index/"
hashmap = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Sequence/dragmap/"
dragmap = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Sequence/dragmap/"
chr_dir = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Sequence/Chromosomes"
dbsnp = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/GATKBundle/dbsnp_146.hg38.vcf.gz"
dbsnp_tbi = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/GATKBundle/dbsnp_146.hg38.vcf.gz.tbi"
Expand All @@ -51,6 +51,8 @@ params {
known_indels = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/GATKBundle/{Mills_and_1000G_gold_standard.indels.hg38,beta/Homo_sapiens_assembly38.known_indels}.vcf.gz"
known_indels_tbi = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/GATKBundle/{Mills_and_1000G_gold_standard.indels.hg38,beta/Homo_sapiens_assembly38.known_indels}.vcf.gz.tbi"
mappability = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/Control-FREEC/out100m2_hg38.gem"
pon = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/GATKBundle/1000g_pon.hg38.vcf.gz"
pon_tbi = "${params.igenomes_base}/Homo_sapiens/GATK/GRCh38/Annotation/GATKBundle/1000g_pon.hg38.vcf.gz.tbi"
snpeff_db = 'GRCh38.99'
snpeff_genome = 'GRCh38'
vep_cache_version = 104
Expand Down
26 changes: 21 additions & 5 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -475,13 +475,9 @@ process{
// For unknown reasons, CONCAT_VCF sometimes fails with SIGPIPE
// (exit code 141). Rerunning the process will usually work.
errorStrategy = {task.exitStatus == 141 ? 'retry' : 'terminate'}
ext.args = { params.no_intervals ? "-n" : "" }
}
withName : 'TABIX_VC_.*' {
ext.when = { params.no_intervals }
ext.args = { params.no_intervals ? "-n" : "" } //Why ConcatVCF is never run when no_intervals is set..
}
withName : 'BGZIP_VC_.*' {
ext.when = { !params.no_intervals }
publishDir = [
enabled: false
]
Expand Down Expand Up @@ -525,15 +521,23 @@ process{
]
}
withName: 'FREEBAYES' {
ext.prefix = {"${meta.id}.freebayes"} //To make sure no naming conflicts ensue with module BCFTOOLS_SORT & the naming being correct in the output folder
ext.args = '--min-alternate-fraction 0.1 --min-mapping-quality 1'
ext.when = { params.tools && params.tools.contains('freebayes') }
publishDir = [
enabled: false
]
}

withName: 'BCFTOOLS_SORT' {
publishDir = [
mode: params.publish_dir_mode,
path: { "${params.outdir}/variant_calling/${meta.id}/freebayes" },
pattern: "*vcf.gz",
saveAs: { meta.num_intervals > 1 ? null : it }
]
}

withName : 'TABIX_VC_FREEBAYES' {
publishDir = [
mode: params.publish_dir_mode,
Expand Down Expand Up @@ -900,6 +904,18 @@ process{
}
}

//FREEBAYES
withName: 'NFCORE_SAREK:SAREK:PAIR_VARIANT_CALLING:RUN_FREEBAYES_SOMATIC:FREEBAYES' {
ext.args = "--pooled-continuous \
--pooled-discrete \
--genotype-qualities \
--report-genotype-likelihood-max \
--allele-balance-priors-off \
--min-alternate-fraction 0.03 \
--min-repeat-entropy 1 \
--min-alternate-count 2 "
}

//MANTA
withName: 'CONCAT_MANTA_SOMATIC' {
ext.prefix = {"${meta.id}.somatic_sv"}
Expand Down
Binary file modified docs/images/sarek_subway.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading