7f98bf75bd712a44b8ed9ededdd10e0f387cd35a angie Thu Aug 13 10:31:58 2015 -0700 Moved averaging of wiggle values back from annoFormatTab to annoGrateWig, so that it can be done properly across multiple regions with data. A user was trying to get average GC over 1MB regions, but averages of smaller subregions were returned instead. refs #15834 diff --git src/hg/lib/annoGrateWigDb.c src/hg/lib/annoGrateWigDb.c index 99feb4a..98ae43d 100644 --- src/hg/lib/annoGrateWigDb.c +++ src/hg/lib/annoGrateWigDb.c @@ -1,15 +1,17 @@ /* annoGrateWigDb -- subclass of annoGrator for wiggle database table & file */ /* Copyright (C) 2014 The Regents of the University of California * See README in this or parent directory for licensing information. */ #include "annoGrateWigDb.h" #include "annoStreamWig.h" #include "wiggle.h" -struct annoGrator *annoGrateWigDbNew(char *db, char *table, struct annoAssembly *aa, int maxOutput) -/* Create an annoGrator subclass for wiggle data from db.table (and the file it points to). */ +struct annoGrator *annoGrateWigDbNew(char *db, char *table, struct annoAssembly *aa, + enum annoGrateWigMode mode, int maxOutput) +/* Create an annoGrator subclass for wiggle data from db.table (and the file it points to). + * See src/inc/annoGrateWig.h for a description of mode. */ { struct annoStreamer *wigSource = annoStreamWigDbNew(db, table, aa, maxOutput); -return annoGrateWigNew(wigSource); +return annoGrateWigNew(wigSource, mode); }