Skip to content
Snippets Groups Projects
Commit fc2af339 authored by Peter van 't Hof's avatar Peter van 't Hof
Browse files

Still executes multisample jobs when all samples are given with --sample flag

parent ad73824f
No related branches found
No related tags found
No related merge requests found
...@@ -87,8 +87,8 @@ trait BiopetQScript extends Configurable with GatkLogging { ...@@ -87,8 +87,8 @@ trait BiopetQScript extends Configurable with GatkLogging {
else Logging.addError("Parent of output dir: '" + outputDir.getParent + "' is not writeable, outputdir can not be created") else Logging.addError("Parent of output dir: '" + outputDir.getParent + "' is not writeable, outputdir can not be created")
this match { this match {
case q: MultiSampleQScript if (q.onlySamples.nonEmpty) => case q: MultiSampleQScript if q.onlySamples.nonEmpty && !q.samples.forall(x => q.onlySamples.contains(x._1)) =>
logger.info("Write summary is skipped because sample flag is used") logger.info("Write report is skipped because sample flag is used")
case _ => reportClass.foreach(add(_)) case _ => reportClass.foreach(add(_))
} }
......
...@@ -131,7 +131,7 @@ trait MultiSampleQScript extends SummaryQScript { ...@@ -131,7 +131,7 @@ trait MultiSampleQScript extends SummaryQScript {
/** Runs addAndTrackJobs method for each sample */ /** Runs addAndTrackJobs method for each sample */
final def addSamplesJobs() { final def addSamplesJobs() {
if (onlySamples.isEmpty) { if (onlySamples.isEmpty || samples.forall(x => onlySamples.contains(x._1))) {
samples.foreach { case (sampleId, sample) => sample.addAndTrackJobs() } samples.foreach { case (sampleId, sample) => sample.addAndTrackJobs() }
addMultiSampleJobs() addMultiSampleJobs()
} else onlySamples.foreach(sampleId => samples.get(sampleId) match { } else onlySamples.foreach(sampleId => samples.get(sampleId) match {
......
...@@ -136,7 +136,7 @@ trait SummaryQScript extends BiopetQScript { ...@@ -136,7 +136,7 @@ trait SummaryQScript extends BiopetQScript {
addChecksum(file) addChecksum(file)
this match { this match {
case q: MultiSampleQScript if (q.onlySamples.nonEmpty) => case q: MultiSampleQScript if q.onlySamples.nonEmpty && !q.samples.forall(x => q.onlySamples.contains(x._1)) =>
logger.info("Write summary is skipped because sample flag is used") logger.info("Write summary is skipped because sample flag is used")
case _ => add(writeSummary) case _ => add(writeSummary)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment