1ba03723b75a8d501529931b7e80b27ece5c34b1 hiram Tue Sep 1 12:59:41 2026 -0700 remove the obsolete gcOnTheFlyCoExist flag and hg.conf variable refs #38208 diff --git src/hg/hgTracks/hgTracks.c src/hg/hgTracks/hgTracks.c index b80c0785cb8..0975fd8b437 100644 --- src/hg/hgTracks/hgTracks.c +++ src/hg/hgTracks/hgTracks.c @@ -7559,50 +7559,47 @@ addWikiTrack(&trackList); struct sqlConnection *conn = wikiConnect(); if (sqlTableExists(conn, "variome")) addVariomeWikiTrack(&trackList); wikiDisconnect(&conn); } struct grp *grpList = NULL; if (cartOptionalString(cart, "hgt.trackNameFilter") == NULL) { // If a single track was asked for and it is from a hub, then it is already in trackList loadTrackHubs(&trackList, &grpList); } /* gcOnFly track: if a trackDb entry exists (native or hub, possibly * with a hub_#_ prefix on the table name), patch in on-the-fly * computation methods so data comes from genome sequence, not a file. - * hg.conf switches: + * hg.conf switch: * gcOnTheFly=on - master switch, track is removed if off (default on) - * gcOnTheFlyCoExist=on - allow gcOnFly alongside gc5Base/gc5BaseBw - * (default off: remove gcOnFly if either exists) + * Also removed if gc5Base or gc5BaseBw is present in trackDb. * This must run after loadTrackHubs so assembly hub tracks are present. */ { boolean gcOnTheFlyEnabled = cfgOptionBooleanDefault("gcOnTheFly", TRUE); -boolean gcCoExist = cfgOptionBooleanDefault("gcOnTheFlyCoExist", FALSE); struct track *t, *prev = NULL, *next; for (t = trackList; t != NULL; t = next) { next = t->next; if (sameString(GC_ON_FLY_TRACK_NAME, trackHubSkipHubName(t->table))) { boolean remove = FALSE; if (!gcOnTheFlyEnabled) remove = TRUE; - else if (!gcCoExist && - (rFindTrackWithTable("gc5Base", trackList) != NULL || - rFindTrackWithTable("gc5BaseBw", trackList) != NULL)) + else if (rFindTrackWithTable("gc5Base", trackList) != NULL || + rFindTrackWithTable("gc5BaseBw", trackList) != NULL) remove = TRUE; if (remove) { if (prev == NULL) trackList = next; else prev->next = next; continue; } gc5BaseOnTheFlyMethods(t, cart); } prev = t; } } loadCustomTracks(&trackList);