e31cf0a8c121c0d36707912926d4d6f6f80b3708 hiram Fri Jun 3 12:05:39 2022 -0700 now using chromAlias.bb, better mkSymlink progress, no more restriction on dynamicBlat server space and report total track count on verify diff --git src/hg/makeDb/doc/asmHubs/mkGenomes.pl src/hg/makeDb/doc/asmHubs/mkGenomes.pl index 5910646..77a242b 100755 --- src/hg/makeDb/doc/asmHubs/mkGenomes.pl +++ src/hg/makeDb/doc/asmHubs/mkGenomes.pl @@ -67,31 +67,31 @@ foreach my $fh (@fhN) { printf $fh "hub %s genome assembly\n", $accessionId; printf $fh "shortLabel %s\n", $orgName; printf $fh "longLabel %s/%s/%s genome assembly\n", $orgName, $descr, $asmId; printf $fh "useOneFile on\n"; printf $fh "email hclawson\@ucsc.edu\n"; printf $fh "descriptionUrl html/%s.description.html\n", $asmId; printf $fh "\n"; printf $fh "genome %s\n", $accessionId; printf $fh "taxId %s\n", $taxId if (length($taxId) > 1); printf $fh "groups groups.txt\n"; printf $fh "description %s\n", $orgName; printf $fh "twoBitPath %s.2bit\n", $accessionId; printf $fh "twoBitBptUrl %s.2bit.bpt\n", $accessionId; printf $fh "chromSizes %s.chrom.sizes.txt\n", $accessionId; - if ( (0 == 1) && -s "${buildDir}/${asmId}.chromAlias.bb" ) { + if ( -s "${buildDir}/${asmId}.chromAlias.bb" ) { printf $fh "chromAliasBb %s.chromAlias.bb\n", $accessionId; } else { printf $fh "chromAlias %s.chromAlias.txt\n", $accessionId; } printf $fh "organism %s\n", $orgName; printf $fh "defaultPos %s\n", $defPos; printf $fh "scientificName %s\n", $descr; printf $fh "htmlPath html/%s.description.html\n", $asmId; # until blat server host is ready for hgdownload, avoid these lines if ($blatHosts[$fileCount] ne $downloadHost) { printf $fh "blat %s%s %s dynamic $accessionDir/$accessionId\n", $blatHosts[$fileCount], $blatHostDomain, $blatPorts[$fileCount]; printf $fh "transBlat %s%s %s dynamic $accessionDir/$accessionId\n", $blatHosts[$fileCount], $blatHostDomain, $blatPorts[$fileCount]; printf $fh "isPcr %s%s %s dynamic $accessionDir/$accessionId\n", $blatHosts[$fileCount], $blatHostDomain, $blatPorts[$fileCount]; } foreach my $otherDb (sort keys %liftOverGz) { @@ -194,31 +194,31 @@ if (defined($commonName{$asmId})) { $orgName = $commonName{$asmId}; } printf "genome %s\n", $accessionId; printf "taxId %s\n", $taxId if (length($taxId) > 1); printf "trackDb ../%s/%s/trackDb.txt\n", $accessionDir, $accessionId; printf "groups groups.txt\n"; printf "description %s\n", $orgName; printf "twoBitPath ../%s/%s/%s.2bit\n", $accessionDir, $accessionId, $accessionId; printf "twoBitBptUrl ../%s/%s/%s.2bit.bpt\n", $accessionDir, $accessionId, $accessionId; printf "chromSizes ../%s/%s/%s.chrom.sizes.txt\n", $accessionDir, $accessionId, $accessionId; # wait until code gets out for v429 release before using chromAlias.bb # for the chromInfoPage display of hgTracks - if ( (0 == 1) && -s "${buildDir}/${asmId}.chromAlias.bb" ) { + if ( -s "${buildDir}/${asmId}.chromAlias.bb" ) { printf "chromAliasBb ../%s/%s/%s.chromAlias.bb\n", $accessionDir, $accessionId, $accessionId; } else { printf "chromAlias ../%s/%s/%s.chromAlias.txt\n", $accessionDir, $accessionId, $accessionId; } printf "organism %s\n", $orgName; my $chrName=`head -1 $buildDir/$asmId.chrom.sizes | awk '{print \$1}'`; chomp $chrName; my $bigChrom=`head -1 $buildDir/$asmId.chrom.sizes | awk '{print \$NF}'`; chomp $bigChrom; my $oneThird = int($bigChrom/3); my $tenK = $oneThird + 10000; $tenK = $bigChrom if ($tenK > $bigChrom); my $defPos="${chrName}:${oneThird}-${tenK}"; if ( -s "$buildDir/defaultPos.txt" ) { $defPos=`cat "$buildDir/defaultPos.txt"`; @@ -256,31 +256,31 @@ open (HT, ">$localHubTxt") or die "can not write to $localHubTxt"; singleFileHub(\*HT, \*DL, $accessionId, $orgName, $descr, $asmId, $defPos, $taxId, $trackDb, $accessionDir, $buildDir); my $localGenomesFile = "$buildDir/${asmId}.genomes.txt"; open (GF, ">$localGenomesFile") or die "can not write to $localGenomesFile"; printf GF "genome %s\n", $accessionId; printf GF "taxId %s\n", $taxId if (length($taxId) > 1); printf GF "trackDb trackDb.txt\n"; printf GF "groups groups.txt\n"; printf GF "description %s\n", $orgName; printf GF "twoBitPath %s.2bit\n", $accessionId; printf GF "twoBitBptUrl %s.2bit.bpt\n", $accessionId; printf GF "chromSizes %s.chrom.sizes.txt\n", $accessionId; - if ( (0 == 1) && -s "${buildDir}/${asmId}.chromAlias.bb" ) { + if ( -s "${buildDir}/${asmId}.chromAlias.bb" ) { printf GF "chromAliasBb %s.chromAlias.bb\n", $accessionId; } else { printf GF "chromAlias %s.chromAlias.txt\n", $accessionId; } printf GF "organism %s\n", $orgName; printf GF "defaultPos %s\n", $defPos; printf GF "scientificName %s\n", $descr; printf GF "htmlPath html/%s.description.html\n", $asmId; # until blat server host is ready for hgdownload, avoid these lines if ($blatHost ne $downloadHost) { if ( -s "${destDir}/$accessionId.trans.gfidx" ) { printf GF "blat $blatHost$blatHostDomain $blatPort dynamic $accessionDir/$accessionId\n"; printf GF "transBlat $blatHost$blatHostDomain $blatPort dynamic $accessionDir/$accessionId\n"; printf GF "isPcr $blatHost$blatHostDomain $blatPort dynamic $accessionDir/$accessionId\n"; }