diff --git a/ChangeLog b/ChangeLog index af6daf9b..93d1d42f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,14 @@ # ChangeLog #--------------------------------------------------------------------- +rather than updating this document, the changes can be followed here: + +https://gitlab.psi.ch/nemu/musrfit/activity + +or + +https://bitbucket.org/muonspin/musrfit/commits/all + changes since 0.18.0 =================================== diff --git a/acinclude.m4 b/acinclude.m4 index 0c0ad9d7..7d1ff84c 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -18,7 +18,7 @@ dnl The macro defines the following substitution variables dnl dnl ROOTCONF full path to root-config 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 ROOTINCDIR Where the ROOT headers are 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 ROOTRPATH Same as ROOTLIBDIR 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 Christian Holm Christensen dnl @@ -49,10 +49,10 @@ AC_DEFUN([ROOT_PATH], fi AC_PATH_PROG(ROOTCONF, root-config , 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" && \ - test ! x"$ROOTCINT" = "xno" ; then + test ! x"$ROOTCLING" = "xno" ; then # define some variables ROOTLIBDIR=`$ROOTCONF --libdir` diff --git a/doc/examples/UserFcn/Makefile.PUserFcn b/doc/examples/UserFcn/Makefile.PUserFcn index c2e9aeed..2557e897 100644 --- a/doc/examples/UserFcn/Makefile.PUserFcn +++ b/doc/examples/UserFcn/Makefile.PUserFcn @@ -46,11 +46,11 @@ clean:; @rm -f $(OBJS) *Dict* core* $(OBJS): %.o: %.cpp $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -# Generate the ROOT CINT dictionary +# Generate the ROOT CLING dictionary PUserFcnDict.cpp: PUserFcn.h PUserFcnLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^ + rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^ install: all @echo "Installing shared lib: libTApproximation.so" diff --git a/doc/examples/test-asy-MUD.msr b/doc/examples/test-asy-MUD.msr index 9c53c561..cd2afe95 100644 --- a/doc/examples/test-asy-MUD.msr +++ b/doc/examples/test-asy-MUD.msr @@ -3,7 +3,7 @@ MgB12H12 No2 ZF T=150 FITPARAMETER # Nr. Name Value Step Pos_Error Boundaries 1 alpha 1 0 none 0 2 - 2 asy 0.17503 -0.00082 0.00083 0 0.33 + 2 asy 0.17503 -0.00081 0.00083 0 0.33 3 rate 0.1649 -0.0016 0.0016 0 none 4 beta 0.892 -0.016 0.016 0.5 2 @@ -19,7 +19,7 @@ alpha 1 map 0 0 0 0 0 0 0 0 0 0 0 forward 1 backward 2 -background 79 391 80 409 # estimated bkg: 21.0224 / 17.1702 +background 79 391 80 409 # estimated bkg: 21.0833 / 17.2249 data 438 12785 436 12787 t0 432.0 431.0 fit 0 8 @@ -34,10 +34,10 @@ SAVE ############################################################### FOURIER -units Gauss # units either 'Gauss', 'MHz', or 'Mc/s' +units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s' fourier_power 12 apodization NONE # NONE, WEAK, MEDIUM, STRONG -plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE +plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL phase 8 #range_for_phase_correction 50.0 70.0 range 0 200 @@ -48,5 +48,5 @@ runs 1 range 0 8 0 0.25 ############################################################### -STATISTIC --- 2012-03-20 10:11:27 - chisq = 133.9, NDF = 99, chisq/NDF = 1.352819 +STATISTIC --- 2017-02-08 07:07:39 + chisq = 134.0, NDF = 99, chisq/NDF = 1.353150 diff --git a/doc/examples/test-histo-muMinus.msr b/doc/examples/test-histo-muMinus.msr index 795f4b5a..8bc3d7ad 100644 --- a/doc/examples/test-histo-muMinus.msr +++ b/doc/examples/test-histo-muMinus.msr @@ -5,11 +5,11 @@ FITPARAMETER 1 N_0 321.0 1.4 none 2 tau_0 1.9066 0.0038 none 0 none 3 Rate_0 0.0983 0.0052 none 0 none - 4 Freq_0 135.53824 0.00073 none + 4 Freq_0 135.53823 0.00073 none 5 N_1 306.1 1.3 none 6 tau_1 0.7409 0.0026 none 0 none - 7 Rate_1 0.026 0.027 none 0 none + 7 Rate_1 0.027 0.031 none 0 none 8 Freq_1 136.8968 0.0033 none 9 Asym_F1_0 0.0490 0.0015 none 0 none @@ -28,7 +28,7 @@ FITPARAMETER 20 N_bgk_F3 1.465 0.033 none 21 Asym_F4_0 0.0512 0.0015 none 0 none - 22 Asym_F4_1 0.0521 0.0029 none 0 none + 22 Asym_F4_1 0.0521 0.0030 none 0 none 23 Phase_F4 144.6 1.5 none 24 N_bgk_F4 2.311 0.034 none @@ -40,7 +40,7 @@ FITPARAMETER 29 Asym_F6_0 0.0502 0.0015 none 0 none 30 Asym_F6_1 0.0517 0.0030 none 0 none 31 Phase_F6 232.1 1.5 none - 32 N_bgk_F6 1.735 0.033 none + 32 N_bgk_F6 1.735 0.034 none 33 Asym_F7_0 0.0488 0.0015 none 0 none 34 Asym_F7_1 0.0575 0.0030 none 0 none @@ -48,12 +48,12 @@ FITPARAMETER 36 N_bgk_F7 1.593 0.033 none 37 Asym_F8_0 0.0547 0.0015 none 0 none - 38 Asym_F8_1 0.0468 0.0029 none 0 none + 38 Asym_F8_1 0.0468 0.0030 none 0 none 39 Phase_F8 321.7 1.4 none 40 N_bgk_F8 1.469 0.033 none 41 Asym_B1_0 0.0476 0.0015 none 0 none - 42 Asym_B1_1 0.0535 0.0029 none 0 none + 42 Asym_B1_1 0.0535 0.0030 none 0 none 43 Phase_B1 3.6 1.5 none 44 N_bgk_B1 1.378 0.033 none @@ -64,8 +64,8 @@ FITPARAMETER 49 Asym_B3_0 0.0494 0.0015 none 0 none 50 Asym_B3_1 0.0555 0.0030 none 0 none - 51 Phase_B3 98.1 1.5 none - 52 N_bgk_B3 0.969 0.032 none + 51 Phase_B3 98.2 1.5 none + 52 N_bgk_B3 0.968 0.032 none 53 Asym_B4_0 0.0505 0.0015 none 0 none 54 Asym_B4_1 0.0527 0.0030 none 0 none @@ -78,7 +78,7 @@ FITPARAMETER 60 N_bgk_B5 1.642 0.033 none 61 Asym_B6_0 0.0512 0.0015 none 0 none - 62 Asym_B6_1 0.0477 0.0029 none 0 none + 62 Asym_B6_1 0.0477 0.0030 none 0 none 63 Phase_B6 231.7 1.5 none 64 N_bgk_B6 1.650 0.033 none @@ -183,7 +183,7 @@ SAVE ############################################################### PLOT 4 (mu minus plot) -runs 1-16 +runs 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 range 0 9 ############################################################### @@ -191,9 +191,9 @@ FOURIER units Tesla # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s' fourier_power 14 apodization MEDIUM # NONE, WEAK, MEDIUM, STRONG -plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE -range 0.8 1.2 +plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE, PHASE_OPT_REAL +range 0.8 1.2 ############################################################### -STATISTIC --- 2016-04-25 17:05:56 +STATISTIC --- 2017-02-08 07:11:01 maxLH = 238962.5, NDF = 230264, maxLH/NDF = 1.037776 diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr index a5f492ae..03c0a24b 100644 --- a/src/classes/Makefile.PMusr +++ b/src/classes/Makefile.PMusr @@ -202,27 +202,27 @@ $(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp TLemRunHeaderDict.cxx: ../external/TLemRunHeader/TLemRunHeader.h ../external/TLemRunHeader/TLemRunHeaderLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ + rootcling -f $@ -c -p $^ TLemStatsDict.cxx: ../external/TLemRunHeader/TLemStats.h ../external/TLemRunHeader/TLemStatsLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ + rootcling -f $@ -c -p $^ PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ + rootcling -f $@ -c -p $^ PMusrCanvasDict.cpp: ../include/PMusrCanvas.h ../include/PMusrCanvasLinkDef.h @echo "Generating dictionary $@..." - rootcint -v -f $@ -c -p $^ + rootcling -v -f $@ -c -p $^ PMusrT0Dict.cpp: ../include/PMusrT0.h ../include/PMusrT0LinkDef.h @echo "Generating dictionary $@..." - rootcint -v -f $@ -c -p $^ + rootcling -v -f $@ -c -p $^ PUserFcnBaseDict.cpp: ../include/PUserFcnBase.h ../include/PUserFcnBaseLinkDef.h @echo "Generating dictionary $@..." - rootcint -v -f $@ -c -p $^ + rootcling -v -f $@ -c -p $^ install: leminstall musrinstall diff --git a/src/classes/Makefile.PUserFcn b/src/classes/Makefile.PUserFcn index 4ec31d92..6dd9b43d 100644 --- a/src/classes/Makefile.PUserFcn +++ b/src/classes/Makefile.PUserFcn @@ -89,7 +89,7 @@ $(OBJS): %.o: %.cpp PUserFcnDict.cpp: ../include/PUserFcn.h ../include/PUserFcnLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ + rootcling -f $@ -c -p $^ install: all @echo "Installing shared lib: libPUserFcn.so ( you must be root ;-) )" diff --git a/src/classes/Makefile.am b/src/classes/Makefile.am index f3020253..77cb1d8f 100644 --- a/src/classes/Makefile.am +++ b/src/classes/Makefile.am @@ -103,7 +103,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/BMWtools/BMWStartupHandlerLinkDef.h b/src/external/BMWtools/BMWStartupHandlerLinkDef.h index 73640057..f1008135 100644 --- a/src/external/BMWtools/BMWStartupHandlerLinkDef.h +++ b/src/external/BMWtools/BMWStartupHandlerLinkDef.h @@ -4,8 +4,6 @@ Author: Bastian M. Wojek - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/BMWtools/Makefile.am b/src/external/BMWtools/Makefile.am index a815513d..9fd75b8b 100644 --- a/src/external/BMWtools/Makefile.am +++ b/src/external/BMWtools/Makefile.am @@ -33,7 +33,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/MagProximity/Makefile.am b/src/external/MagProximity/Makefile.am index f53337c5..23197c95 100644 --- a/src/external/MagProximity/Makefile.am +++ b/src/external/MagProximity/Makefile.am @@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/MusrRoot/Makefile.am b/src/external/MusrRoot/Makefile.am index 12d13f71..0b5dcb05 100644 --- a/src/external/MusrRoot/Makefile.am +++ b/src/external/MusrRoot/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/Nonlocal/Makefile.am b/src/external/Nonlocal/Makefile.am index a6e217b9..1ca1d2cb 100644 --- a/src/external/Nonlocal/Makefile.am +++ b/src/external/Nonlocal/Makefile.am @@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/Nonlocal/PNL_PippardFitter.h b/src/external/Nonlocal/PNL_PippardFitter.h index 02502634..afb5f696 100644 --- a/src/external/Nonlocal/PNL_PippardFitter.h +++ b/src/external/Nonlocal/PNL_PippardFitter.h @@ -31,9 +31,9 @@ #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 -#ifdef __CINT__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include #include "PUserFcnBase.h" diff --git a/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h b/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h index de5b24c1..b31feacc 100644 --- a/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h +++ b/src/external/Nonlocal/PNL_StartupHandlerLinkDef.h @@ -5,8 +5,6 @@ Author: Andreas Suter e-mail: andreas.suter@psi.ch - $Id$ - ***************************************************************************/ /*************************************************************************** diff --git a/src/external/TLemRunHeader/Makefile.am b/src/external/TLemRunHeader/Makefile.am index 0d927b9d..782e1bea 100644 --- a/src/external/TLemRunHeader/Makefile.am +++ b/src/external/TLemRunHeader/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core %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 diff --git a/src/external/libBNMR/Makefile.am b/src/external/libBNMR/Makefile.am index 8023d07b..f099256c 100644 --- a/src/external/libBNMR/Makefile.am +++ b/src/external/libBNMR/Makefile.am @@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *~ core %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 diff --git a/src/external/libBNMR/Makefile.libBNMR b/src/external/libBNMR/Makefile.libBNMR index 0762594d..d0fecfc6 100644 --- a/src/external/libBNMR/Makefile.libBNMR +++ b/src/external/libBNMR/Makefile.libBNMR @@ -46,11 +46,11 @@ clean:; @rm -f $(OBJS) *Dict* core* $(OBJS): %.o: %.cpp $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< -# Generate the ROOT CINT dictionary +# Generate the ROOT CLING dictionary TlibBNMRDict.cpp: TBNMR.h TBNMRLinkDef.h @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^ + rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^ install: all @echo "Installing shared lib: libTApproximation.so" diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am index 6cb04abe..032aa1eb 100644 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ b/src/external/libCalcMeanFieldsLEM/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/libFitPofB/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am index 8d6bf04f..0726d0d0 100644 --- a/src/external/libFitPofB/classes/Makefile.am +++ b/src/external/libFitPofB/classes/Makefile.am @@ -50,7 +50,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ ../include/*~ core %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 diff --git a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h index 1488b203..f918a151 100644 --- a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h @@ -34,9 +34,9 @@ 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 -#ifdef __CINT__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" /** diff --git a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h index 24de60a9..8fa7da44 100644 --- a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h @@ -35,9 +35,9 @@ 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 -#ifdef __CINT__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" //-------------------- diff --git a/src/external/libFitPofB/include/TPofTCalc.h b/src/external/libFitPofB/include/TPofTCalc.h index be0bb3da..34769b20 100644 --- a/src/external/libFitPofB/include/TPofTCalc.h +++ b/src/external/libFitPofB/include/TPofTCalc.h @@ -32,9 +32,9 @@ #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 -#ifdef __CINT__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" #include diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am index dbbbf9ae..7edbd1c3 100644 --- a/src/external/libGapIntegrals/Makefile.am +++ b/src/external/libGapIntegrals/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/libGbGLF/Makefile.am b/src/external/libGbGLF/Makefile.am index 8aaad4bc..61c9d2bc 100644 --- a/src/external/libGbGLF/Makefile.am +++ b/src/external/libGbGLF/Makefile.am @@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *~ core %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 diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am index 0ef6a8d8..3b6ca9f3 100644 --- a/src/external/libLFRelaxation/Makefile.am +++ b/src/external/libLFRelaxation/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index 7defba45..1b000761 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -39,9 +39,9 @@ using namespace std; #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 -#ifdef __CINT__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" #include "BMWIntegrator.h" diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am index 99a4de90..13aeba14 100644 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ b/src/external/libPhotoMeissner/classes/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core %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 diff --git a/src/external/libSpinValve/classes/Makefile.am b/src/external/libSpinValve/classes/Makefile.am index ec4033e7..59e5a177 100644 --- a/src/external/libSpinValve/classes/Makefile.am +++ b/src/external/libSpinValve/classes/Makefile.am @@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core %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 diff --git a/src/external/libZFRelaxation/Makefile.am b/src/external/libZFRelaxation/Makefile.am index ef04d966..8389b0bf 100644 --- a/src/external/libZFRelaxation/Makefile.am +++ b/src/external/libZFRelaxation/Makefile.am @@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core %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 diff --git a/src/include/PMusr.h b/src/include/PMusr.h index 1d09b088..11884323 100644 --- a/src/include/PMusr.h +++ b/src/include/PMusr.h @@ -37,9 +37,9 @@ using namespace std; #include // the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower -#ifdef __CINT__ -typedef struct { char a[7]; } __float128; // needed since cint doesn't know it -#endif +//#ifdef __CINT__ +//typedef struct { char a[7]; } __float128; // needed since cint doesn't know it +//#endif #include "fftw3.h" #define PMUSR_SUCCESS 0 diff --git a/src/include/PMusrCanvas.h b/src/include/PMusrCanvas.h index d61392c2..367a7e71 100644 --- a/src/include/PMusrCanvas.h +++ b/src/include/PMusrCanvas.h @@ -45,10 +45,10 @@ #include #include "PMusr.h" -#ifndef __MAKECINT__ +#ifndef __MAKECLING__ #include "PMsrHandler.h" #include "PRunListCollection.h" -#endif // __MAKECINT__ +#endif // __MAKECLING__ #define YINFO 0.1 #define YTITLE 0.95 @@ -197,7 +197,7 @@ typedef vector PMusrCanvasAsciiDumpVector; //-------------------------------------------------------------------------- /** - *

