src/hg/utils/phyloTrees/chainNet.pl 1.5

Index: src/hg/utils/phyloTrees/chainNet.pl
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/utils/phyloTrees/chainNet.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -b -B -U 4 -r1.4 -r1.5
--- src/hg/utils/phyloTrees/chainNet.pl	22 Jan 2010 18:40:22 -0000	1.4
+++ src/hg/utils/phyloTrees/chainNet.pl	1 Apr 2010 17:04:12 -0000	1.5
@@ -10,24 +10,24 @@
 
 # new genomes since the 46-way construction.  This will keep
 #	the priority numbers the same for the previous 46 and place
 #	these new ones in between the previous ones.
-my $newAssemblies = "ailMel susScr";
+my $newAssemblies = "ailMel susScr oviAra";
 my $newAssemblyOffset = 5;
 my $offset46way = 10;
 my $reroot = "$Bin/rerootTree.pl";
 my $hgsql = "hgsql";
 my $home = $ENV{'HOME'};
-my $dissectTree = "$home/kent/src/hg/utils/phyloTrees/48way.dissect.txt";
+my $dissectTree = "$home/kent/src/hg/utils/phyloTrees/49way.dissect.txt";
 
 my $argc = scalar(@ARGV);
 
 if ($argc != 1) {
     printf STDERR "chainNet.pl - output chainNet.ra definitions in phylogenetic order\n";
     printf STDERR "usage:\n    chainNet.pl <db>\n";
     printf STDERR "<db> - an existing UCSC database\n";
     printf STDERR "will be using commands: rerootTree.pl and hgsql\n";
-    printf STDERR "and expecting to find \$HOME/kent/src/hg/utils/phyloTrees/48way.dissect.txt\n";
+    printf STDERR "and expecting to find \$HOME/kent/src/hg/utils/phyloTrees/49way.dissect.txt\n";
     printf STDERR "using:\n";
     printf STDERR "$reroot\n";
     printf STDERR "$dissectTree\n";
     exit 255;
@@ -94,21 +94,23 @@
     $tbl =~ s/Link$//;
     my $track = $tbl;
     my $stripDb = $tbl;
     $stripDb =~ s/[0-9]+$//;
+    $stripDb =~ s/V17e$//;
+    $stripDb =~ s/Poodle$//;
     if (defined($stripDb) && length($stripDb) > 0) {
 	if (exists($priorities{lcfirst($stripDb)})) {
 	    my $priority = $priorities{lcfirst($stripDb)};
 	    $orderChainNet{$track} = $priority;
 	} else {
-	    printf STDERR "warning: not in phylo tree: $tbl\n";
+	    printf STDERR "warning: not in phylo tree: $tbl ($stripDb)\n";
 	}
     }
 }
 close (FH);
 
 # print out the priorities in order by priority, lowest first
-foreach my $track (sort { $orderChainNet{$a} cmp $orderChainNet{$b} }
+foreach my $track (sort { $orderChainNet{$a} <=> $orderChainNet{$b} }
 	keys %orderChainNet) {
     my $priority = $orderChainNet{$track};
     printf "track chainNet%s override\n", $track;
     printf "priority %s\n\n", $priority;