d08acbc51365288f679e20b71ebe3a51da8c80e1 hiram Wed Feb 24 14:30:47 2021 -0800 correctly process non-nuclear unlocalized sequence refs #27072 diff --git src/hg/utils/automation/doAssemblyHub.pl src/hg/utils/automation/doAssemblyHub.pl index c0042d1..6295d3a 100755 --- src/hg/utils/automation/doAssemblyHub.pl +++ src/hg/utils/automation/doAssemblyHub.pl @@ -795,41 +795,42 @@ my $agpNames = "$runDir/$asmId.nonNucChr.names"; my $fastaOut = "$runDir/$asmId.nonNucChr.fa.gz"; $partsDone += 1; if (needsUpdate($nonNucChr2acc, $agpOutput)) { compositeAgp($nonNucChr2acc, $agpSource, $agpOutput, $agpNames); `touch -r $nonNucChr2acc $agpOutput`; } if (needsUpdate($twoBitFile, $fastaOut)) { compositeFasta($nonNucChr2acc, $twoBitFile, $fastaOut); `touch -r $twoBitFile $fastaOut`; } } ########### non-nuclear scaffold unlocalized sequence ################ my $nonNucChr2scaf = "$nonNucAsm/unlocalized_scaffolds/unlocalized.chr2scaf"; + my $agpSource = "$nonNucAsm/unlocalized_scaffolds/AGP"; if ( -s $nonNucChr2scaf ) { my $agpOutput = "$runDir/$asmId.nonNucUnlocalized.agp.gz"; my $agpNames = "$runDir/$asmId.nonNucUnlocalized.names"; my $fastaOut = "$runDir/$asmId.nonNucUnlocalized.fa.gz"; $partsDone += 1; if (needsUpdate($nonNucChr2scaf, $agpOutput)) { - compositeAgp($nonNucChr2scaf, $agpSource, $agpOutput, $agpNames); + unlocalizedAgp($nonNucChr2scaf, $agpSource, $agpOutput, $agpNames); `touch -r $nonNucChr2scaf $agpOutput`; } if (needsUpdate($twoBitFile, $fastaOut)) { - compositeFasta($nonNucChr2scaf, $twoBitFile, $fastaOut); + unlocalizedFasta($nonNucChr2scaf, $twoBitFile, $fastaOut); `touch -r $twoBitFile $fastaOut`; } } $bossScript->add(<<_EOF_ export asmId="$asmId" if [ -s ../\$asmId.chrom.sizes ]; then printf "sequence step previously completed\\n" 1>&2 exit 0 fi _EOF_ );