Commit 378fa3f0 authored by David Rohr's avatar David Rohr
Browse files

merge with master

parents 65947e3b 9ecded8c
...@@ -164,9 +164,11 @@ int bioem::configure(int ac, char* av[]) ...@@ -164,9 +164,11 @@ int bioem::configure(int ac, char* av[])
/****************** Precalculating Necessary Stuff *********************/ /****************** Precalculating Necessary Stuff *********************/
precalculate(); precalculate();
param.nTotGridAngles = 4; if (getenv("BIOEM_DEBUG_BREAK"))
param.nTotCTFs = 4; {
//param.param_device.maxDisplaceCenter = 0; param.nTotGridAngles = atoi(getenv("BIOEM_DEBUG_BREAK"));
param.nTotCTFs = atoi(getenv("BIOEM_DEBUG_BREAK"));
}
deviceInit(); deviceInit();
...@@ -289,7 +291,6 @@ int bioem::run() ...@@ -289,7 +291,6 @@ int bioem::run()
printf("Time Comparison %d %d: %f sec (%f GFlops, %f GB/s (cached), %f GB/s)\n", iProjectionOut, iConv, compTime, nFlops / 1000000000., nGBs / 1000000000., nGBs2 / 1000000000.); printf("Time Comparison %d %d: %f sec (%f GFlops, %f GB/s (cached), %f GB/s)\n", iProjectionOut, iConv, compTime, nFlops / 1000000000., nGBs / 1000000000., nGBs2 / 1000000000.);
} }
} }
//deallocating fftw_complex vector //deallocating fftw_complex vector
myfftw_free(proj_mapFFT); myfftw_free(proj_mapFFT);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment