LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 4 Activity

Nicer solution for fftw3_threads

Browse Source
This commit is contained in:
Bastian M. Wojek
2009-12-27 15:26:11 +00:00
parent e0c893503f
commit 199ff918f0
6 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/classes/PRunDataHandler.cpp
View File

@ -1283,18 +1283,18 @@ Bool_t PRunDataHandler::ReadMudFile()
MUD_closeRead(fh);
/*
cout << endl << "fRunName : " << runData.fRunName.Data();
cout << endl << "fRunTitle : " << runData.fRunTitle.Data();
cout << endl << "fSetup : " << runData.fSetup.Data();
cout << endl << "fField : " << runData.fField;
cout << endl << "fTemp : " << runData.fTemp[0].first;
cout << endl << "fRunName : " << runData.GetRunName()->Data();
cout << endl << "fRunTitle : " << runData.GetRunTitle()->Data();
cout << endl << "fSetup : " << runData.GetSetup()->Data();
cout << endl << "fField : " << runData.GetField();
cout << endl << "fTemp : " << runData.GetTemperature(1);
cout << endl << "noOfHistos : " << noOfHistos;
cout << endl << "fTimeResolution : " << runData.fTimeResolution;
cout << endl << "fTimeResolution : " << runData.GetTimeResolution();
for (Int_t i=0; i<noOfHistos; i++) {
cout << endl << "------";
cout << endl << i << " : t0 = " << runData.fT0s[i];
cout << endl << i << " : bkg bins = " << runData.fBkgBin[i].first << "..." << runData.fBkgBin[i].second;
cout << endl << i << " : good bins = " << runData.fGoodDataBin[i].first << "..." << runData.fGoodDataBin[i].second;
cout << endl << i << " : t0 = " << runData.GetT0(i);
cout << endl << i << " : bkg bins = " << runData.GetBkgBin(i).first << "..." << runData.GetBkgBin(i).second;
cout << endl << i << " : good bins = " << runData.GetGoodDataBin(i).first << "..." << runData.GetGoodDataBin(i).second;
}
cout << endl;
*/

2
src/external/TFitPofB-lib/classes/Makefile.am vendored
View File

@ -56,7 +56,7 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core
lib_LTLIBRARIES = libTFitPofB.la
libTFitPofB_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libTFitPofB_la_LIBADD = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_THREADS_LIBS) $(ROOT_LIBS)
libTFitPofB_la_LIBADD = $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS)
libTFitPofB_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
## For the moment do not build pkgconfig files for musrfit plug-ins...

8
src/external/TFitPofB-lib/classes/TBulkTriVortexFieldCalc.cpp vendored
View File

@ -128,9 +128,11 @@ TBulkTriVortexLondonFieldCalc::TBulkTriVortexLondonFieldCalc(const string& wisdo
fParam.resize(3);
fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS
int init_threads(fftw_init_threads());
if (init_threads)
fftw_plan_with_nthreads(2);
#endif /* HAVE_LIBFFTW3_THREADS */
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps];
@ -295,9 +297,11 @@ TBulkTriVortexMLFieldCalc::TBulkTriVortexMLFieldCalc(const string& wisdom, const
fParam.resize(3);
fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS
int init_threads(fftw_init_threads());
if (init_threads)
fftw_plan_with_nthreads(2);
#endif /* HAVE_LIBFFTW3_THREADS */
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps];
@ -465,9 +469,11 @@ TBulkTriVortexAGLFieldCalc::TBulkTriVortexAGLFieldCalc(const string& wisdom, con
fParam.resize(3);
fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS
int init_threads(fftw_init_threads());
if (init_threads)
fftw_plan_with_nthreads(2);
#endif /* HAVE_LIBFFTW3_THREADS */
fFFTin = new fftw_complex[(fSteps/2 + 1) * fSteps];
fFFTout = new double[fSteps*fSteps];
@ -655,9 +661,11 @@ TBulkTriVortexNGLFieldCalc::TBulkTriVortexNGLFieldCalc(const string& wisdom, con
fParam.resize(3);
fGridExists = false;
#ifdef HAVE_LIBFFTW3_THREADS
int init_threads(fftw_init_threads());
if (init_threads)
fftw_plan_with_nthreads(2);
#endif /* HAVE_LIBFFTW3_THREADS */
const unsigned int stepsSq(fSteps*fSteps);

2
src/external/TFitPofB-lib/classes/TPofTCalc.cpp vendored
View File

@ -65,11 +65,13 @@
TPofTCalc::TPofTCalc (const TPofBCalc *PofB, const string &wisdom, const vector<double> &par) : fWisdom(wisdom) {
#ifdef HAVE_LIBFFTW3_THREADS
int init_threads(fftw_init_threads());
if (!init_threads)
cout << "TPofTCalc::TPofTCalc: Couldn't initialize multiple FFTW-threads ..." << endl;
else
fftw_plan_with_nthreads(2);
#endif /* HAVE_LIBFFTW3_THREADS */
fNFFT = static_cast<int>(1.0/(gBar*par[1]*par[2]));
if (fNFFT % 2) {

2
src/external/libLFRelaxation/Makefile.am vendored
View File

@ -33,7 +33,7 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core
lib_LTLIBRARIES = libLFRelaxation.la
libLFRelaxation_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libLFRelaxation_la_LIBADD = $(PMUSR_LIBS) $(FFTW3_THREADS_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS)
libLFRelaxation_la_LIBADD = $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS)
libLFRelaxation_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
## For the moment do not build pkgconfig files for musrfit plug-ins...