b7bdc7ab888afd8258d4b4219c324ee96a28dd70 hiram Mon Oct 26 10:13:13 2020 -0700 fix build of GenomicDiff track refs #24074 diff --git src/hg/utils/automation/doNcbiRefSeq.pl src/hg/utils/automation/doNcbiRefSeq.pl index 72d49aa..2f7db20 100755 --- src/hg/utils/automation/doNcbiRefSeq.pl +++ src/hg/utils/automation/doNcbiRefSeq.pl @@ -707,39 +707,43 @@ $bossScript->add(<<_EOF_ # If \$db.noRna.available.list is not empty but items are on chrM, # make fake cDNA sequence for them using chrM sequence # since NCBI puts proteins, not coding RNAs, in the GFF. if [ -s \$db.noRna.available.list ]; then pslCat -nohead process/\$asmId.\$db.psl.gz \\ | grep -Fwf \$db.noRna.available.list \\ | egrep "$nonNucNames" > missingChrMFa.psl if [ -s missingChrMFa.psl ]; then pslToBed missingChrMFa.psl stdout \\ | twoBitToFa -bed=stdin \$target2bit stdout >> \$db.rna.fa fi fi -if [ -s process/\$asmId.rna.cds.gz ]; then - zcat process/\$asmId.rna.cds.gz egrep '[0-9]+\\.\\.[0-9]\\+' \\ - pslMismatchGapToBed -cdsFile=stdin -db=\$db -ignoreQNamePrefix=X \\ +if [ -s process/\$asmId.rna.cds ]; then + cat process/\$asmId.rna.cds | grep '[0-9]\\+\\.\\.[0-9]\\+' \\ + | pslMismatchGapToBed -cdsFile=stdin -db=\$db -ignoreQNamePrefix=X \\ process/\$asmId.\$db.psl.gz \$target2bit \\ \$db.rna.fa ncbiRefSeqGenomicDiff || true + if [ -s ncbiRefSeqGenomicDiff.bed ]; then wget -O txAliDiff.as 'http://genome-source.soe.ucsc.edu/gitlist/kent.git/raw/master/src/hg/lib/txAliDiff.as' bedToBigBed -type=bed9+ -tab -as=txAliDiff.as \\ ncbiRefSeqGenomicDiff.bed \$db.chrom.sizes ncbiRefSeqGenomicDiff.bb + else + rm -f ncbiRefSeqGenomicDiff.bed + fi fi export totalBases=`ave -col=2 \$db.chrom.sizes | grep "^total" | awk '{printf "%d", \$2}'` export basesCovered=`bedSingleCover.pl \$db.ncbiRefSeq.bigGp | ave -col=4 stdin | grep "^total" | awk '{printf "%d", \$2}'` export percentCovered=`echo \$basesCovered \$totalBases | awk '{printf "%.3f", 100.0*\$1/\$2}'` printf "%d bases of %d (%s%%) in intersection\\n" "\$basesCovered" \\ "\$totalBases" "\$percentCovered" > fb.ncbiRefSeq.\$db.txt printf "%d bases of %d (%s%%) in intersection\\n" "\$baseCount" "\$asmSizeNoGaps" "\$perCent" > fb.\$asmId.ncbiRefSeq.txt rm -f \$db.ncbiRefSeq.bigGp \$asmId.exons.bed pslToBigPsl -fa=download/\$asmId.rna.fa.gz -cds=process/\$asmId.rna.cds \\ process/\$asmId.\$db.psl.gz stdout | sort -k1,1 -k2,2n > \$asmId.bigPsl bedToBigBed -type=bed12+13 -tab -as=bigPsl.as -extraIndex=name \\ \$asmId.bigPsl \$db.chrom.sizes \$asmId.bigPsl.bb @@ -815,40 +819,44 @@ pslCat -nohead process/\$asmId.\$db.psl.gz \\ | grep -Fwf \$db.noRna.available.list \\ | grep chrM > missingChrMFa.psl if [ -s missingChrMFa.psl ]; then pslToBed missingChrMFa.psl stdout \\ | twoBitToFa -bed=stdin $dbTwoBit stdout >> \$db.rna.fa fi fi mkdir -p $gbdbDir ln -f -s `pwd`/\$db.rna.fa $gbdbDir/seqNcbiRefSeq.rna.fa hgLoadSeq -drop -seqTbl=seqNcbiRefSeq -extFileTbl=extNcbiRefSeq \$db $gbdbDir/seqNcbiRefSeq.rna.fa hgLoadPsl \$db -table=ncbiRefSeqPsl process/\$asmId.\$db.psl.gz -if [ -s process/\$asmId.rna.cds.gz ]; then - zcat process/\$asmId.rna.cds.gz egrep '[0-9]+\\.\\.[0-9]\\+' \\ - pslMismatchGapToBed -cdsFile=stdin -db=\$db -ignoreQNamePrefix=X \\ +if [ -s process/\$asmId.rna.cds ]; then + zcat process/\$asmId.rna.cds | grep '[0-9]\\+\\.\\.[0-9]\\+' \\ + | pslMismatchGapToBed -cdsFile=stdin -db=\$db -ignoreQNamePrefix=X \\ process/\$asmId.\$db.psl.gz $dbTwoBit \\ \$db.rna.fa ncbiRefSeqGenomicDiff || true + rm -f $gbdbDir/ncbiRefSeqGenomicDiff.bb + if [ -s ncbiRefSeqGenomicDiff.bed ]; then bedToBigBed -type=bed9+ -tab -as=~/kent/src/hg/lib/txAliDiff.as \\ ncbiRefSeqGenomicDiff.bed process/\$db.chrom.sizes ncbiRefSeqGenomicDiff.bb - rm -f $gbdbDir/ncbiRefSeqGenomicDiff.bb ln -s `pwd`/ncbiRefSeqGenomicDiff.bb $gbdbDir/ncbiRefSeqGenomicDiff.bb + else + rm -f ncbiRefSeqGenomicDiff.bed + fi fi if [ -d "/usr/local/apache/htdocs-hgdownload/goldenPath/archive" ]; then gtfFile=`ls \$db.*.ncbiRefSeq.gtf.gz` mkdir -p /usr/local/apache/htdocs-hgdownload/goldenPath/archive/\$db/ncbiRefSeq rm -f /usr/local/apache/htdocs-hgdownload/goldenPath/archive/\$db/ncbiRefSeq/\$gtfFile ln -s `pwd`/\$db.*.ncbiRefSeq.gtf.gz \\ /usr/local/apache/htdocs-hgdownload/goldenPath/archive/\$db/ncbiRefSeq/ fi featureBits \$db ncbiRefSeq > fb.ncbiRefSeq.\$db.txt 2>&1 cat fb.ncbiRefSeq.\$db.txt 2>&1 _EOF_ ); } # if ($dbExists)