back-integrate DKS Fourier after DKS upgrade and modularization. Not yet tested other than compilation.

src/include/PFourier.h

@@ -34,11 +34,6 @@
 #include "config.h"
 #endif
 
-//as the next 3 lines will need to be deleted as soon as DKS Fourier is back in place
-#include <vector>
-using namespace std;
-#include "fftw3.h"
-/*//as
 #ifndef HAVE_DKS
 #include <vector>
 using namespace std;
@@ -47,8 +42,8 @@ using namespace std;
 #include <complex>
 using namespace std;
 #include "DKSBase.h"
+#include "DKSFFT.h"
 #endif
-*/
 
 #include "Minuit2/FCNBase.h"
 
@@ -159,15 +154,13 @@ class PFourier
     fftw_complex *fIn;   ///< real part of the Fourier transform
     fftw_complex *fOut;  ///< imaginary part of the Fourier transform
 
-/*//as
 #ifdef HAVE_DKS
     double *fInDKS; ///< real part of the Fourier transform
     complex<double> *fOutDKS; ///< imaginary part of the Fourier transform
-    DKSBase fDks; ///< Dynamic Kernel Scheduler
+    DKSFFT fDks; ///< Dynamic Kernel Scheduler
     void *fReal_ptr; ///< real part of the Fourier on accelartor
     void *fComp_ptr; ///< imaginary part of the Fourier on the acclerator
 #endif
-*/
 
     virtual void PrepareFFTwInputData(UInt_t apodizationTag);
     virtual void ApodizeData(Int_t apodizationTag);