Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Mirrors
biopet.biopet
Commits
850675bc
Commit
850675bc
authored
Apr 21, 2017
by
Peter van 't Hof
Committed by
GitHub
Apr 21, 2017
Browse files
Merge branch 'develop' into fix-BIOPET-662
parents
ce31186d
42e2ffe3
Changes
1
Hide whitespace changes
Inline
Side-by-side
shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/Shiva.scala
View file @
850675bc
...
...
@@ -105,8 +105,6 @@ class Shiva(val parent: Configurable) extends QScript with MultisampleMappingTra
override
def
keepFinalBamfile
:
Boolean
=
super
.
keepFinalBamfile
&&
!
useIndelRealigner
&&
!
useBaseRecalibration
override
def
bamFile
:
Option
[
Mapping
#
File
]
=
mapping
.
map
(
_
.
mergedBamFile
)
override
def
preProcessBam
:
Option
[
Mapping
#
File
]
=
if
(
useIndelRealigner
&&
usePrintReads
&&
useBaseRecalibration
)
bamFile
.
map
(
swapExt
(
libDir
,
_
,
".bam"
,
".realign.baserecal.bam"
))
else
if
(
useIndelRealigner
)
bamFile
.
map
(
swapExt
(
libDir
,
_
,
".bam"
,
".realign.bam"
))
...
...
@@ -189,7 +187,7 @@ class Shiva(val parent: Configurable) extends QScript with MultisampleMappingTra
Some
(
makeVariantcalling
(
multisample
=
false
,
sample
=
Some
(
sampleId
)))
}
else
None
override
def
keepMergedFiles
:
Boolean
=
config
(
"keep_merged_files"
,
default
=
!
useIndelRealigner
)
override
def
keepMergedFiles
:
Boolean
=
config
(
"keep_merged_files"
,
default
=
!
useIndelRealigner
||
(
libraries
.
size
==
1
)
)
lazy
val
useIndelRealigner
:
Boolean
=
config
(
"use_indel_realigner"
,
default
=
true
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment