more changes towards musrfit/DKS/root6.

This commit is contained in:
2017-02-08 11:16:27 +01:00
parent 18d037fdf2
commit e8f692b42c
25 changed files with 42 additions and 43 deletions

View File

@ -402,7 +402,7 @@ PFourier::PFourier(TH1F *data, Int_t unitTag, Double_t startTime, Double_t endTi
fDks.setAPI("Cuda", 4);
fDks.setDevice("-gpu", 4);
fDks.initDevice();
int dimsize[3] = {fNoOfBins, 1, 1};
int dimsize[3] = {(int)fNoOfBins, 1, 1};
fDks.setupFFT(1, dimsize);
// allocate memory on accelerator
int ierr;
@ -476,7 +476,7 @@ void PFourier::Transform(UInt_t apodizationTag)
fftw_execute(fFFTwPlan);
} else {
#ifdef HAVE_DKS
int dimsize[3] = {fNoOfBins, 1, 1};
int dimsize[3] = {(int)fNoOfBins, 1, 1};
int status=0, size=fNoOfBins/2+1;
// write data to the accelerator
status = fDks.writeData<double>(fReal_ptr, fInDKS, fNoOfBins);
@ -516,8 +516,7 @@ void PFourier::Transform(UInt_t apodizationTag)
#ifdef HAVE_DKS
re = fOutDKS[i].real() * cos(phase) + fOutDKS[i].imag() * sin(phase);
im = -fOutDKS[i].real() * sin(phase) + fOutDKS[i].imag() * cos(phase);
fOutDKS[i].real() = re;
fOutDKS[i].imag() = im;
fOutDKS[i] = complex<double>(re, im);
#endif
}
}