71e09012455a01c07dd7953e16044361a287496a hiram Fri Nov 18 13:59:00 2022 -0800 now indicating chromAuthority ucsc on those browsers that can do that refs #30297 diff --git src/hg/makeDb/doc/asmHubs/mkGenomes.pl src/hg/makeDb/doc/asmHubs/mkGenomes.pl index 26c82f7..966fa59 100755 --- src/hg/makeDb/doc/asmHubs/mkGenomes.pl +++ src/hg/makeDb/doc/asmHubs/mkGenomes.pl @@ -18,32 +18,32 @@ printf STDERR "result will write a local asmId.genomes.txt file for each hub\n"; printf STDERR "and a local asmId.hub.txt file for each hub\n"; printf STDERR "and a local asmId.groups.txt file for each hub\n"; printf STDERR "and the output to stdout will be the overall genomes.txt\n"; printf STDERR "index file for all genomes in the given list\n"; exit 255; } my $downloadHost = "hgwdev"; my @blatHosts = qw( dynablat-01 dynablat-01 ); my @blatPorts = qw( 4040 4040 ); my $blatHostDomain = ".soe.ucsc.edu"; my $groupsTxt = `cat ~/kent/src/hg/makeDb/doc/asmHubs/groups.txt`; ################### writing out hub.txt file, twice ########################## -sub singleFileHub($$$$$$$$$$$$) { - my ($fh1, $fh2, $accessionId, $orgName, $descr, $asmId, $asmDate, $defPos, $taxId, $trackDb, $accessionDir, $buildDir) = @_; +sub singleFileHub($$$$$$$$$$$$$) { + my ($fh1, $fh2, $accessionId, $orgName, $descr, $asmId, $asmDate, $defPos, $taxId, $trackDb, $accessionDir, $buildDir, $chromAuthority) = @_; my @fhN; push @fhN, $fh1; push @fhN, $fh2; my %liftOverChain; # key is 'otherDb' name, value is bbi path my %liftOverGz; # key is 'otherDb' name, value is lift.over.gz file path my $hasChainNets = `ls -d $buildDir/trackData/lastz.* 2> /dev/null | wc -l`; chomp $hasChainNets; if ($hasChainNets) { printf STDERR "# hasChainNets: %d\t%s\n", $hasChainNets, $asmId; open (CH, "ls -d $buildDir/trackData/lastz.*|") or die "can not ls -d $buildDir/trackData/lastz.*"; while (my $line = <CH>) { chomp $line; my $otherDb = basename($line); $otherDb =~ s/lastz.//; @@ -77,30 +77,33 @@ 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 ( -s "${buildDir}/${asmId}.chromAlias.bb" ) { printf $fh "chromAliasBb %s.chromAlias.bb\n", $accessionId; } else { printf $fh "chromAlias %s.chromAlias.txt\n", $accessionId; } + if ($chromAuthority =~ m/^chromAuthority/) { + printf $fh "%s\n", $chromAuthority; + } printf $fh "organism %s %s\n", $assemblyName, $asmDate; 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) { printf $fh "liftOver.%s %s\n", $otherDb, $liftOverGz{$otherDb}; } printf $fh "\n"; foreach my $tdbLine (@tdbLines) { @@ -141,30 +144,33 @@ printf STDERR "duplicate name: '%s'\n", $commonName; exit 255; } $commonName{$asmId} = $commonName; push @orderList, $asmId; printf STDERR "orderList[$assemblyCount] = $asmId\n"; ++$assemblyCount; } close (FH); my $buildDone = 0; my $orderKey = 0; foreach my $asmId (@orderList) { ++$orderKey; next if ($asmId !~ m/^GC/); + my $chromAuthority = ""; + $chromAuthority = `~/kent/src/hg/makeDb/doc/asmHubs/chromAuthority.pl $asmId 2> /dev/null`; + chomp $chromAuthority; my ($gcPrefix, $accession, undef) = split('_', $asmId); my $accessionId = sprintf("%s_%s", $gcPrefix, $accession); my $accessionDir = substr($asmId, 0 ,3); $accessionDir .= "/" . substr($asmId, 4 ,3); $accessionDir .= "/" . substr($asmId, 7 ,3); $accessionDir .= "/" . substr($asmId, 10 ,3); my $buildDir = "/hive/data/genomes/asmHubs/refseqBuild/$accessionDir/$asmId"; my $destDir = "/hive/data/genomes/asmHubs/$accessionDir/$accessionId"; if ($gcPrefix eq "GCA") { $buildDir = "/hive/data/genomes/asmHubs/genbankBuild/$accessionDir/$asmId"; } if ( ! -s "${buildDir}/${asmId}.chrom.sizes" ) { printf STDERR "# ERROR: missing ${asmId}.chrom.sizes in\n# ${buildDir}\n"; next; } @@ -176,31 +182,31 @@ printf STDERR "# ERROR: missing ${asmId}.chromAlias.bb in\n# ${buildDir}\n"; next; } my $asmReport="$buildDir/download/${asmId}_assembly_report.txt"; my $trackDb = "$buildDir/$asmId.trackDb.txt"; if ( ! -s "${trackDb}" ) { printf STDERR "# %03d not built yet: %s\n", $orderKey, $asmId; printf STDERR "# '%s'\n", $trackDb; next; } if ( ! -s "${asmReport}" ) { printf STDERR "# %03d missing assembly_report: %s\n", $orderKey, $asmId; next; } ++$buildDone; -printf STDERR "# %03d genomes.txt %s/%s\n", $buildDone, $accessionDir, $accessionId; +printf STDERR "# %03d genomes.txt %s/%s %s\n", $buildDone, $accessionDir, $accessionId, ($chromAuthority =~ m/^chromAuthority/) ? "chromAuthority ucsc" : "no authority"; my $taxId=`grep -i "taxid:" $asmReport | head -1 | awk '{printf \$(NF)}' | tr -d \$'\\r'`; chomp $taxId; my $descr=`grep -i "organism name:" $asmReport | head -1 | tr -d \$'\\r' | sed -e 's#.*organism name: *##i; s# (.*\$##;'`; chomp $descr; my $orgName=`grep -i "organism name:" $asmReport | head -1 | tr -d \$'\\r' | sed -e 's#.* name: .* (##; s#).*##;'`; chomp $orgName; my $asmDate=`grep -i "Date:" $asmReport | head -1 | tr -d \$'\\r'`; chomp $asmDate; $asmDate =~ s/.*Date:\s+//; my ($year, $month, $day) = split('-', $asmDate); if (defined($month)) { $asmDate = sprintf("%s %s", $monthNumber[$month], $year); } else { printf STDERR "# error: can not find month in $asmDate in $asmReport\n"; } @@ -215,30 +221,33 @@ 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 ( -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; } + if ($chromAuthority =~ m/^chromAuthority/) { + printf "%s\n", $chromAuthority; + } printf "organism %s %s\n", $assemblyName, $asmDate; 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"`; chomp $defPos; } printf "defaultPos %s\n", $defPos; printf "orderKey %d\n", $buildDone; @@ -260,47 +269,50 @@ printf HT "hub %s genome assembly\n", $accessionId; printf HT "shortLabel %s\n", $orgName; printf HT "longLabel %s/%s/%s genome assembly\n", $orgName, $descr, $asmId; printf HT "genomesFile genomes.txt\n"; printf HT "email hclawson\@ucsc.edu\n"; printf HT "descriptionUrl html/%s.description.html\n", $asmId; close (HT); # try creating single file hub.txt, one for hgwdev, one for hgdownload my $downloadHubTxt = "$buildDir/${asmId}.download.hub.txt"; open (DL, ">$downloadHubTxt") or die "can not write to $downloadHubTxt"; $localHubTxt = "$buildDir/${asmId}.singleFile.hub.txt"; open (HT, ">$localHubTxt") or die "can not write to $localHubTxt"; singleFileHub(\*HT, \*DL, $accessionId, $orgName, $descr, $asmId, $asmDate, - $defPos, $taxId, $trackDb, $accessionDir, $buildDir); + $defPos, $taxId, $trackDb, $accessionDir, $buildDir, $chromAuthority); 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 ( -s "${buildDir}/${asmId}.chromAlias.bb" ) { printf GF "chromAliasBb %s.chromAlias.bb\n", $accessionId; } else { printf GF "chromAlias %s.chromAlias.txt\n", $accessionId; } + if ($chromAuthority =~ m/^chromAuthority/) { + printf GF "%s\n", $chromAuthority; + } printf GF "organism %s %s\n", $assemblyName, $asmDate; 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"; } } close (GF); my $localGroups = "$buildDir/${asmId}.groups.txt";