merge with master

bioem.cpp

@@ -164,9 +164,11 @@ int bioem::configure(int ac, char* av[])
 	/****************** Precalculating Necessary Stuff *********************/
 	precalculate();
 
-	param.nTotGridAngles = 4;
-	param.nTotCTFs = 4;
-	//param.param_device.maxDisplaceCenter = 0;
+	if (getenv("BIOEM_DEBUG_BREAK"))
+	{
+		param.nTotGridAngles = atoi(getenv("BIOEM_DEBUG_BREAK"));
+		param.nTotCTFs = atoi(getenv("BIOEM_DEBUG_BREAK"));
+	}
 
 	deviceInit();
 
@@ -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.);
 		}
-
 	}
 	//deallocating fftw_complex vector
 	myfftw_free(proj_mapFFT);