Skip to content

Commit ca30292

Browse files
committed
uses alignment that has invariant sites now
1 parent 497049a commit ca30292

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

docs/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
author = 'Migun Shakya, Chien-Chi Lo, Sanaa Ahmed, Mark Flynn, Patrick S.G Chain'
2525

2626
# The short X.Y version
27-
version = '1.0.2'
27+
version = '1'
2828
# The full version, including alpha/beta/rc tags
2929
release = '1.0.2'
3030

@@ -155,7 +155,7 @@
155155
# dir menu entry, description, category)
156156
texinfo_documents = [
157157
(master_doc, 'PhaME',
158-
author, 'phame', 'One line description of project.',
158+
author, 'PhaME', 'One line description of project.',
159159
'Miscellaneous'),
160160
]
161161

lib/PhaME.pm

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,8 @@ sub buildTree {
602602
if ( $tree == 1 || $tree == 4 ) {
603603
print OUT "Reconstructing phylogeny using FastTree\n";
604604
my $fasttree
605-
= "export OMP_NUM_THREADS=$thread; FastTree -quiet -nt -gtr < $outdir/$name\_snp_alignment.fna > $outdir/$name\.fasttree 2>>$error \n\n";
605+
= "export OMP_NUM_THREADS=$thread; FastTree -quiet -nt -gtr < $outdir/$name\_all_alignment.fna > $outdir/$name\.fasttree 2>>$error \n\n";
606+
# = "export OMP_NUM_THREADS=$thread; FastTree -quiet -nt -gtr < $outdir/$name\_snp_alignment.fna > $outdir/$name\.fasttree 2>>$error \n\n";
606607
print OUT $fasttree;
607608
if ( system($fasttree) ) { die "Error running $fasttree.\n"; }
608609

@@ -611,7 +612,8 @@ sub buildTree {
611612
print OUT "Reconstructing phylogeny using RaxML\n";
612613
print OUT "\n";
613614
my $raxml
614-
= "raxmlHPC-PTHREADS -p 10 -T $thread -m GTRGAMMAI -s $outdir/$name\_snp_alignment.fna -w $outdir -n $name 2>>$error >> $log\n\n";
615+
= "raxmlHPC-PTHREADS -p 10 -T $thread -m GTRGAMMAI -s $outdir/$name\_all_alignment.fna -w $outdir -n $name 2>>$error >> $log\n\n";
616+
# = "raxmlHPC-PTHREADS -p 10 -T $thread -m GTRGAMMAI -s $outdir/$name\_snp_alignment.fna -w $outdir -n $name 2>>$error >> $log\n\n";
615617
print OUT $raxml;
616618
if ( system($raxml) ) { die "Error running $raxml.\n"; }
617619
# dont need a rooted tree, removing it for now
@@ -628,7 +630,7 @@ sub buildTree {
628630
print OUT "Also bootstraping IQ-Trees trees\n";
629631
print OUT "\n";
630632
my $iqtree
631-
= "iqtree -m TEST -s $outdir/$name\_snp_alignment.fna -nt $thread 2>>$error >> $log\n\n";
633+
= "iqtree -m TEST -s $outdir/$name\_all_alignment.fna -nt $thread 2>>$error >> $log\n\n";
632634
print OUT $iqtree;
633635
if ( system($iqtree) ) { die "Error running $iqtree.\n"; }
634636
}
@@ -674,6 +676,15 @@ sub bootstrap {
674676
if ( system($bestTree) ) { die "Error running $bestTree.\n"; }
675677

676678
}
679+
if ( $tree == 3 || $tree == 4 ) {
680+
print OUT "Reconstructing phylogeny using IQ-tree after finding the best model\n";
681+
print OUT "Also bootstraping IQ-Trees trees\n";
682+
print OUT "\n";
683+
my $iqtree
684+
= "iqtree -m TEST -b $bootstrap -s $outdir/$name\_all_alignment.fna -nt $thread 2>>$error >> $log\n\n";
685+
print OUT $iqtree;
686+
if ( system($iqtree) ) { die "Error running $iqtree.\n"; }
687+
}
677688

678689
return "Bootstrap complete";
679690
close OUT;

0 commit comments

Comments
 (0)