...

Author: AAAlvesJr

hydra/Convolution.h

@@ -128,20 +128,17 @@ convolute(detail::BackendPolicy<BACKEND> policy, detail::FFTPolicy<T, FFTBackend
 	hydra_thrust::transform( policy, ffts.begin(),  ffts.end(),
 			complex_buffer.first, detail::convolution::MultiplyFFT<T>());
 
-	std::cout<<"fft_functor_range :"<< fft_functor_range.size() <<std::endl;
-	std::cout<<"fft_kernel_range  :" << fft_kernel_range.size() <<std::endl;
-	std::cout<<"complex_buffer :"<< complex_buffer.second<<std::endl;
 
 	//transform product back to real
 
-	auto fft_product = _ComplexToRealFFT( complex_buffer.second );
+	auto fft_product = _ComplexToRealFFT( 2*complex_buffer.second-2 );
 
 	fft_product.LoadInputData(complex_buffer.second, complex_buffer.first);
 	fft_product.Execute();
 
 	auto fft_product_output =  fft_product.GetOutputData();
 
-	T n = 2*nsamples;//*norm_factor;
+	T n = 2*complex_buffer.second-2;
 
 	auto normalize_fft =  detail::convolution::NormalizeFFT<T>(n);
 

hydra/detail/fftw/BaseFFTW.h

@@ -250,6 +250,9 @@ class BaseFFTW
 
 	void LoadInput(int size, const InputType* data )
 	{
+		std::cout << "size "<< size<<std::endl;
+		std::cout << "fNInput "<< fNInput<<std::endl;
+
 		assert(size <= fNInput);
 		memcpy(&fInput.get()[0], data, sizeof(InputType)*size);
 		memset(&fInput.get()[size], 0, sizeof(InputType)*( fNInput-size  ));

hydra/detail/utility/MSB.h

@@ -55,7 +55,7 @@ inline typename std::enable_if<
     	!(std::is_signed<Integer>::value) &&
     	(std::numeric_limits<Integer>::digits==64)
     , unsigned>::type
-msb( Integer  const& x){
+msb( Integer  const x){
 
 	if(!x) return 64;
 
@@ -73,17 +73,18 @@ msb( Integer  const& x){
 
 	#else
 
+	   Integer _x
 	   unsigned y;
 	   int n = 64;
 
-	   y = x >>32;  if (y != 0) {n = n -32;  x = y;}
-	   y = x >>16;  if (y != 0) {n = n -16;  x = y;}
-	   y = x >> 8;  if (y != 0) {n = n - 8;  x = y;}
-	   y = x >> 4;  if (y != 0) {n = n - 4;  x = y;}
-	   y = x >> 2;  if (y != 0) {n = n - 2;  x = y;}
-	   y = x >> 1;  if (y != 0) return n - 2;
+	   y = _x >>32;  if (y != 0) {n = n -32;  _x = y;}
+	   y = _x >>16;  if (y != 0) {n = n -16;  _x = y;}
+	   y = _x >> 8;  if (y != 0) {n = n - 8;  _x = y;}
+	   y = _x >> 4;  if (y != 0) {n = n - 4;  _x = y;}
+	   y = _x >> 2;  if (y != 0) {n = n - 2;  _x = y;}
+	   y = _x >> 1;  if (y != 0) return n - 2;
 
-	   return 63 - n - x;
+	   return 63 - n - _x;
 
 	#endif
 //device path will try to use
@@ -105,7 +106,7 @@ inline typename std::enable_if<
     	!(std::is_signed<Integer>::value) &&
     	(std::numeric_limits<Integer>::digits<=32)
     , unsigned>::type
-msb( Integer const& x){
+msb( Integer const x){
 
 	if(!x) return 32;
 
@@ -126,12 +127,12 @@ msb( Integer const& x){
 
 	   unsigned y;
 	   int n = 32;
-	   y = x >>16;  if (y != 0) {n = n -16;  x = y;}
-	   y = x >> 8;  if (y != 0) {n = n - 8;  x = y;}
-	   y = x >> 4;  if (y != 0) {n = n - 4;  x = y;}
-	   y = x >> 2;  if (y != 0) {n = n - 2;  x = y;}
-	   y = x >> 1;  if (y != 0) return n - 2;
-	   return 31 - n - x;
+	   y = _x >>16;  if (y != 0) {n = n -16;  _x = y;}
+	   y = _x >> 8;  if (y != 0) {n = n - 8;  _x = y;}
+	   y = _x >> 4;  if (y != 0) {n = n - 4;  _x = y;}
+	   y = _x >> 2;  if (y != 0) {n = n - 2;  _x = y;}
+	   y = _x >> 1;  if (y != 0) return n - 2;
+	   return 31 - n - _x;
 
 	#endif
 #else