8a28bf4166662fa7fdde5975bb42963aa55537cd
braney
  Fri May 17 14:18:19 2019 -0700
change variable names in response to code review

diff --git src/hg/hgTracks/lollyTrack.c src/hg/hgTracks/lollyTrack.c
index b70b98d..2526e50 100644
--- src/hg/hgTracks/lollyTrack.c
+++ src/hg/hgTracks/lollyTrack.c
@@ -121,31 +121,31 @@
     hvGfxTextRight(hvg, xOff, yOff+height-fontHeight - LOLLY_DIAMETER, width - 1, fontHeight,
         color, font, lower);
     }
 }
 
 
 static int lollyHeight(struct track *tg, enum trackVisibility vis)
 /* calculate height of all the lollys being displayed */
 {
 if ( tg->visibility == tvDense)
     return  tl.fontHeight;
 
 // if we're pack, then use bigBed drawing
 if (tg->visibility == tvPack)
     {
-    bigBedMethods(tg, tg->tdb, tg->lollyCart->wordCount, tg->lollyCart->words);
+    bigBedMethods(tg, tg->tdb, tg->lollyCart->typeWordCount, tg->lollyCart->typeWords);
     tg->mapsSelf = FALSE;
     tg->drawLeftLabels = NULL;
     return tg->totalHeight(tg, vis);
     }
 
 // return the height we calculated at load time
 return tg->lollyCart->height;
 }
 
 #ifdef NOTUSED
 double calcVarianceFromSums(double sum, double sumSquares, bits64 n)
 /* Calculate variance. */
 {   
 double var = sumSquares - sum*sum/n;
 if (n > 1)
@@ -312,23 +312,23 @@
 wigFetchMinMaxYWithCart(cart, tdb, tdb->track, &lollyCart->minY, &lollyCart->maxY, &tDbMinY, &tDbMaxY, trackWordCount, trackWords);
 lollyCart->upperLimit = lollyCart->maxY;
 lollyCart->lowerLimit = lollyCart->minY;
 
 return lollyCart;
 }
 
 void lollyMethods(struct track *track, struct trackDb *tdb, 
                                 int wordCount, char *words[])
 /* bigLolly track type methods */
 {
 bigBedMethods(track, tdb, wordCount, words);
 
 struct lollyCartOptions *lollyCart = lollyCartOptionsNew(cart, tdb, wordCount, words);
 lollyCart->radius = 5;
-lollyCart->words = words;
-lollyCart->wordCount = wordCount;
+lollyCart->typeWords = words;
+lollyCart->typeWordCount = wordCount;
 track->loadItems = lollyLoadItems;
 track->drawItems = lollyDrawItems;
 track->totalHeight = lollyHeight; 
 track->drawLeftLabels = lollyLeftLabels;
 track->lollyCart = lollyCart;
 }