diff --git a/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/CufflinksMeasurement.scala b/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/CufflinksMeasurement.scala index 229d78e6581a2627337ea6dd87d1378e219cc0e7..95b9df1e4570d07a7c0fcd3fe849898e138d022e 100644 --- a/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/CufflinksMeasurement.scala +++ b/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/CufflinksMeasurement.scala @@ -22,8 +22,8 @@ trait CufflinksMeasurement extends QScript with Measurement { id -> cufflinks } - addMergeTableJob(jobs.values.map(_.outputGenesFpkm).toList, mergeGenesFpkmTable) - addMergeTableJob(jobs.values.map(_.outputIsoformsFpkm).toList, mergeIsoFormFpkmTable) + addMergeTableJob(jobs.values.map(_.outputGenesFpkm).toList, mergeGenesFpkmTable, "genes_fpkm") + addMergeTableJob(jobs.values.map(_.outputIsoformsFpkm).toList, mergeIsoFormFpkmTable, "iso_form") addHeatmapJob(mergeGenesFpkmTable, genesFpkmHeatmap, "genes_fpkm") addHeatmapJob(mergeIsoFormFpkmTable, isoFormFpkmHeatmap, "iso_form_fpkm") diff --git a/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/FragmentsPerGene.scala b/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/FragmentsPerGene.scala index 440dc12460b3edf60fdaffd352053cb36b200804..34664e374f6420325d93b83842f1ce4c44db4d7e 100644 --- a/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/FragmentsPerGene.scala +++ b/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/FragmentsPerGene.scala @@ -28,7 +28,7 @@ class FragmentsPerGene(val root: Configurable) extends QScript with Measurement id -> job } - addMergeTableJob(jobs.values.map(_.output).toList, mergedTable) + addMergeTableJob(jobs.values.map(_.output).toList, mergedTable, "fragments_per_gene") addHeatmapJob(mergedTable, heatmap, "fragments_per_gene") } diff --git a/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/Measurement.scala b/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/Measurement.scala index f09cc09f6cf2fcfefcb55bb8c7296c9324514d2b..8e6a5bbd6e93e89628e92e4dbbbf86ddb9d30afa 100644 --- a/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/Measurement.scala +++ b/public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/measures/Measurement.scala @@ -36,11 +36,15 @@ trait Measurement extends SummaryQScript with Reference { qscript: QScript => require(bamFiles.nonEmpty) } + private var extraSummaryFiles: Map[String, File] = Map() + def addMergeTableJob(countFiles: List[File], outputFile: File, + name: String, args: MergeArgs = mergeArgs): Unit = { add(MergeTables(this, countFiles, outputFile, args.idCols, args.valCol, args.numHeaderLines, args.fallback)) + extraSummaryFiles += s"${name}_table" -> outputFile } def addHeatmapJob(countTable: File, outputFile: File, name: String): Unit = { @@ -49,13 +53,14 @@ trait Measurement extends SummaryQScript with Reference { qscript: QScript => job.output = outputFile job.countType = Some(name) add(job) + extraSummaryFiles += s"${name}_heatmap" -> outputFile } /** Must return a map with used settings for this pipeline */ def summarySettings: Map[String, Any] = Map() /** File to put in the summary for thie pipeline */ - def summaryFiles: Map[String, File] = Map() ++ bamFiles.map { case (id, file) => s"input_bam_$id" -> file } + def summaryFiles: Map[String, File] = extraSummaryFiles ++ bamFiles.map { case (id, file) => s"input_bam_$id" -> file } /** Name of summary output file */ def summaryFile: File = new File(outputDir, s"$name.summary.json")