Database update

haplomt.py

@@ -57,7 +57,7 @@ def print_all(snpset, bt, do_print=True):
 def print_data(do_print=True):
     rep=''
 
-    rep += 'Based on data from yfull.com on 2021-09-22 (CC-BY) and phylotree.org\n'
+    rep += 'Based on data from yfull.com on 2022-01-14 (CC-BY) and phylotree.org\n'
 
     if do_print:
         print(rep)

haploy.py

@@ -19,6 +19,7 @@ def print_uptree(snpset, ut, do_print=True, b3x='b37'):
         txt=''
         if 'txt' in mut:
             txt=mut['txt']
+        #txt+="%s %s"%(mut[b3x], mut['t'])
         otherg=mut['isog']
         if mut['ftg'] != '?':
             if mut['isog']:
@@ -799,14 +800,20 @@ def show_db2():
 blacklist_yb='M3745'
 blacklist_yf='Z8834 Z7451 YP1757 YP2129 YP1822 YP1795 YP2228 YP1809 YP2229 YP1948 YP2226 YP1827 L508'
 blacklist_yf+=' Y125394 Y125393 Y125392 Y125391 Y125390 Y125389 Y125396 Y125397 Y125408 [report-spacer] V1896 PAGE65.1 Y2363 PF3515 PF3512 PF3507 PF3596 Z6023 M547 A3073 Z1716 PF5827 PF1534 PF6011 PF2634 PF2635'
-blacklist_yf+=' V6081 FGC27455 V6946 BY55001' #Not defining for A0-T
+
+blacklist_yf+=' YP3755 FGC26799 FGC25766 FGC25761 FGC27299 FGC25769 FGC27434 FGC27818 L1114 FGC25649 FGC26816 A3281 ALK431 A2953 YP3792 \
+ FGC25649 FGC26816 A3281 FGC27688 FGC25512 FGC27324 L1113    Y49138   FGC25634 M4507    FGC27864 FGC25716 YP3773 FGC26539\
+ FGC25472 FGC26328 FGC27725 AF4      FGC27435 FGC25546 FGC26921 FGC24700 FGC25917 YP3766 YP3771 FGC25743 FGC26773 V2271\
+ FGC25748 YP3754 V3872    FGC26706 FGC25651 Y17329 FGC27857 FGC25782 FGC26895 V1957 FGC24743 A2969 FGC26812 FGC26409 FGC24722 \
+ FGC24780 V2040 FGC25635 FGC25742 FGC27823 YP3459 FGC27321 Y9854    Y17293 YP1838 YP1740 YP2250 YP1807 YP2228 YP1841' #Not defining for A0-T but A00
+blacklist_yf+=' YP2174 FGC25497 FGC25562 YP1808 YP1832 FGC26383 YP2133 FGC26577 A2674 FGC24796 L1132 FGC24795 FGC25408 YP1756 FGC26394\
+ FGC25797 YP2159 FGC27497 YP2251 YP1813 YP1819 YP1820 FGC25816 FGC26267 FGC26688 FGC27081 FGC27116 YP2248 YP2231 YP2182\
+ YP2180 YP2134 YP2152 YP1828 FGC26487 FGC27290 FGC25704 L1143 FGC27473 FGC25677 YP2254 Y125419 CTS12490 M6176 \
+ Y125369 L1129 AF12 Y125404 Y125406 Y125417 L1095 A3073' #Not defining for A00 but A0-T
+
 blacklist_yf+=' Z798' #Not same as M1076/V1836
-blacklist_rootambi='BY229589 Z2533 DFZ77 M11801 FT227770 Y3946 Y125419 FT227767 Y1578 CTS12490 FT227774 YP1740 Y125394 Y125393 Y125392 Y125391 Y125390' #TODO
-blacklist_rootambi+=' L1095 M11759 S6863 Y125417 Y125369 L1129 Y125404 Y125406 YP1807 Y17293 YP1838 YP1841 YP2250 Y125389' #maybe nean->A00
-blacklist_rootambi+=' FT227759 FT227756 FT227755 Y125410 M5667 PF713 M6176 AF12 M11839' #maybe nean->A0-T
 blacklist_unreliable='S782 M8963 Z6132  S27746 Y1477 BY2829'
-blacklist_double='BY185290 Y193157'
-blacklist=blacklist_etc+' '+blacklist_yb+' '+blacklist_yf+' '+blacklist_rootambi+' '+blacklist_unreliable+' '+blacklist_double
+blacklist=blacklist_etc+' '+blacklist_yb+' '+blacklist_yf+' '+blacklist_unreliable
 blacklist=blacklist.split()
 #blacklist=[]
 unreliable_region_b38 = [