The preprocessor tag __MAKECINT__ is used to hide away from rootcint + *

The preprocessor tag __MAKECLING__ is used to hide away from rootcling * the overly complex spirit header files. */ class PMusrCanvas : public TObject, public TQObject @@ -216,10 +216,10 @@ class PMusrCanvas : public TObject, public TQObject virtual Bool_t IsValid() { return fValid; } -#ifndef __MAKECINT__ +#ifndef __MAKECLING__ virtual void SetMsrHandler(PMsrHandler *msrHandler); virtual void SetRunListCollection(PRunListCollection *runList) { fRunList = runList; } -#endif // __MAKECINT__ +#endif // __MAKECLING__ virtual void SetTimeout(Int_t ival); virtual void UpdateParamTheoryPad(); @@ -277,10 +277,10 @@ class PMusrCanvas : public TObject, public TQObject TH1F *fHistoFrame; ///< fHistoFrame is a 'global' frame needed in order to plot histograms with (potentially) different x-frames -#ifndef __MAKECINT__ +#ifndef __MAKECLING__ PMsrHandler *fMsrHandler; ///< msr-file handler PRunListCollection *fRunList; ///< data handler -#endif // __MAKECINT__ +#endif // __MAKECLING__ PMusrCanvasDataSet fDataAvg; ///< set of all averaged data to be plotted (asymmetry/single histogram) diff --git a/src/include/PMusrT0.h b/src/include/PMusrT0.h index b5a47c2f..35674986 100644 --- a/src/include/PMusrT0.h +++ b/src/include/PMusrT0.h @@ -42,9 +42,9 @@ #include #include "PMusr.h" -#ifndef __MAKECINT__ +#ifndef __MAKECLING__ #include "PMsrHandler.h" -#endif // __MAKECINT__ +#endif // __MAKECLING__ #define PMUSRT0_FORWARD 0 #define PMUSRT0_BACKWARD 1 @@ -113,7 +113,7 @@ class PMusrT0Data { //-------------------------------------------------------------------------- /** *

Handles the musrt0 graphical user interface. - *

The preprocessor tag __MAKECINT__ is used to hide away from rootcint + *

The preprocessor tag __MAKECLING__ is used to hide away from rootcling * the overly complex spirit header files. */ class PMusrT0 : public TObject, public TQObject @@ -131,18 +131,18 @@ class PMusrT0 : public TObject, public TQObject virtual void Quit(); // SLOT virtual void SetTimeout(Int_t timeout); -#ifndef __MAKECINT__ +#ifndef __MAKECLING__ virtual void SetMsrHandler(PMsrHandler *msrHandler); -#endif // __MAKECINT__ +#endif // __MAKECLING__ virtual void InitT0(); virtual void InitDataAndBkg(); virtual Int_t GetStatus() { return fStatus; } private: -#ifndef __MAKECINT__ +#ifndef __MAKECLING__ PMsrHandler *fMsrHandler; ///< msr-file handler -#endif // __MAKECINT__ +#endif // __MAKECLING__ Int_t fTimeout; ///< timeout after which the Done signal should be emited. If timeout <= 0, no timeout is taking place Bool_t fValid; ///< true if raw data set are available, otherwise false diff --git a/src/musredit_qt5/PMusrEditAbout.cpp b/src/musredit_qt5/PMusrEditAbout.cpp index 471a43d9..614b9610 100644 --- a/src/musredit_qt5/PMusrEditAbout.cpp +++ b/src/musredit_qt5/PMusrEditAbout.cpp @@ -27,6 +27,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ +#include "git-revision.h" #include "PMusrEditAbout.h" //--------------------------------------------------------------------------- @@ -37,6 +38,8 @@ PMusrEditAbout::PMusrEditAbout(QWidget *parent, Qt::WindowFlags f) : QDialog(par { setupUi(this); + fGitRev_label->setText(QString("git: %1").arg(GIT_REVISION)); + setModal(true); } diff --git a/src/musredit_qt5/forms/PMusrEditAbout.ui b/src/musredit_qt5/forms/PMusrEditAbout.ui index 4c1fdc6d..4917bf82 100644 --- a/src/musredit_qt5/forms/PMusrEditAbout.ui +++ b/src/musredit_qt5/forms/PMusrEditAbout.ui @@ -14,16 +14,16 @@ Musr Edit About - + :/images/musrfit.xpm:/images/musrfit.xpm - + - 11 - 11 + 12 + 12 371 - 169 + 161 @@ -46,6 +46,23 @@ p, li { white-space: pre-wrap; } + + + + + 75 + true + true + + + + git: + + + Qt::AlignCenter + + + diff --git a/src/musrt0.cpp b/src/musrt0.cpp index 272ebe18..197e60b7 100644 --- a/src/musrt0.cpp +++ b/src/musrt0.cpp @@ -111,7 +111,7 @@ Bool_t musrt0_item(TApplication &app, PMsrHandler *msrHandler, PMusrT0Data &data // set 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); // check if only t0, data-, and bkg-range is wished, if not, only initialize t0 at this point diff --git a/src/musrview.cpp b/src/musrview.cpp index c416b71d..cc0d947b 100644 --- a/src/musrview.cpp +++ b/src/musrview.cpp @@ -330,7 +330,7 @@ int main(int argc, char *argv[]) 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->SetRunListCollection(runListCollection); diff --git a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h index 0224031c..d806ffcf 100644 --- a/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h +++ b/src/tests/MuTransition/PSimulateMuTransitionLinkDef.h @@ -29,7 +29,7 @@ ***************************************************************************/ // changed for root6 -#ifdef __CLING__ +#ifdef __CINT__ #pragma link off all globals; #pragma link off all classes;