910378643087254ec5d8fffe664b4bf92f5e7361 jcasper Thu Jul 25 11:59:44 2024 -0700 Final fixup for the new straw library, refs #33225 diff --git src/hg/lib/straw/straw.cpp src/hg/lib/straw/straw.cpp index c7428df..a8ad55f 100644 --- src/hg/lib/straw/straw.cpp +++ src/hg/lib/straw/straw.cpp @@ -24,31 +24,31 @@ #include <cstring> #include <iostream> #include <fstream> #include <sstream> #include <map> #include <cmath> #include <set> #include <utility> #include <vector> #include <streambuf> //#include <curl/curl.h> #include <iterator> #include <algorithm> #include "zlib.h" //#include "straw.h" -#include "new_straw.h" +#include "straw.h" extern "C" { #include "../../inc/fakeCurl.h" } using namespace std; // Added UCSC: Dirty hack, but it's hard to quickly extract a list of available normalization options. // This gets populated by readFooter and readFooterURL, so you have to make a quick dummy data request // with straw() to set it up (e.g. to the first listed chromosome for a 1 bp window). set<string> globalNormOptions; /* Straw: fast C++ implementation of dump. Not as fully featured as the Java version. Reads the .hic file, finds the appropriate matrix and slice