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

This commit is contained in:
2017-02-07 16:12:49 +01:00
parent 38c4293d58
commit 18d037fdf2
66 changed files with 160 additions and 88 deletions

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 --------------------------------------------------

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) $^

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) $^

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;

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;

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

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

View File

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

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) $^

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;

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) $^

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>

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;

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;

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) $^

View File

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

View File

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

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__

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) $^

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 --------------------------------------------------

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) $^

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"

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"

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 --------------------------------------------------

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"

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 --------------------------------------------------

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 --------------------------------------------------

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) $^

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 --------------------------------------------------

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 --------------------------------------------------

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) $^

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"

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 --------------------------------------------------

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)

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;

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;

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;

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)

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)

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;

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;

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) $^

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 --------------------------------------------------