Skip to content

Commit 4ce3a3b

Browse files
committed
Fix output names
1 parent 6df3321 commit 4ce3a3b

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

meteor/treebuilder.py

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -108,19 +108,15 @@ def execute(self) -> None:
108108
phylogeny_process.execute()
109109
# Analyze tree data
110110
for tree_file in phylogeny_process.tree_files:
111-
# Check for a .raxml.bestTree file
112-
# raxml_tree_file = self.meteor.tree_dir / f"{msp_file.stem}.raxml.bestTree"
113-
# if raxml_tree_file.exists():
114-
# tree_file = raxml_tree_file
115-
# else:
116-
# # If no .raxml.bestTree file exists, check for a .tree file
117-
# tree_file = self.meteor.tree_dir / f"{msp_file.stem}.tree"
118-
img_file = self.meteor.tree_dir / f"{tree_file.stem}.{self.format}"
111+
output = tree_file
112+
if tree_file.suffix == ".bestTree":
113+
output = tree_file.with_suffix("")
114+
img_file = self.meteor.tree_dir / f"{output.stem}.{self.format}"
119115
# try:
120116
msp_tree = Tree(str(tree_file.resolve()))
121117
# Generate a distance msp by msp
122118
matrix = self.get_msp_distance(msp_tree)
123-
matrix.to_csv(self.meteor.tree_dir / f"{tree_file.stem}.tsv", sep="\t")
119+
matrix.to_csv(self.meteor.tree_dir / f"{output.stem}.tsv", sep="\t")
124120
# Draw trees
125121
if not self.format:
126122
pass

0 commit comments

Comments
 (0)