043102a443731a0d579d9766157ff57968d30d02 braney Tue Jan 9 14:52:24 2018 -0800 implement missing data and reading of WIB files into mathWigs. diff --git src/hg/hgTables/bigWig.c src/hg/hgTables/bigWig.c index 0b412cf..81f3537 100644 --- src/hg/hgTables/bigWig.c +++ src/hg/hgTables/bigWig.c @@ -203,31 +203,31 @@ { dv->value[ii] = values[ii]; dv->position[ii] = start + ii; } dv->count = dv->maxCount; } int mathWigOutRegion(struct trackDb *track, char *table, struct sqlConnection *conn, struct region *region, int maxOut, enum wigOutputType wigOutType) /* Write out mathWig for region, doing intersecting and filtering as need be. */ { int resultCount = 0; struct dataVector *dv = dataVectorNew(region->chrom, region->end - region->start); char *equation = cloneString(trackDbSetting(track, "mathDataUrl")); -double *values = mathWigGetValues(equation, region->chrom, region->start, region->end); +double *values = mathWigGetValues(database, equation, region->chrom, region->start, region->end, TRUE); valuesToVector(values, dv, region->start); resultCount = wigPrintDataVectorOut(dv, wigOutType, maxOut, NULL); dataVectorFree(&dv); return resultCount; } int bigWigOutRegion(char *table, struct sqlConnection *conn, struct region *region, int maxOut, enum wigOutputType wigOutType) /* Write out bigWig for region, doing intersecting and filtering as need be. */ { boolean isMerged = anySubtrackMerge(table, database); int resultCount = 0; char *wigFileName = bigWigFileName(table, conn); if (wigFileName)