Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
B
biopet.biopet
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirrors
biopet.biopet
Commits
630092d5
Commit
630092d5
authored
10 years ago
by
Peter van 't Hof
Browse files
Options
Downloads
Patches
Plain Diff
- Fixed scattercounts
parent
307c0b53
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
mapping/src/main/java/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
+7
-7
7 additions, 7 deletions
.../java/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
with
7 additions
and
7 deletions
mapping/src/main/java/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala
+
7
−
7
View file @
630092d5
...
@@ -88,7 +88,7 @@ class Mapping(private var globalConfig: Config) extends QScript {
...
@@ -88,7 +88,7 @@ class Mapping(private var globalConfig: Config) extends QScript {
bamFile
=
addSortSam
(
List
(
bwaCommand
.
output
),
swapExt
(
outputDir
,
bwaCommand
.
output
,
".sam"
,
".bam"
),
outputDir
)
bamFile
=
addSortSam
(
List
(
bwaCommand
.
output
),
swapExt
(
outputDir
,
bwaCommand
.
output
,
".sam"
,
".bam"
),
outputDir
)
}
else
if
(
aligner
==
"star"
)
{
}
else
if
(
aligner
==
"star"
)
{
val
starCommand
=
new
Star
(
config
)
{
R1
=
fastq_R1
;
if
(
paired
)
R2
=
fastq_R2
;
this
.
outputDir
=
qscript
.
outputDir
+
"star/"
;
val
starCommand
=
new
Star
(
config
)
{
R1
=
fastq_R1
;
if
(
paired
)
R2
=
fastq_R2
;
this
.
outputDir
=
qscript
.
outputDir
+
"star/"
;
outputSam
=
new
File
(
this
.
outputDir
+
"/
Aligned.o
ut.sam"
)
}
outputSam
=
new
File
(
this
.
outputDir
+
"/
star_outp
ut.sam"
)
}
add
(
starCommand
)
add
(
starCommand
)
bamFile
=
addAddOrReplaceReadGroups
(
List
(
starCommand
.
outputSam
),
swapExt
(
outputDir
,
starCommand
.
outputSam
,
".sam"
,
".bam"
),
outputDir
)
bamFile
=
addAddOrReplaceReadGroups
(
List
(
starCommand
.
outputSam
),
swapExt
(
outputDir
,
starCommand
.
outputSam
,
".sam"
,
".bam"
),
outputDir
)
}
}
...
@@ -98,12 +98,12 @@ class Mapping(private var globalConfig: Config) extends QScript {
...
@@ -98,12 +98,12 @@ class Mapping(private var globalConfig: Config) extends QScript {
def
addSortSam
(
inputSam
:
List
[
File
],
outputFile
:
File
,
dir
:
String
)
:
File
=
{
def
addSortSam
(
inputSam
:
List
[
File
],
outputFile
:
File
,
dir
:
String
)
:
File
=
{
val
sortSam
=
new
SortSam
{
val
sortSam
=
new
SortSam
{
this
.
input
=
inputSam
input
=
inputSam
this
.
createIndex
=
true
createIndex
=
true
this
.
output
=
outputFile
output
=
outputFile
this
.
memoryLimit
=
2
memoryLimit
=
2
this
.
nCoresRequest
=
2
nCoresRequest
=
2
this
.
jobResourceRequests
:+=
"h_vmem=4G"
jobResourceRequests
:+=
"h_vmem=4G"
}
}
add
(
sortSam
)
add
(
sortSam
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment