diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/AnnotateVcfWithBed.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/AnnotateVcfWithBed.scala index 2646ea9611df2a8d9f65c91b1a5131015ae4fd6a..6136c146b91e45fa8ddb85e49d2ad94c903a6033 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/AnnotateVcfWithBed.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/AnnotateVcfWithBed.scala @@ -137,7 +137,7 @@ object AnnotateVcfWithBed extends ToolCommand { logger.info("Start reading vcf records") for (record <- reader) { - val overlaps = bedRecords.getOrElse(record.getChr, Nil).filter(x => { + val overlaps = bedRecords.getOrElse(record.getContig, Nil).filter(x => { record.getStart <= x._2 && record.getEnd >= x._1 }) if (overlaps.isEmpty) { diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/CheckAllelesVcfInBam.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/CheckAllelesVcfInBam.scala index ba148881c99fbfe35d858167dadbec3efc9f8c15..2797ffc2de25d6045f7717947149cd3900437ced 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/CheckAllelesVcfInBam.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/CheckAllelesVcfInBam.scala @@ -97,7 +97,7 @@ object CheckAllelesVcfInBam extends ToolCommand { val countReports: Map[String, CountReport] = bamReaders.map(x => (x._1, new CountReport)) val refAllele = vcfRecord.getReference.getBaseString for ((sample, bamReader) <- bamReaders) { - val queryInterval = new QueryInterval(bamHeaders(sample).getSequenceIndex(vcfRecord.getChr), + val queryInterval = new QueryInterval(bamHeaders(sample).getSequenceIndex(vcfRecord.getContig), vcfRecord.getStart, vcfRecord.getStart + refAllele.length - 1) val bamIter = bamReader.query(Array(queryInterval), false) diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala index 892ce397dc1c5cfd05f667bd7cc0a9f6315d2b86..8a5b05f6e00575090f687436b7bd348ba34cb6a2 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/MergeAlleles.scala @@ -131,7 +131,7 @@ object MergeAlleles extends ToolCommand { } val alleles: mutable.Set[Allele] = mutable.Set() val builder = new VariantContextBuilder - builder.chr(records.head.getChr) + builder.chr(records.head.getContig) builder.start(records.head.getStart) for (record <- records) { diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfStats.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfStats.scala index d34e8cf9d99c7524c007799c67c04471ae0042f6..47af91bf3dd14014e67b0082b399f5ca8f24f8b5 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfStats.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfStats.scala @@ -542,7 +542,7 @@ object VcfStats extends ToolCommand { else addToBuffer(tag, value, found = true) } - Map(record.getChr -> buffer.toMap, "total" -> buffer.toMap) + Map(record.getContig -> buffer.toMap, "total" -> buffer.toMap) } /** Function to check sample/genotype specific stats */ @@ -593,7 +593,7 @@ object VcfStats extends ToolCommand { else addToBuffer(tag, value, found = true) } - Map(record.getChr -> buffer.toMap, "total" -> buffer.toMap) + Map(record.getContig -> buffer.toMap, "total" -> buffer.toMap) } /** Function to write 1 specific genotype field */ diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfToTsv.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfToTsv.scala index ab1f9d8cb2d1845efc3dbe3df52a419283b62e6a..995efcdd2925b8e739646e52a9e6a3e21a90813a 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfToTsv.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfToTsv.scala @@ -109,7 +109,7 @@ object VcfToTsv extends ToolCommand { writer.println(sortedFields.mkString("#", commandArgs.separator, "")) for (vcfRecord <- reader) { val values: mutable.Map[String, Any] = mutable.Map() - values += "CHROM" -> vcfRecord.getChr + values += "CHROM" -> vcfRecord.getContig values += "POS" -> vcfRecord.getStart values += "ID" -> vcfRecord.getID values += "REF" -> vcfRecord.getReference.getBaseString diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfWithVcf.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfWithVcf.scala index 9009d2918574fdba847adcdd5000ac10bd5e6a2f..2415d89a20495f162fc17e599bff18e581e666f6 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfWithVcf.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/VcfWithVcf.scala @@ -103,10 +103,10 @@ object VcfWithVcf extends ToolCommand { var counter = 0 for (record <- reader) { val secondaryRecords = if (commandArgs.matchAllele) { - secondaryReader.query(record.getChr, record.getStart, record.getEnd).toList. + secondaryReader.query(record.getContig, record.getStart, record.getEnd).toList. filter(x => record.getAlternateAlleles.exists(x.hasAlternateAllele)) } else { - secondaryReader.query(record.getChr, record.getStart, record.getEnd).toList + secondaryReader.query(record.getContig, record.getStart, record.getEnd).toList } val fieldMap = (for ( diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/WipeReads.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/WipeReads.scala index f010c1cc743a499fbfed63e3de32e8edeb7ac7de..96a9dc43631e832d95f0bc1f049ca7d5c0396675 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/WipeReads.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/WipeReads.scala @@ -87,7 +87,7 @@ object WipeReads extends ToolCommand { def makeIntervalFromBed(inFile: File): Iterator[Interval] = asScalaIteratorConverter(getFeatureReader(inFile.toPath.toString, new BEDCodec(), false).iterator) .asScala - .map(x => new Interval(x.getChr, x.getStart, x.getEnd)) + .map(x => new Interval(x.getContig, x.getStart, x.getEnd)) /** * Parses a refFlat file to yield Interval objects