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

adding a branch for ROOT 6.x. This needs some minor adaptations due to the new rootcint/rootclang and the stricter c++11.

Browse Source
This commit is contained in:
suter_a
2015-01-17 15:31:52 +01:00
parent 9fd8088764
commit a467553bd1
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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;

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)