d86ddf032b97d2014a9a97b79dd9f66d9b07db13
jcasper
  Thu Jul 25 15:36:52 2024 -0700
Also need to commit these for the new Hi-C setup! refs #33225

diff --git src/hg/lib/hicUi.c src/hg/lib/hicUi.c
index 6b8dbb9..1df6830 100644
--- src/hg/lib/hicUi.c
+++ src/hg/lib/hicUi.c
@@ -14,48 +14,48 @@
 #include "obscure.h"
 #include "htmshell.h"
 #include "htmlColor.h"
 
 char *hicUiFetchNormalization(struct cart *cart, struct trackDb *tdb, struct hicMeta *meta)
 /* Return the current normalization selection, or the default if none
  * has been selected.  Right now this is a hard-coded set specifically for
  * .hic files, but in the future this list might be dynamically determined by
  * the contents and format of the Hi-C file. */
 {
 char cartVar[1024];
 safef(cartVar, sizeof(cartVar), "%s.%s", tdb->track, HIC_NORMALIZATION);
 char *selected = cartNonemptyString(cart, cartVar);
 if (selected == NULL)
     selected = trackDbSetting(tdb, HIC_TDB_NORMALIZATION);
-char *menu[] = {"NONE", "VC", "VC_SQRT", "KR"};
+char **menu = meta->normOptions;
 int i;
 char *result = menu[0];
-for (i=1; i<4; i++)
+for (i=1; i<meta->nNormOptions; i++)
     {
     if (sameWordOk(selected, menu[i]))
         result = menu[i];
     }
 return result;
 }
 
 void hicUiNormalizationDropDown(struct cart *cart, struct trackDb *tdb, struct hicMeta *meta)
 {
 char cartVar[1024];
 char* selected = hicUiFetchNormalization(cart, tdb, meta);
-char *menu[] = {"NONE", "VC", "VC_SQRT", "KR"};
+char **menu = meta->normOptions;
 safef(cartVar, sizeof(cartVar), "%s.%s", tdb->track, HIC_NORMALIZATION);
-cgiMakeDropList(cartVar, menu, 4, selected);
+cgiMakeDropList(cartVar, menu, meta->nNormOptions, selected);
 }
 
 void hicUiNormalizationMenu(struct cart *cart, struct trackDb *tdb, struct hicMeta *meta)
 /* Draw a menu to select the normalization method to use. */
 {
 printf("<b>Score normalization:</b> ");
 hicUiNormalizationDropDown(cart, tdb, meta);
 }
 
 char *hicUiFetchResolution(struct cart *cart, struct trackDb *tdb, struct hicMeta *meta)
 /* Return the current resolution selection, or the default if none
  * has been selected. */
 {
 char cartVar[1024];
 safef(cartVar, sizeof(cartVar), "%s.%s", tdb->track, HIC_RESOLUTION);