From aa04a897b69027a65bb29a56ed73575c84890eb8 Mon Sep 17 00:00:00 2001
From: rlyu <rlyu@svi.edu.au>
Date: Thu, 21 Jan 2021 13:49:51 +1100
Subject: [PATCH] fix conflicts and getBase bug
---
src/sscocaller.nim | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/sscocaller.nim b/src/sscocaller.nim
index 15b35b4..a4f965c 100755
--- a/src/sscocaller.nim
+++ b/src/sscocaller.nim
@@ -13,11 +13,7 @@ import hts
import tables
import sequtils
import math
-<<<<<<< HEAD
-import distributions/rmath
-=======
from distributions/rmath import dbinom
->>>>>>> 7c0fd54896b7218781289237b99b0cd26eec98a3
import streams
#echo paramCount(), " ", paramStr(1)
@@ -237,7 +233,7 @@ proc sscocaller(argv: var seq[string]): int =
if not cons.query:
roff_only += event.len
if off <= position: continue
- over = off - position
+ over = off - position - roff_only
# get the base
base = aln.base_at(qoff - over)
break
--
GitLab