ef2b0974644900d17bdc4e0a2c8056e995832282 markd Thu Jan 16 11:14:03 2020 -0800 Revert "Initial pass at 64bit blat index" This reverts commit 85f6ef8de85a89781978add2ed98fb158718cd40. diff --git src/jkOwnLib/ooc.c src/jkOwnLib/ooc.c index fd814bb..d2901a0 100644 --- src/jkOwnLib/ooc.c +++ src/jkOwnLib/ooc.c @@ -1,24 +1,24 @@ /* ooc.c - Stuff to handle overused N-mers (tiles) in genome * indexing schemes. */ /* Copyright 2001-2003 Jim Kent. All rights reserved. */ #include "common.h" #include "ooc.h" #include "sig.h" -void oocMaskCounts(char *oocFile, bits64 *tileCounts, int tileSize, bits32 maxPat) +void oocMaskCounts(char *oocFile, bits32 *tileCounts, int tileSize, bits32 maxPat) /* Set items of tileCounts to maxPat if they are in oocFile. * Effectively masks this out of index.*/ { if (oocFile != NULL) { bits32 sig, psz; FILE *f = mustOpen(oocFile, "rb"); boolean mustSwap = FALSE; mustReadOne(f, sig); mustReadOne(f, psz); if (sig == oocSig) mustSwap = FALSE; else if (sig == oocSigSwapped) { @@ -40,31 +40,31 @@ v.bytes[2] = u.bytes[1]; v.bytes[3] = u.bytes[0]; tileCounts[v.whole] = maxPat; } } else { bits32 oli; while (readOne(f, oli)) tileCounts[oli] = maxPat; } fclose(f); } } -void oocMaskSimpleRepeats(bits64 *tileCounts, int seedSize, bits32 maxPat) +void oocMaskSimpleRepeats(bits32 *tileCounts, int seedSize, bits32 maxPat) /* Mask out simple repeats in index . */ { int i, j, k; int tileMask = (1<<(seedSize+seedSize))-1; for (i=0; i<4; ++i) { for (j=0; j<4; ++j) { bits32 repeat = 0; for (k=0; k<8; ++k) { repeat <<= 2; repeat |= i; repeat <<= 2; repeat |= j;