-
Notifications
You must be signed in to change notification settings - Fork 418
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
Dnascope module and subworkflow in Sarek #1193
Merged
Merged
Changes from all commits
Commits
Show all changes
56 commits
Select commit
Hold shift + click to select a range
72bb50b
WIP: Implementing Dnascope module and subworkflow in Sarek.
asp8200 c81aeb5
WIP: Changing sentieon_dnascope_model from string to file-channel
asp8200 4dcdc9c
align
asp8200 cec591b
Changing Sarek-option sentieon_dnascope_pcr_based to sentieon_dnascop…
asp8200 b2fbd53
Adding meta to some input-channels for Dnascope module
asp8200 c12ce59
Updated dnascope
asp8200 47ec913
Adding option dnascope_filter for skip_tools. Will be removed later #…
asp8200 79bf941
Add variant-filter for DNASCOPE
asp8200 5aa33fb
Trying to order stuff alphabetically
asp8200 d8a06bd
calling BAM_JOINT_CALLING_GERMLINE_SENTIEON for joint-germline varian…
asp8200 56f65d6
Skipping Sentieon VarCal and ApplyVarCal for joint-germline variant-c…
asp8200 7da3dec
Merge branch 'dev' into sentieon_dnascope
asp8200 01562e7
Adding sentieon Dnascope to some error msgs and warnings
asp8200 f30048d
resolving conflicts from merging dev
asp8200 0f4080c
params.joint_germline was unintentionally out-commented
asp8200 cc72786
Continued implementing Sentieon Dnascope
asp8200 5cf6520
Fixing name of pytest. Replacing problematic ampersand character
asp8200 ccdf4e5
Bug fix: Sent tbi to vcf-channel and vcf to tbi-channel
asp8200 d74ec55
Adding a bit of error-handling for sentieon-based joint-germline vari…
asp8200 a367e37
Separate configs for sentieon_dnascope_joint_germline and sentieon_ha…
asp8200 f55c22e
Adding tests for dnascope (excel joint-germline)
asp8200 a10ad13
Adding meta tags patient and variantcaller to channels genotype_vcf a…
asp8200 6c78764
joint germline with dnascope
asp8200 c48f68c
test_sentieon_joint_germline.yml -> test_sentieon_haplotyper_joint_ge…
asp8200 af59cd3
Adding test for joint-germline with dnascope
asp8200 d0bb50d
test_sentieon_joint_germline.yml -> test_sentieon_haplotyper_joint_g…
asp8200 a063f3f
initializing output channel gvcf_sentieon_dnascope
asp8200 2902b5b
secrets not secret
asp8200 8d13939
include configs in alphabetical order
asp8200 c2cd588
Adding tag for sentieon/dnascope (excl joint-germline)
asp8200 de09b05
update tags
asp8200 704fd80
Adding tag sentieon_dnascope_joint_germline
asp8200 e46f6d9
TABIX_KNOWN_INDELS and TABIX_KNOWN_SNPS is probably not needed in the…
asp8200 57011af
Resolve conflicts
asp8200 1e424a6
Re-installing config for TABIX_KNOWN_INDELS for dnascope
asp8200 2738c8d
Briefly mentioning DnaScope
asp8200 0479416
Publishing from SENTIEON_DNAMODELAPPLY
asp8200 ba06cac
Replacing VCF_VARIANT_FILTERING_GATK with SENTIEON_DNAMODELAPPLY in D…
asp8200 89591c7
New sentieon module dnamodelapply
asp8200 1f51e30
Adding tests of dnascope skipping DnaModelApply
asp8200 801b8eb
Adding sentieon_dnascope_skip_filter
asp8200 9ccad29
Just triggering tests
asp8200 a26cb2d
Merge branch 'dev' into sentieon_dnascope
asp8200 eba764c
Adding profile software_license and option sentieon_extension to pyte…
asp8200 ef3997d
Fixing prefix for SENTIEON_DNAMODELAPPLY
asp8200 a4d7dd2
Updating md5sums
asp8200 a7436c5
Removing comment
asp8200 235d784
Updating changelog with PR for Sentieon DnaScope
asp8200 5cb89c1
Adding test of Sentieon VQSR not running for Sentieon DnaScope
asp8200 45e961a
prettier
asp8200 c1c7c6e
Adding info concerning DNAscope. Also other minor improvements to the…
asp8200 cfeb762
Removing redundant test
asp8200 9579af4
Resolving merge conflict and renaming some sentieon subsections
asp8200 31fc80a
Trying to sort out section and subsection for Sentieon/haplotyper and…
asp8200 46f0788
Merge branch 'dev' into sentieon_dnascope
asp8200 d6f610c
Moving PR1193 to dev-section since the PR was not merged for Sarek 3.3.2
asp8200 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
Config file for defining DSL2 per module options and publishing paths | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
Available keys to override module options: | ||
ext.args = Additional arguments appended to command in module. | ||
ext.args2 = Second set of arguments appended to command in module (multi-tool modules). | ||
ext.args3 = Third set of arguments appended to command in module (multi-tool modules). | ||
ext.prefix = File name prefix for output files. | ||
ext.when = When to run the module. | ||
---------------------------------------------------------------------------------------- | ||
*/ | ||
|
||
// SENTIEON DNASCOPE | ||
|
||
process { | ||
|
||
withName: 'SENTIEON_DNASCOPE' { | ||
ext.prefix = { meta.num_intervals <= 1 ? "${meta.id}.dnascope" : "${meta.id}.dnascope.${intervals.simpleName}" } | ||
ext.when = { params.tools && params.tools.split(',').contains('sentieon_dnascope') } | ||
publishDir = [ | ||
mode: params.publish_dir_mode, | ||
path: { "${params.outdir}/variant_calling/"}, | ||
pattern: "*{vcf.gz,vcf.gz.tbi}", | ||
saveAs: { meta.num_intervals > 1 ? null : "sentieon_dnascope/${meta.id}/${it}" } | ||
] | ||
} | ||
|
||
withName: 'MERGE_SENTIEON_DNASCOPE_VCFS' { | ||
ext.prefix = { params.joint_germline ? "${meta.id}.dnascope.g" : "${meta.id}.dnascope.unfiltered" } | ||
publishDir = [ | ||
mode: params.publish_dir_mode, | ||
path: { "${params.outdir}/variant_calling/sentieon_dnascope/${meta.id}/" }, | ||
saveAs: { filename -> filename.equals('versions.yml') ? null : filename } | ||
] | ||
} | ||
|
||
withName: 'MERGE_SENTIEON_DNASCOPE_GVCFS' { | ||
ext.prefix = { "${meta.id}.dnascope.g" } | ||
publishDir = [ | ||
mode: params.publish_dir_mode, | ||
path: { "${params.outdir}/variant_calling/sentieon_dnascope/${meta.id}/" }, | ||
saveAs: { filename -> filename.equals('versions.yml') ? null : filename } | ||
] | ||
} | ||
|
||
if (params.tools && params.tools.contains('sentieon_dnascope')) { | ||
withName: '.*FILTERVARIANTTRANCHES' { | ||
ext.prefix = {"${meta.id}.dnascope"} | ||
ext.args = { "--info-key CNN_1D" } | ||
publishDir = [ | ||
mode: params.publish_dir_mode, | ||
path: { "${params.outdir}/variant_calling/sentieon_dnascope/${meta.id}/"}, | ||
pattern: "*{vcf.gz,vcf.gz.tbi}" | ||
] | ||
} | ||
} | ||
|
||
withName: 'SENTIEON_DNAMODELAPPLY' { | ||
ext.prefix = {"${meta.id}.dnascope.filtered"} | ||
publishDir = [ | ||
mode: params.publish_dir_mode, | ||
path: { "${params.outdir}/variant_calling/sentieon_dnascope/${meta.id}/"}, | ||
pattern: "*{vcf.gz,vcf.gz.tbi}" | ||
] | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
Config file for defining DSL2 per module options and publishing paths | ||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
Available keys to override module options: | ||
ext.args = Additional arguments appended to command in module. | ||
ext.args2 = Second set of arguments appended to command in module (multi-tool modules). | ||
ext.args3 = Third set of arguments appended to command in module (multi-tool modules). | ||
ext.prefix = File name prefix for output files. | ||
ext.when = When to run the module. | ||
---------------------------------------------------------------------------------------- | ||
*/ | ||
|
||
// SENTIEON DNASCOPE JOINT_GERMLINE | ||
|
||
process { | ||
|
||
// TO-DO: duplicate!! | ||
withName: 'SENTIEON_GVCFTYPER' { | ||
ext.args = { "--allow-old-rms-mapping-quality-annotation-data" } | ||
ext.prefix = { meta.intervals_name } | ||
publishDir = [ | ||
enabled: false | ||
] | ||
} | ||
|
||
if (params.tools && params.tools.contains('sentieon_dnascope') && params.joint_germline) { | ||
withName: 'NFCORE_SAREK:SAREK:BAM_VARIANT_CALLING_GERMLINE_ALL:BAM_JOINT_CALLING_GERMLINE_SENTIEON:BCFTOOLS_SORT' { | ||
ext.prefix = { vcf.baseName - ".vcf" + ".sort" } | ||
publishDir = [ | ||
enabled: false | ||
] | ||
} | ||
|
||
withName: 'NFCORE_SAREK:SAREK:BAM_VARIANT_CALLING_GERMLINE_ALL:BAM_JOINT_CALLING_GERMLINE_SENTIEON:MERGE_GENOTYPEGVCFS' { | ||
ext.prefix = "joint_germline" | ||
publishDir = [ | ||
mode: params.publish_dir_mode, | ||
path: { "${params.outdir}/variant_calling/sentieon_dnascope/joint_variant_calling/" }, | ||
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }, | ||
pattern: "*{vcf.gz,vcf.gz.tbi}" | ||
] | ||
} | ||
} | ||
} |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do we need an issue for this todo?