diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala index 4526c2143662bcbc650753cd8d171c81fdd37e63..37589c5d2b32caf210cec84204bb81e1f2fbd030 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala @@ -44,7 +44,7 @@ class IGVToolsCount(val root: Configurable) extends IGVTools { var pairs: Boolean = config("pairs", default = false) - override val defaultVmem = "4G" + override val defaultVmem = "6G" override def beforeGraph { super.beforeGraph diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala index 838590f876ba640e6fe8fe5732dbc808abddfd97..6c572f2292bf3813b254d36370f759cb3e225b84 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/macs2/Macs2CallPeak.scala @@ -81,7 +81,7 @@ class Macs2CallPeak(val root: Configurable) extends Macs2 { conditional(verbose, "--verbose") + /* Whether to output verbosely */ optional("--tsize", tsize) + /* Sets custom tag length, if not specified macs will use first 10 sequences to estimate the size */ optional("--bw", bandwith) + /* The bandwith to use for model building. Set this parameter as the sonication fragment size estimated in the wetlab */ - optional("'--mfold'", repeat(mfold), escape = false) + /* The parameter to select regions within the model fold. Must be a upper and lower limit. */ + (if (mfold.isEmpty) "" else optional("'--mfold'", repeat(mfold), escape = false)) + /* The parameter to select regions within the model fold. Must be a upper and lower limit. */ conditional(fixbimodel, "--fix-bimodal") + /* Whether turn on the auto paired-peak model process. If it's set, when MACS failed to build paired model, it will use the nomodel settings, the '--extsize' parameter to extend each tags. If set, MACS will be terminated if paried-peak model is failed. */ conditional(nomodel, "--nomodel") + /* While on, MACS will bypass building the shifting model */ optional("--shift", shift) + /* You can set an arbitrary shift in basepairs here */ diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/Seqstat.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/Seqstat.scala index 4f0cf3448e3da2b4c9cb82b2aca4b5ff7cdb6aaa..4e1d50fbcd96b45aa067ce845a2dc501eff2e4a7 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/Seqstat.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/Seqstat.scala @@ -38,8 +38,8 @@ class Seqstat(val root: Configurable) extends BiopetJavaCommandLineFunction with @Output(doc = "Output JSON", shortName = "output", required = true) var output: File = null - override val defaultVmem = "4G" - memoryLimit = Option(3.0) + override val defaultVmem = "3G" + memoryLimit = Option(1.0) override def commandLine = super.commandLine + required("-i", input) + " > " + required(output) diff --git a/public/carp/src/main/scala/nl/lumc/sasc/biopet/pipelines/carp/Carp.scala b/public/carp/src/main/scala/nl/lumc/sasc/biopet/pipelines/carp/Carp.scala index 88b48d8dd1c6e446447b95530b481eab62a7d738..9410fd685dfb28cfce0daa436b8412efd5ba9175 100644 --- a/public/carp/src/main/scala/nl/lumc/sasc/biopet/pipelines/carp/Carp.scala +++ b/public/carp/src/main/scala/nl/lumc/sasc/biopet/pipelines/carp/Carp.scala @@ -110,7 +110,7 @@ class Carp(val root: Configurable) extends QScript with MultiSampleQScript with val macs2 = new Macs2CallPeak(qscript) macs2.treatment = bamFile macs2.name = Some(sampleId) - macs2.outputdir = sampleDir + "macs2/" + sampleId + "/" + macs2.outputdir = sampleDir + File.separator + "macs2" + File.separator + sampleId + File.separator add(macs2) } } @@ -137,7 +137,7 @@ class Carp(val root: Configurable) extends QScript with MultiSampleQScript with macs2.treatment = sample.bamFile macs2.control = samples(controlId).bamFile macs2.name = Some(sampleId + "_VS_" + controlId) - macs2.outputdir = sample.sampleDir + "/" + "macs2/" + macs2.name.get + "/" + macs2.outputdir = sample.sampleDir + File.separator + "macs2" + File.separator + macs2.name.get + File.separator add(macs2) } }