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

more changes towards musrfit/DKS/root6.

Browse Source
This commit is contained in:
suter_a 2017-02-08 11:16:27 +01:00
parent 18d037fdf2
commit e8f692b42c
25 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
acinclude.m4
View File

@ -18,7 +18,7 @@ dnl The macro defines the following substitution variables
dnl dnl
dnl ROOTCONF full path to root-config dnl ROOTCONF full path to root-config
dnl ROOTEXEC full path to root dnl ROOTEXEC full path to root
dnl ROOTCINT full path to rootcint dnl ROOTCLING full path to rootcling
dnl ROOTLIBDIR Where the ROOT libraries are dnl ROOTLIBDIR Where the ROOT libraries are
dnl ROOTINCDIR Where the ROOT headers are dnl ROOTINCDIR Where the ROOT headers are
dnl ROOTETCDIR Where the ROOT configuration is dnl ROOTETCDIR Where the ROOT configuration is
@ -29,7 +29,7 @@ dnl ROOTAUXLIBS Auxilary libraries and linker flags for ROOT
dnl ROOTAUXCFLAGS Auxilary compiler flags dnl ROOTAUXCFLAGS Auxilary compiler flags
dnl ROOTRPATH Same as ROOTLIBDIR dnl ROOTRPATH Same as ROOTLIBDIR
dnl dnl
dnl The macro will fail if root-config and rootcint isn't found. dnl The macro will fail if root-config and rootcling isn't found.
dnl dnl
dnl Christian Holm Christensen <cholm@nbi.dk> dnl Christian Holm Christensen <cholm@nbi.dk>
dnl dnl
@ -49,10 +49,10 @@ AC_DEFUN([ROOT_PATH],
fi fi
AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin) AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)
AC_PATH_PROG(ROOTEXEC, root , no, $rootbin) AC_PATH_PROG(ROOTEXEC, root , no, $rootbin)
AC_PATH_PROG(ROOTCINT, rootcint , no, $rootbin) AC_PATH_PROG(ROOTCLING, rootcling, no, $rootbin)
if test ! x"$ROOTCONF" = "xno" && \ if test ! x"$ROOTCONF" = "xno" && \
test ! x"$ROOTCINT" = "xno" ; then test ! x"$ROOTCLING" = "xno" ; then
# define some variables # define some variables
ROOTLIBDIR=`$ROOTCONF --libdir` ROOTLIBDIR=`$ROOTCONF --libdir`

2
src/classes/Makefile.am
View File

@ -105,7 +105,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la

7
src/classes/PFourier.cpp
View File

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

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

@ -33,7 +33,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libBMWtools.la lib_LTLIBRARIES = libBMWtools.la

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

@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPMagProximityFitter.la lib_LTLIBRARIES = libPMagProximityFitter.la

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

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libTMusrRunHeader.la lib_LTLIBRARIES = libTMusrRunHeader.la

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

@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPNL_PippardFitter.la lib_LTLIBRARIES = libPNL_PippardFitter.la

6
src/external/Nonlocal/PNL_PippardFitter.h vendored
View File

@ -31,9 +31,9 @@
#define _PNL_PIPPARDFITTER_H_ #define _PNL_PIPPARDFITTER_H_
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CLING__ //#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it //typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif //#endif
#include <fftw3.h> #include <fftw3.h>
#include "PUserFcnBase.h" #include "PUserFcnBase.h"

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

@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core
%Dict.cxx %Dict.h: %.h %LinkDef.h %Dict.cxx %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^ @ROOTCLING@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libTLemRunHeader.la lib_LTLIBRARIES = libTLemRunHeader.la

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

@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core CLEANFILES = *Dict.cpp *Dict.h *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libBNMR.la lib_LTLIBRARIES = libBNMR.la

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

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libCalcMeanFieldsLEM.la lib_LTLIBRARIES = libCalcMeanFieldsLEM.la

2
src/external/libFitPofB/classes/Makefile.am vendored
View File

@ -50,7 +50,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ ../include/*~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ ../include/*~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libFitPofB.la lib_LTLIBRARIES = libFitPofB.la

6
src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h vendored
View File

@ -34,9 +34,9 @@
using namespace std; using namespace std;
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CLING__ //#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it //typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif //#endif
#include "fftw3.h" #include "fftw3.h"
/** /**

6
src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h vendored
View File

@ -35,9 +35,9 @@
using namespace std; using namespace std;
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CLING__ //#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it //typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif //#endif
#include "fftw3.h" #include "fftw3.h"
//-------------------- //--------------------

6
src/external/libFitPofB/include/TPofTCalc.h vendored
View File

@ -32,9 +32,9 @@
#include "TPofBCalc.h" #include "TPofBCalc.h"
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CLING__ //#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it //typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif //#endif
#include "fftw3.h" #include "fftw3.h"
#include <string> #include <string>

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

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libGapIntegrals.la lib_LTLIBRARIES = libGapIntegrals.la

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

@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core CLEANFILES = *Dict.cpp *Dict.h *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libGbGLF.la lib_LTLIBRARIES = libGbGLF.la

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

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libLFRelaxation.la lib_LTLIBRARIES = libLFRelaxation.la

6
src/external/libLFRelaxation/TLFRelaxation.h vendored
View File

@ -39,9 +39,9 @@ using namespace std;
#include "PUserFcnBase.h" #include "PUserFcnBase.h"
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CLING__ //#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it //typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif //#endif
#include "fftw3.h" #include "fftw3.h"
#include "BMWIntegrator.h" #include "BMWIntegrator.h"

2
src/external/libPhotoMeissner/classes/Makefile.am vendored
View File

@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPPhotoMeissner.la lib_LTLIBRARIES = libPPhotoMeissner.la

2
src/external/libSpinValve/classes/Makefile.am vendored
View File

@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core
%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPSpinValve.la lib_LTLIBRARIES = libPSpinValve.la

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

@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h %Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libZFRelaxation.la lib_LTLIBRARIES = libZFRelaxation.la

6
src/include/PMusr.h
View File

@ -37,9 +37,9 @@ using namespace std;
#include <TString.h> #include <TString.h>
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
#ifdef __CLING__ //#ifdef __CINT__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it //typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif //#endif
#include "fftw3.h" #include "fftw3.h"
#define PMUSR_SUCCESS 0 #define PMUSR_SUCCESS 0

2
src/musrt0.cpp
View File

@ -111,7 +111,7 @@ Bool_t musrt0_item(TApplication &app, PMsrHandler *msrHandler, PMusrT0Data &data
// set timeout // set timeout
musrT0->SetTimeout(timeout); musrT0->SetTimeout(timeout);
// set the msr-file handler. The handler cannot be transfered at construction time since rootcint is not able to handle the PMsrHandler class // set the msr-file handler. The handler cannot be transfered at construction time since rootcling is not able to handle the PMsrHandler class
musrT0->SetMsrHandler(msrHandler); musrT0->SetMsrHandler(msrHandler);
// check if only t0, data-, and bkg-range is wished, if not, only initialize t0 at this point // check if only t0, data-, and bkg-range is wished, if not, only initialize t0 at this point

2
src/musrview.cpp
View File

@ -330,7 +330,7 @@ int main(int argc, char *argv[])
musrCanvas->SetTimeout(timeout); musrCanvas->SetTimeout(timeout);
// ugly but rootcint cannot handle the spirit-parser framework // ugly but rootcling cannot handle the spirit-parser framework
musrCanvas->SetMsrHandler(msrHandler); musrCanvas->SetMsrHandler(msrHandler);
musrCanvas->SetRunListCollection(runListCollection); musrCanvas->SetRunListCollection(runListCollection);