@@ -104,15 +104,12 @@ def __init__(self,h5_oma=None,fileglob = None, taxa=None,masterTree=None, saving
104104 project .build_from_file (masterTree )
105105 trees = [t for t in project .get_phylogeny ()]
106106 self .tree_ete3 = [ n for n in trees [0 ] ][0 ]
107- print ( self .tree_ete3 )
108107 self .use_phyloxml = True
109108 print ('using phyloxml' )
110- print ( self .tree_ete3 )
111109 self .tree_string = masterTree
112110 else :
113111 try :
114112 self .tree_ete3 = ete3 .Tree (masterTree , format = 1 , quoted_node_names = True )
115- print ( self .tree_ete3 )
116113 except :
117114 self .tree_ete3 = ete3 .Tree (masterTree , format = 0 )
118115
@@ -134,7 +131,6 @@ def __init__(self,h5_oma=None,fileglob = None, taxa=None,masterTree=None, saving
134131 n .detach ()
135132 n .up .add_child (child )
136133 print ( 'attaching node' , child .name )
137-
138134 self .tree_ete3 = tree
139135 #save master tree
140136 with open ( self .saving_path + 'master_tree.corrected.nwk' , 'w' ) as treeout :
@@ -143,25 +139,21 @@ def __init__(self,h5_oma=None,fileglob = None, taxa=None,masterTree=None, saving
143139
144140 else :
145141 raise Exception ( 'please specify a tree in either phylo xml or nwk format' )
146-
147-
148-
149142
150143 if self .reformat_names :
151144 self .tree_ete3 , self .idmapper = pyhamutils .tree2numerical (self .tree_ete3 )
152145 with open ( self .saving_path + 'reformatted_tree.nwk' , 'w' ) as treeout :
153146 treeout .write (self .tree_ete3 .write (format = 0 ))
154147 with open ( self .saving_path + 'idmapper.pkl' , 'wb' ) as idout :
155148 idout .write ( pickle .dumps (self .idmapper ))
156- print ('reformatted tree' )
157- print ( self .tree_ete3 )
149+ print ( 'idmapper saved to ' + self .saving_path + 'idmapper.pkl' )
158150 self .tree_string = self .tree_ete3 .write (format = 1 )
159151 #remap taxfilter and taxmask
160152 if taxfilter :
161153 self .tax_filter = [ self .idmapper [tax ] for tax in taxfilter ]
162154 if taxmask :
163155 self .tax_mask = self .idmapper [taxmask ]
164-
156+
165157 self .swap2taxcode = use_taxcodes
166158 self .taxaIndex , self .reverse = files_utils .generate_taxa_index (self .tree_ete3 , self .tax_filter , self .tax_mask )
167159 with open ( self .saving_path + 'taxaIndex.pkl' , 'wb' ) as taxout :
0 commit comments