9d57b3048d4df5f3164f1a3f56f36a0d1f700e34 hiram Thu Jan 23 11:02:36 2020 -0800 need to have asmId.faSize.txt in top level directory for asmHubStats refs #24748 diff --git src/hg/utils/automation/doAssemblyHub.pl src/hg/utils/automation/doAssemblyHub.pl index fe6735a..8a649b9 100755 --- src/hg/utils/automation/doAssemblyHub.pl +++ src/hg/utils/automation/doAssemblyHub.pl @@ -1232,30 +1232,32 @@ my $wmMasked=`grep "masked total" $buildDir/trackData/windowMasker/faSize.$asmId.cleanWMSdust.txt | awk '{print \$1}' | sed -e 's/%//;'`; my $rmMasked=`grep "masked total" $buildDir/trackData/repeatMasker/faSize.rmsk.txt | awk '{print \$1}' | sed -e 's/%//;'`; my $src2BitToMask = "../repeatMasker/$asmId.rmsk.2bit"; if ($wmMasked > $rmMasked) { $src2BitToMask = "../windowMasker/$asmId.cleanWMSdust.2bit"; } $bossScript->add(<<_EOF_ export asmId=$asmId if [ ../simpleRepeat/trfMask.bed.gz -nt \$asmId.masked.faSize.txt ]; then twoBitMask $src2BitToMask -type=.bed \\ -add ../simpleRepeat/trfMask.bed.gz \$asmId.masked.2bit twoBitToFa \$asmId.masked.2bit stdout | faSize stdin > \$asmId.masked.faSize.txt + touch -r \$asmId.masked.2bit \$asmId.masked.faSize.txt + cp -p \$asmId.masked.faSize.txt ../../\$asmId.faSize.txt else printf "# addMask step previously completed\\n" 1>&2 exit 0 fi _EOF_ ); $bossScript->execute(); } # addMask ######################################################################### # * step: windowMasker [workhorse] sub doWindowMasker { my $runDir = "$buildDir/trackData/windowMasker";