Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
d579bb2749 | |||
10e5ebdbc0 | |||
8833110490 |
@ -394,7 +394,7 @@ cdef tuple annotate(sequences, infos, no_tags, verbose=False):
|
||||
seq_to_match = sequences[0]
|
||||
reversematch = []
|
||||
# Compute begin
|
||||
begin=directmatch[1][2]+1 # end of match + 1 on the same sequence
|
||||
#begin=directmatch[1][2]+1 # end of match + 1 on the same sequence -- No, already cut out forward primer
|
||||
# Try reverse matching on the other sequence:
|
||||
new_seq = True
|
||||
pattern = 0
|
||||
@ -408,7 +408,7 @@ cdef tuple annotate(sequences, infos, no_tags, verbose=False):
|
||||
primer=p
|
||||
# Saving original primer as 4th member of the tuple to serve as correct key in infos dict even if it might have been reversed complemented
|
||||
# (3rd member already used by directmatch)
|
||||
reversematch.append((primer, primer(seq_to_match, same_sequence=not new_seq, pattern=pattern, begin=begin), None, p))
|
||||
reversematch.append((primer, primer(seq_to_match, same_sequence=not new_seq, pattern=pattern, begin=0), None, p))
|
||||
new_seq = False
|
||||
pattern+=1
|
||||
# Choose match closer to the end of the sequence
|
||||
|
@ -8,7 +8,7 @@ Created on feb 20th 2018
|
||||
|
||||
import types
|
||||
from obitools3.utils cimport __etag__
|
||||
|
||||
from obitools3.utils cimport str2bytes
|
||||
|
||||
def tabIterator(lineiterator,
|
||||
bint header = False,
|
||||
@ -75,7 +75,7 @@ def tabIterator(lineiterator,
|
||||
continue
|
||||
else:
|
||||
# TODO ??? default column names? like R?
|
||||
keys = [i for i in range(len(line.split(sep)))]
|
||||
keys = [str2bytes(str(i)) for i in range(len(line.split(sep)))]
|
||||
|
||||
while skipped < skip :
|
||||
line = next(iterator)
|
||||
|
@ -1,5 +1,5 @@
|
||||
major = 3
|
||||
minor = 0
|
||||
serial= '1b3'
|
||||
serial= '1b4'
|
||||
|
||||
version ="%d.%d.%s" % (major,minor,serial)
|
||||
|
Reference in New Issue
Block a user