diff --git a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Snptest.scala b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Snptest.scala index 24ff7f029d4b21f9905181f79ed5e028549cfee4..9d43e04e7da55e0a10f2d6032bba083d01a9424f 100644 --- a/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Snptest.scala +++ b/public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/Snptest.scala @@ -2,15 +2,15 @@ package nl.lumc.sasc.biopet.extensions import java.io.File -import nl.lumc.sasc.biopet.core.{Version, Reference, BiopetCommandLineFunction} +import nl.lumc.sasc.biopet.core.{ Version, Reference, BiopetCommandLineFunction } import nl.lumc.sasc.biopet.utils.config.Configurable -import org.broadinstitute.gatk.utils.commandline.{Output, Input} +import org.broadinstitute.gatk.utils.commandline.{ Output, Input } import scala.util.matching.Regex /** - * Created by pjvan_thof on 3/25/16. - */ + * Created by pjvan_thof on 3/25/16. + */ class Snptest(val root: Configurable) extends BiopetCommandLineFunction with Reference with Version { @Input(required = true) var inputGenotypes: List[File] = Nil diff --git a/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala b/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala index b18c3f6e2f5598c5f8ec0744718f1d5b52379960..ea8bc0b228a4fd653c16301d518ae9c1bfef652d 100644 --- a/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala +++ b/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/GwasTest.scala @@ -5,7 +5,7 @@ import java.util import htsjdk.samtools.reference.FastaSequenceFile import nl.lumc.sasc.biopet.core.{ PipelineCommand, Reference, BiopetQScript } -import nl.lumc.sasc.biopet.extensions.{Snptest, Cat} +import nl.lumc.sasc.biopet.extensions.{ Snptest, Cat } import nl.lumc.sasc.biopet.extensions.gatk.{ SelectVariants, CombineVariants } import nl.lumc.sasc.biopet.extensions.tools.GensToVcf import nl.lumc.sasc.biopet.utils.Logging @@ -104,6 +104,7 @@ class GwasTest(val root: Configurable) extends QScript with BiopetQScript with R val snptest = new Snptest(this) snptest.inputGenotypes :+= sv.outputFile snptest.inputSampleFiles :+= phenotypeFile + snptest.outputFile = Some(new File(regionDir, s"${region.chr}-${region.start + 1}-${region.end}.snptest")) add(snptest) region -> snptest } diff --git a/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/impute/ImputeOutput.scala b/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/impute/ImputeOutput.scala index 5beda972dc01c00ea538e21a7d85f5312a71c39f..41574f0cd0aaf2dd0501ab98d5273148f968dd90 100644 --- a/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/impute/ImputeOutput.scala +++ b/public/gwas-test/src/main/scala/nl/lumc/sasc/biopet/pipelines/gwastest/impute/ImputeOutput.scala @@ -58,21 +58,17 @@ object ImputeOutput { else if (summaryLines.contains(NO_TYPE_2)) { Logging.logger.warn(s"No Type 2 SNPs found, skipping this chunk: '${chunk.summary}'") None - } - else if (summaryLines.exists(ASSESSMENT_HEADER.findFirstIn(_).isDefined)) None + } else if (summaryLines.exists(ASSESSMENT_HEADER.findFirstIn(_).isDefined)) None else if (!chunk.gens.exists()) { addError(s"Gens file '${chunk.gens}' does not exist, please check Impute output") None - } - else if (!chunk.gensInfo.exists()) { + } else if (!chunk.gensInfo.exists()) { addError(s"GensInfo file '${chunk.gensInfo}' does not exist, please check Impute output") None - } - else if (!chunk.gensInfoBySample.exists()) { + } else if (!chunk.gensInfoBySample.exists()) { addError(s"GensInfoBySample file '${chunk.gensInfoBySample}' does not exist, please check Impute output") None - } - else { + } else { if (!summaryLines.contains(CORRECT_LOG)) { Logging.logger.warn(s"Impute says it did not run but the gens files are there, pipeline will still continue") Logging.logger.warn(s" Please check: ${chunk.summary}")