src/hg/archaeStuff/scripts/make-browser-2.0 1.40

Index: src/hg/archaeStuff/scripts/make-browser-2.0
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/hg/archaeStuff/scripts/make-browser-2.0,v
retrieving revision 1.39
retrieving revision 1.40
diff -b -B -U 4 -r1.39 -r1.40
--- src/hg/archaeStuff/scripts/make-browser-2.0	19 Apr 2009 08:16:13 -0000	1.39
+++ src/hg/archaeStuff/scripts/make-browser-2.0	28 Apr 2009 10:55:24 -0000	1.40
@@ -66,37 +66,9 @@
                    );
 
 
 # Precomputed track data source files
-our @primer_bed_files = ("5pmap-RTprimers-synth.bed","5pmap-RTprimers-all.bed",
-                         "gold-RTprimers.bed","genomePCR-primers.bed");
-our @primer_bed_names = ("5pMapRTprimersSynth","New5pmapRTprimersAll",
-                         "goldRTprimers","genomePcrPrimers");
-
-
-our @precomp_bed_files = ("insertion-regions.bed","BHBcm.bed","transcripts.bed","ESTs.bed","conservedOperons.bed",
-                          "454SeqT1.bed","454SeqT2.bed", "antisenseTranscripts.bed","tfbsPals.bed","crispr.bed",
-                          "promoter.bed","shineDG.bed","Pbac454stRNA.bed.gz","Pbac454stRNA70.bed.gz",
-			  "Pbac454st3Best.bed.gz","LLT.bed");
-
-our @precomp_bed_names = ("insertionRegions","bulgeHelixBulge","lowelabTranscripts","ESTs","conservedOperons",
-                          "454SeqTrial1","454SeqTrial2", "antisenseTranscripts","tfBindSitePal","CRISPRs",
-                          "lowelabPromoter","lowelabShineDG","Pbac454stRNAi3","Pbac454stRNAi70",
-			  "Pbac454st3Best","LLT");
-
-our %precomp_bed_listing = ("insertionRegions","Genomic Insert Regions",
-			    "conservedOperons","Highly Conserved Operons",
-			    "CRISPRs","CRISPR Regions",
-			    "LLT","LLT 454 Transcripts");
-
-our @precomp_wig_files = ("codonBias.wig.gz","CRPpos.wig.gz","CRPneg.wig.gz");
-our @precomp_wig_names = ("codonBias","CRPpos","CRPneg");
-
-our @precomp_psl_files = ("seqTraces.psl.gz","454_RNAseq_Feb08.psl.gz");
-our @precomp_psl_names = ("seqTraces","454_RNAseq_Feb08");
-
-our @promsd_wig_files = ("promoter-fwd.wig.gz","promoter-rev.wig.gz","shineDG-fwd.wig.gz","shineDG-rev.wig.gz");
-our @promsd_wig_names = ("promoterScanPos","promoterScanNeg","shineDGPos","shineDGNeg");
+our $precomp_track_info = &Read_precomputed_tracks(\%global_vars);
 
 
 # Program option variables
 our ($opt_getseqs, $opt_joinassembly, $opt_initdb, $opt_hidedb, $opt_droptable, $opt_initblat, $opt_gc, $opt_repeats, $opt_iselements,
@@ -205,20 +177,12 @@
     if ($opt_stringdb || $opt_all) { &Load_StringDb_track(\%global_vars);      }
     if ($opt_easy || $opt_all)     { &Load_Easygene_track(\%global_vars);      }
     if ($opt_arkops || $opt_all)   { &Load_ArkinOperons(\%global_vars);        }
     if ($opt_tigrops || $opt_all)  { &Load_TIGR_Operons(\%global_vars);        }
-    if ($opt_primers)              { &Load_precomp_tracks("bed","all",\%precomp_bed_listing,
-							  \@primer_bed_files,\@primer_bed_names, \%global_vars); }
-    if ($opt_promsd || $opt_all)   { &Load_precomp_tracks("wiggle","all",\%precomp_bed_listing,
-							  \@promsd_wig_files,\@promsd_wig_names, \%global_vars);  }
+    if ($opt_primers)              { &Load_precomp_tracks("primer", $precomp_track_info, \%global_vars); }
+    if ($opt_promsd || $opt_all)   { &Load_precomp_tracks("promsd", $precomp_track_info, \%global_vars); }
     if ($opt_precomp ne '' || 
-	$opt_all)                  { &Load_precomp_tracks("wiggle",$opt_precomp,\%precomp_bed_listing,
-							  \@precomp_wig_files,\@precomp_wig_names, \%global_vars);
-                                     &Load_precomp_tracks("bed",$opt_precomp,\%precomp_bed_listing,
-							  \@precomp_bed_files,\@precomp_bed_names, \%global_vars); 
-                                     &Load_precomp_tracks("psl",$opt_precomp,\%precomp_bed_listing,
-							  \@precomp_psl_files,\@precomp_psl_names, \%global_vars); 
-				 }
+        $opt_all)                  { &Load_precomp_tracks($opt_precomp, $precomp_track_info, \%global_vars); }
     if ($opt_selfz || $opt_all)    { &Load_self_blastz_track(\%global_vars);   }
     if ($opt_multiz)               { &Load_multiz_track(\%global_vars, 0);   }
     if ($opt_pubmultiz)            { &Load_multiz_track(\%global_vars, 1);   }
     if ($opt_ultracons || $opt_all){ &Load_ultraConserved_track(\%global_vars);   }