0c42aea56b751a2b4a58feb225a9659819a90994 markd Sat Oct 3 06:22:01 2026 -0700 Nest the TSS tracks on alpha only, leaving the release as it is. refs #35528 PRO-cap and ProCapNet sit inside a transcriptionStart superTrack on alpha. That needs #38460, which is on master but not in a release, and these tracks are already released, so each source is written twice with complementary release tags: the nested copy alpha, the flat copy beta,public. hgTrackDb takes the copy whose release matches and rejects two whose releases overlap. Verified that beta and public are untouched: a public build from this file is byte-identical to a public build from the released flat tree, same md5 over tableName, shortLabel, type, visibility, priority and settings. tdbQuery -check -strict passes on all three releases, and an alpha build has the container with both members parented while beta and public have neither. Drop the release tags and the flat copies once #38460 ships. The makedocs also record that the alpha build needs hgTrackDb and trackDbToTxt in /cluster/bin/x86_64 to carry the #38460 fix. make alpha does not install there, BINDIR defaults to ~/bin/$MACHTYPE, so they were put in by hand and the weekly utils build will overwrite them. diff --git src/hg/makeDb/outside/proCapNet/proCapNetTrackDb src/hg/makeDb/outside/proCapNet/proCapNetTrackDb index 676b91f9052..8393ab1e258 100755 --- src/hg/makeDb/outside/proCapNet/proCapNetTrackDb +++ src/hg/makeDb/outside/proCapNet/proCapNetTrackDb @@ -28,44 +28,69 @@ GBDB = "/gbdb/{db}/{track}" def parseArgs(): parser = argparse.ArgumentParser(description=__doc__) parser.add_argument("db") parser.add_argument("experimentsTsv") parser.add_argument("outRa") return cli.parseOptsArgsWithLogging(parser) def stanza(indent, lines): pad = " " * indent return "".join(pad + line + "\n" for line in lines) + "\n" +def superStanza(): + """The container both data sources sit in, on alpha only. + + Nesting a superTrack inside a superTrack needs the fix in #38460, which is on + master but not in a release. These tracks are already released, so the + container and the nested form of its two members are alpha, and a flat + unnested form of those members is beta and public. Drop the release tags + here and in sourceSuperStanza once #38460 ships.""" + return stanza(0, [ + "track transcriptionStart", + "superTrack on show", + "group rna", + "shortLabel Transcription Initiation (TSS)", + "longLabel Transcription initiation (TSS)", + "release alpha", + ]) + def sourceSuperStanza(track, shortLabel, longLabel): - """One top-level superTrack per data source. + """One superTrack per data source, written twice: inside the + transcriptionStart container on alpha, and standing on its own for beta and + public, which run binaries that predate #38460 and would drop the container. - These were briefly nested under a transcriptionStart superTrack, which looks - legal and passes tdbQuery -check -strict but silently loses the outer level: - trackDbSuperMarkup() refuses to give a superTrack a parent, so hgTrackDb never - writes the outer one. See #38460.""" - return stanza(0, [ + hgTrackDb takes the copy whose release matches and rejects two whose releases + overlap, so the two sets of tags have to stay complementary. + + Every child of the container is written before any of their members, because + tdbQuery -strict rejects a file in which another track comes between a + superTrack and one of its children.""" + common = [ f"track {track}", "superTrack on show", "group rna", f"shortLabel {shortLabel}", f"longLabel {longLabel}", - ]) + ] + nested = stanza(4, common[:2] + ["parent transcriptionStart"] + common[2:] + + ["release alpha"]) + flat = stanza(0, common + ["release beta,public"]) + return nested + flat def strandOverlay(db, composite, exp, dataType, subDir, fileTag, shortLabel, longLabel, childLabel, priority, vis): """One cell line's two strands as an overlay, plus strand drawn up and minus strand drawn down. Both sources store the minus strand negated, so neither needs the trackDb negateValues setting. That setting used to be on the ProCapNet minus tracks, and it broke the composite's own negate control: that control sets one shared value for the composite, which replaced the per-track setting and sent both strands the same way, with no route back to the default short of a cart reset. fileTag is the part of the file name that says what the file holds, so a bigWig downloaded on its own still names its source: the model for the predictions, the ENCODE experiment accession for the measurements. @@ -156,30 +181,31 @@ out += strandOverlay(db, "encode4ProCap", exp, "procap", "", exp.procapAcc, f"{exp.cell} PRO-cap", f"{exp.cell} ({exp.procapAcc}) PRO-cap transcription start" f" sites, plus up minus down", f"{exp.cell} ({exp.procapAcc}) PRO-cap transcription start sites", priority, "full") return out def proCapNetTrackDb(opts, args): experiments = list(TsvReader(args.experimentsTsv)) fileOps.ensureFileDir(args.outRa) with fileOps.AtomicFileOpen(args.outRa) as fh: print(f"# Generated by hg/makeDb/outside/proCapNet/proCapNetTrackDb for {args.db}.", file=fh) print("# Do not edit by hand, edit the script and regenerate.\n", file=fh) + fh.write(superStanza()) if args.db == "hg38": fh.write(sourceSuperStanza( "encode4ProCap", "PRO-cap", "PRO-cap nascent RNA transcription start sites from ENCODE 4")) fh.write(sourceSuperStanza("proCapNet", "ProCapNet", "ProCapNet predicted PRO-cap")) if args.db == "hg38": fh.write(encode4ProCapTracks(args.db, experiments)) fh.write(proCapNetTracks(args.db, experiments)) def main(): opts, args = parseArgs() with cli.ErrorHandler(noStackExcepts=(OSError, cli.PycbioException)): proCapNetTrackDb(opts, args)