Be smarter if the beagle output is set such that getParent() returns null. Up the memory limit.
git-svn-id: file:///humgen/gsa-scr1/gsa-engineering/svn_contents/trunk@4389 348d0f76-0448-11de-a6fe-93d51630548a
This commit is contained in:
parent
0142047da9
commit
f34b4c6b82
|
|
@ -36,11 +36,16 @@ class BeagleGenotypeRefinement extends QScript {
|
||||||
@Output(doc="The beagle phased file") var beaglePhasedFile: File = _
|
@Output(doc="The beagle phased file") var beaglePhasedFile: File = _
|
||||||
@Output(doc="The beagle likelihood file") var beagleLikelihoods: File = _
|
@Output(doc="The beagle likelihood file") var beagleLikelihoods: File = _
|
||||||
@Output(doc="The beagle r2 file") var beagleRSquared: File = _
|
@Output(doc="The beagle r2 file") var beagleRSquared: File = _
|
||||||
|
var beagleOutputDir: String = _
|
||||||
|
|
||||||
def freezeOutputs = {
|
def freezeOutputs = {
|
||||||
val beagleOutputDir = beagleInput.getParent
|
if ( beagleInput.getParent == null ) {
|
||||||
beaglePhasedFile = new File(beagleOutputDir+beagleOutputBase+"."+beagleInput.getName+".phased")
|
beagleOutputDir = ""
|
||||||
beagleLikelihoods = new File(beagleOutputDir+beagleOutputBase+"."+beagleInput.getName+".gprobs")
|
} else {
|
||||||
|
beagleOutputDir = beagleInput.getParent
|
||||||
|
}
|
||||||
|
beaglePhasedFile = new File(beagleOutputDir+beagleOutputBase+"."+beagleInput.getName+".phased.gz")
|
||||||
|
beagleLikelihoods = new File(beagleOutputDir+beagleOutputBase+"."+beagleInput.getName+".gprobs.gz")
|
||||||
beagleRSquared = new File(beagleOutputDir+beagleOutputBase+"."+beagleInput.getName+".r2")
|
beagleRSquared = new File(beagleOutputDir+beagleOutputBase+"."+beagleInput.getName+".r2")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -57,8 +62,8 @@ class BeagleGenotypeRefinement extends QScript {
|
||||||
var refine = new BeagleRefinement
|
var refine = new BeagleRefinement
|
||||||
refine.beagleInput = beagleInput.out
|
refine.beagleInput = beagleInput.out
|
||||||
refine.beagleOutputBase = beagleBase
|
refine.beagleOutputBase = beagleBase
|
||||||
refine.beagleMemoryGigs = 4
|
refine.beagleMemoryGigs = 6
|
||||||
refine.memoryLimit = Some(4)
|
refine.memoryLimit = Some(6)
|
||||||
refine.freezeOutputs
|
refine.freezeOutputs
|
||||||
|
|
||||||
var vcfConvert = new BeagleOutputToVCF with GATKArgs
|
var vcfConvert = new BeagleOutputToVCF with GATKArgs
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue