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

adopted dks to root6 (branch dks6). Not yet tested.

Browse Source
This commit is contained in:
suter_a 2017-02-07 16:12:49 +01:00
parent 38c4293d58
commit 18d037fdf2
66 changed files with 160 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -1209,6 +1209,9 @@ case "${host_cpu}" in
;;
esac
CXXFLAGS="-std=c++11 ${CXXFLAGS}"
AC_SUBST(CXXFLAGS)
LOCAL_BIN_CXXFLAGS="${CPUFLAGS} -Wall -Wno-trigraphs"
LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}"
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS}"
@ -1233,7 +1236,7 @@ case "$host" in
;;
*-*-darwin*)
ARCH=DARWIN
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__"
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_"
;;
*)
ARCH=OTHERUNIX

4
doc/examples/UserFcn/PUserFcnLinkDef.h
View File

@ -4,7 +4,7 @@
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -12,4 +12,4 @@
#pragma link C++ class PUserFcn+;
#endif //__CINT__
#endif //__CLING__

10
src/classes/Makefile.am
View File

@ -86,6 +86,14 @@ dict_cpp_sources = \
dict_cpp_sources_userFcn = \
PUserFcnBaseDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PFourierCanvasDict_rdict.pcm \
PMusrCanvasDict_rdict.pcm \
PMusrT0Dict_rdict.pcm \
PStartupHandlerDict_rdict.pcm \
PUserFcnBaseDict_rdict.pcm
include_HEADERS = $(h_sources) $(h_sources_userFcn)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources) $(h_linkdef_userFcn) $(dict_h_sources_userFcn)
@ -94,7 +102,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) $(dict_cpp_sources_userFcn) $(dict_h_sources_userFcn)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
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) $^

2
src/classes/PFourier.cpp
View File

@ -625,7 +625,7 @@ TH1F* PFourier::GetPhaseOptRealFourier(const TH1F *re, const TH1F *im, vector<Do
phase.resize(2); // c0, c1
TAxis *axis = re->GetXaxis();
const TAxis *axis = re->GetXaxis();
Int_t minBin = 1;
Int_t maxBin = axis->GetNbins();

4
src/classes/PRunAsymmetry.cpp
View File

@ -757,8 +757,8 @@ Bool_t PRunAsymmetry::SubtractEstimatedBkg()
beamPeriod = 0.0;
// check if start and end are in proper order
UInt_t start[2] = {fRunInfo->GetBkgRange(0), fRunInfo->GetBkgRange(2)};
UInt_t end[2] = {fRunInfo->GetBkgRange(1), fRunInfo->GetBkgRange(3)};
Int_t start[2] = {fRunInfo->GetBkgRange(0), fRunInfo->GetBkgRange(2)};
Int_t end[2] = {fRunInfo->GetBkgRange(1), fRunInfo->GetBkgRange(3)};
for (UInt_t i=0; i<2; i++) {
if (end[i] < start[i]) {
cout << endl << "PRunAsymmetry::SubtractEstimatedBkg(): end = " << end[i] << " > start = " << start[i] << "! Will swap them!";

4
src/classes/PRunAsymmetryRRF.cpp
View File

@ -746,8 +746,8 @@ Bool_t PRunAsymmetryRRF::SubtractEstimatedBkg()
beamPeriod = 0.0;
// check if start and end are in proper order
UInt_t start[2] = {fRunInfo->GetBkgRange(0), fRunInfo->GetBkgRange(2)};
UInt_t end[2] = {fRunInfo->GetBkgRange(1), fRunInfo->GetBkgRange(3)};
UInt_t start[2] = {(UInt_t)fRunInfo->GetBkgRange(0), (UInt_t)fRunInfo->GetBkgRange(2)};
UInt_t end[2] = {(UInt_t)fRunInfo->GetBkgRange(1), (UInt_t)fRunInfo->GetBkgRange(3)};
for (UInt_t i=0; i<2; i++) {
if (end[i] < start[i]) {
cout << endl << "PRunAsymmetryRRF::SubtractEstimatedBkg(): end = " << end[i] << " > start = " << start[i] << "! Will swap them!";

4
src/external/BMWtools/BMWStartupHandlerLinkDef.h vendored
View File

@ -29,7 +29,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -37,6 +37,6 @@
#pragma link C++ class BMWStartupHandler+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

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

@ -19,6 +19,9 @@ cpp_sources = \
dict_cpp_sources = \
BMWStartupHandlerDict.cpp
pcmdir = $(libdir)
pcm_DATA = BMWStartupHandlerDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -27,7 +30,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^

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

@ -23,6 +23,11 @@ dict_cpp_sources = \
PMagProximityFitterDict.cpp \
PMPStartupHandlerDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PMagProximityFitterDict_rdict.pcm \
PMPStartupHandlerDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -31,7 +36,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^

2
src/external/MagProximity/PMPStartupHandlerLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/external/MagProximity/PMagProximityFitterLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

1
src/external/MuSR_software/Class_MuSR_PSI/Makefile.am vendored
View File

@ -1,5 +1,4 @@
## Process this file with automake to create Makefile.in
## $Id$
h_sources = MuSR_td_PSI_bin.h
cpp_sources = MuSR_td_PSI_bin.cpp

2
src/external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp vendored
View File

@ -205,7 +205,7 @@ typedef long int Int32;
#else /* other operating system */
/* 32 bit word length */
#if (defined(_WIN32) || defined(__linux__) || defined(_WIN32GCC))
#if (defined(_WIN32) || defined(__linux__) || defined(_Darwin_) || defined(_WIN32GCC))
typedef short Int16;
typedef int Int32;
#else

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

@ -1,3 +1 @@
## $Id$
SUBDIRS = Class_MuSR_PSI

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

@ -15,6 +15,9 @@ cpp_sources = \
dict_cpp_sources = \
TMusrRunHeaderDict.cpp
pcmdir = $(libdir)
pcm_DATA = TMusrRunHeaderDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^

2
src/external/MusrRoot/TMusrRunHeaderLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

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

@ -23,6 +23,11 @@ dict_cpp_sources = \
PNL_PippardFitterDict.cpp \
PNL_StartupHandlerDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PNL_PippardFitterDict_rdict.pcm \
PNL_StartupHandlerDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -31,7 +36,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^

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

@ -31,7 +31,7 @@
#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__
#ifdef __CLING__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
#include <fftw3.h>

2
src/external/Nonlocal/PNL_PippardFitterLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/external/Nonlocal/PNL_StartupHandlerLinkDef.h vendored
View File

@ -29,7 +29,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

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

@ -20,6 +20,11 @@ dict_cpp_sources = \
TLemStatsDict.cxx \
TLemRunHeaderDict.cxx
pcmdir = $(libdir)
pcm_DATA = \
TLemStatsDict_rdict.pcm \
TLemRunHeaderDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -28,7 +33,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cxx *Dict.h *~ core
CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core
%Dict.cxx %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^

2
src/external/TLemRunHeader/TLemRunHeaderLinkDef.h vendored
View File

@ -1,4 +1,4 @@
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/external/TLemRunHeader/TLemStatsLinkDef.h vendored
View File

@ -1,4 +1,4 @@
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

4
src/external/libBNMR/TBNMRLinkDef.h vendored
View File

@ -29,7 +29,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -40,4 +40,4 @@
#pragma link C++ class SExpRlx+;
#pragma link C++ class MLRes+;
#endif //__CINT__
#endif //__CLING__

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

@ -15,6 +15,9 @@ cpp_sources = \
dict_cpp_sources = \
TCalcMeanFieldsLEMDict.cpp
pcmdir = $(libdir)
pcm_DATA = TCalcMeanFieldsLEMDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^

4
src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -39,6 +39,6 @@
#pragma link C++ class TMeanFieldsForScTrilayer+;
#pragma link C++ class TMeanFieldsForScTrilayerWithInsulator+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

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

@ -33,6 +33,12 @@ dict_cpp_sources = \
TSkewedGssDict.cpp \
TVortexDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
TLondon1DDict_rdict.pcm \
TSkewedGssDict_rdict.pcm \
TVortexDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -41,7 +47,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ ../include/*~ core
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) $^

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

@ -34,7 +34,7 @@
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__
#ifdef __CLING__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
#include "fftw3.h"

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

@ -35,7 +35,7 @@
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__
#ifdef __CLING__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
#include "fftw3.h"

4
src/external/libFitPofB/include/TLondon1DLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -41,6 +41,6 @@
#pragma link C++ class TLondon1D3LS+;
//#pragma link C++ class TLondon1D4L+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

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

@ -32,7 +32,7 @@
#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__
#ifdef __CLING__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
#include "fftw3.h"

4
src/external/libFitPofB/include/TSkewedGssLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -35,6 +35,6 @@
#pragma link C++ class TSkewedGss+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

4
src/external/libFitPofB/include/TVortexLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -46,6 +46,6 @@
#pragma link C++ class TBulkAnisotropicTriVortexAGL+;
#pragma link C++ class TBulkAnisotropicTriVortexAGLGlobal+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

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

@ -15,6 +15,9 @@ cpp_sources = \
dict_cpp_sources = \
TGapIntegralsDict.cpp
pcmdir = $(libdir)
pcm_DATA = TGapIntegralsDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^

4
src/external/libGapIntegrals/TGapIntegralsLinkDef.h vendored
View File

@ -28,7 +28,7 @@
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -57,6 +57,6 @@
#pragma link C++ class TLambdaInvPowerLaw+;
#pragma link C++ class TFilmMagnetizationDWave+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

4
src/external/libGbGLF/PGbGLFLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -35,6 +35,6 @@
#pragma link C++ class PGbGLF+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

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

@ -15,6 +15,9 @@ cpp_sources = \
dict_cpp_sources = \
TLFRelaxationDict.cpp
pcmdir = $(libdir)
pcm_DATA = TLFRelaxationDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^

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

@ -39,7 +39,7 @@ 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__
#ifdef __CLING__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
#include "fftw3.h"

4
src/external/libLFRelaxation/TLFRelaxationLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -40,6 +40,6 @@
#pragma link C++ class TLFDynSG+;
#pragma link C++ class TLFSGInterpolation+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

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

@ -20,6 +20,11 @@ dict_cpp_sources = \
PStartupHandler_PMDict.cpp \
PPhotoMeissnerDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PPhotoMeissnerDict_rdict.pcm \
PStartupHandler_PMDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)

4
src/external/libPhotoMeissner/include/PPhotoMeissner.h vendored
View File

@ -57,8 +57,8 @@ class PPhotoMeissner : public PUserFcnBase
Bool_t fValid; ///< flag indicating if initialization went through smoothly
static const Double_t fDegToRad = 0.0174532925199432955;
static const Double_t fTwoPi = 6.28318530717958623;
constexpr static const Double_t fDegToRad = 0.0174532925199432955;
constexpr static const Double_t fTwoPi = 6.28318530717958623;
Double_t InuMinus(const Double_t nu, const Double_t x) const;
Double_t FieldFilm(const Double_t z, const vector<Double_t> &par) const;

2
src/external/libPhotoMeissner/include/PPhotoMeissnerLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/external/libPhotoMeissner/include/PStartupHandler_PMLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

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

@ -20,6 +20,11 @@ dict_cpp_sources = \
PStartupHandler_SVDict.cpp \
PSkewedLorentzianDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PStartupHandler_SVDict_rdict.pcm \
PSkewedLorentzianDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)

4
src/external/libSpinValve/include/PSkewedLorentzian.h vendored
View File

@ -59,8 +59,8 @@ class PSkewedLorentzian : public PUserFcnBase
UInt_t fNoOfFields; ///< number of sampling points in field around the Lorentzian peak
Double_t fRange; ///< range in which the sampling points are placed, given in units of \beta(1\pm\Delta)
static const Double_t fDegToRad = 0.0174532925199432955;
static const Double_t fTwoPi = 6.28318530717958623;
constexpr static const Double_t fDegToRad = 0.0174532925199432955;
constexpr static const Double_t fTwoPi = 6.28318530717958623;
// definition of the class for the ROOT dictionary
ClassDef(PSkewedLorentzian, 1)

2
src/external/libSpinValve/include/PSkewedLorentzianLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/external/libSpinValve/include/PStartupHandler_SVLinkDef.h vendored
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

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

@ -15,6 +15,9 @@ cpp_sources = \
dict_cpp_sources = \
ZFRelaxationDict.cpp
pcmdir = $(libdir)
pcm_DATA = ZFRelaxationDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
@ -23,7 +26,7 @@ AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core
CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^

4
src/external/libZFRelaxation/ZFRelaxationLinkDef.h vendored
View File

@ -27,7 +27,7 @@
***************************************************************************/
// root dictionary stuff --------------------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -37,6 +37,6 @@
#pragma link C++ class ZFMagExp+;
#pragma link C++ class UniaxialStatGssKT+;
#endif //__CINT__
#endif //__CLING__
// root dictionary stuff --------------------------------------------------

2
src/include/PFourierCanvasLinkDef.h
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/include/PMusr.h
View File

@ -37,7 +37,7 @@ using namespace std;
#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
#ifdef __CINT__
#ifdef __CLING__
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
#endif
#include "fftw3.h"

2
src/include/PMusrCanvasLinkDef.h
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/include/PMusrT0LinkDef.h
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/include/PStartupHandlerLinkDef.h
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/include/PUserFcnBaseLinkDef.h
View File

@ -27,7 +27,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

31
src/musredit_qt5/forms/PPrefsDialog.ui
View File

@ -45,7 +45,7 @@
<x>10</x>
<y>10</y>
<width>421</width>
<height>25</height>
<height>35</height>
</rect>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
@ -74,6 +74,19 @@
</item>
</layout>
</widget>
<widget class="QPushButton" name="fDefaultPath_pushButton">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>421</width>
<height>31</height>
</rect>
</property>
<property name="text">
<string>Change Default Search Paths</string>
</property>
</widget>
</widget>
<widget class="QWidget" name="fMusrfit_tab">
<attribute name="title">
@ -121,9 +134,9 @@
<widget class="QCheckBox" name="fTitleFromData_checkBox">
<property name="geometry">
<rect>
<x>170</x>
<x>190</x>
<y>10</y>
<width>171</width>
<width>241</width>
<height>23</height>
</rect>
</property>
@ -134,9 +147,9 @@
<widget class="QCheckBox" name="fPerRunBlockChisq_checkBox">
<property name="geometry">
<rect>
<x>170</x>
<x>190</x>
<y>35</y>
<width>191</width>
<width>241</width>
<height>22</height>
</rect>
</property>
@ -147,9 +160,9 @@
<widget class="QCheckBox" name="fEstimateN0_checkBox">
<property name="geometry">
<rect>
<x>170</x>
<x>190</x>
<y>60</y>
<width>161</width>
<width>241</width>
<height>22</height>
</rect>
</property>
@ -167,7 +180,7 @@
<rect>
<x>10</x>
<y>10</y>
<width>141</width>
<width>421</width>
<height>22</height>
</rect>
</property>
@ -180,7 +193,7 @@
<rect>
<x>10</x>
<y>40</y>
<width>231</width>
<width>421</width>
<height>21</height>
</rect>
</property>

2
src/tests/MeissnerNonMuSR/PMeissnerNonMuSRLinkDef.h
View File

@ -1,4 +1,4 @@
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/tests/MuTransition/Makefile.PSimulateMuTransition
View File

@ -97,4 +97,6 @@ install: all
ifeq ($(OS),LINUX)
cp -pv $(SHLIB) $(ROOTSYS)/lib
cp -pv PSimulateMuTransition.h $(ROOTSYS)/include
# for root6
cp -pv PSimulateMuTransitionDict_rdict.pcm $(ROOTSYS)/lib
endif

2
src/tests/MuTransition/PSimulateMuTransitionLinkDef.h
View File

@ -28,7 +28,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/tests/analyticFakeData/PAddPoissonNoiseLinkDef.h
View File

@ -29,7 +29,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/tests/canvasMenu/PMyCanvasLinkDef.h
View File

@ -29,7 +29,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/tests/eventHandler/PEventHandlerTestLinkDef.h
View File

@ -29,7 +29,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

4
src/tests/spirit/PFunctionHandler.h
View File

@ -71,7 +71,7 @@ class PFunctionHandler
};
// cint dictionary stuff --------------------------------------
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;
@ -79,7 +79,7 @@ class PFunctionHandler
#pragma link C++ class PFunctionHandler+;
#endif // end __CINT__
#endif // end __CLING__
//-------------------------------------------------------------
#endif // _PFUNCTIONHANDLER_H_

2
src/tests/userFcn/TUserFcnBaseLinkDef.h
View File

@ -29,7 +29,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/tests/userFcn/TUserFcnLinkDef.h
View File

@ -1,4 +1,4 @@
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;

2
src/tests/userFcnGlobal/PRelaxLinkDef.h
View File

@ -1,4 +1,4 @@
#ifdef __CINT__
#ifdef __CLING__
#pragma link off all globals;
#pragma link off all classes;