Louis BECQUEY

debugged doublon checking in MSAs

...@@ -557,7 +557,6 @@ class Chain: ...@@ -557,7 +557,6 @@ class Chain:
557 ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);""", 557 ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);""",
558 many=True, data=list(df.to_records(index=False)), warn_every=10) 558 many=True, data=list(df.to_records(index=False)), warn_every=10)
559 559
560 -
561 def remap(self, columns_to_save, s_seq): 560 def remap(self, columns_to_save, s_seq):
562 """Maps the object's sequence to its version in a MSA, to compute nucleotide frequencies at every position. 561 """Maps the object's sequence to its version in a MSA, to compute nucleotide frequencies at every position.
563 562
...@@ -2035,10 +2034,10 @@ def work_realign(rfam_acc): ...@@ -2035,10 +2034,10 @@ def work_realign(rfam_acc):
2035 notify("Aligned new sequences together") 2034 notify("Aligned new sequences together")
2036 2035
2037 # Detect doublons and remove them 2036 # Detect doublons and remove them
2038 - existing_stk = AlignIO.parse(existing_ali_path, "stockholm") 2037 + existing_stk = AlignIO.read(existing_ali_path, "stockholm")
2039 existing_ids = [ r.id for r in existing_stk ] 2038 existing_ids = [ r.id for r in existing_stk ]
2040 del existing_stk 2039 del existing_stk
2041 - new_stk = AlignIO.parse(new_ali_path, "stk") 2040 + new_stk = AlignIO.read(new_ali_path, "stk")
2042 new_ids = [ r.id for r in new_stk ] 2041 new_ids = [ r.id for r in new_stk ]
2043 del new_stk 2042 del new_stk
2044 doublons = [ i for i in existing_ids if i in new_ids ] 2043 doublons = [ i for i in existing_ids if i in new_ids ]
......