LMU/musrfit
5
0
Fork 0
Code Issues 6 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

2
ChangeLog
View File

@ -4,6 +4,8 @@
changes since 0.13.0 changes since 0.13.0
=================================== ===================================
NEW 2015-01-17 adding a branch for ROOT 6.x. This needs some minor adaptations due
to the new rootcint/rootclang and the stricter c++11.
NEW 2014-12-18 first implementation of a GLOBAL block which allows to shorten NEW 2014-12-18 first implementation of a GLOBAL block which allows to shorten
a typical msr-file. Duplicate entries from the RUN blocks can be a typical msr-file. Duplicate entries from the RUN blocks can be
added here. Furthermore, the 'lifetimecorrection' flag is added here. Furthermore, the 'lifetimecorrection' flag is

2
configure.ac
View File

@ -1040,7 +1040,7 @@ case "$host" in
;; ;;
*-*-darwin*) *-*-darwin*)
ARCH=DARWIN ARCH=DARWIN
LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__" LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_"
;; ;;
*) *)
ARCH=OTHERUNIX ARCH=OTHERUNIX

2
src/classes/Makefile.am
View File

@ -84,7 +84,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cpp *Dict.h *~ core CLEANFILES = *Dict.cpp *Dict.h *~ 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 $(INCLUDES) $^ @ROOTCINT@ -v -f $*Dict.cpp -c -p -I$(BOOST_INCLUDE) $(INCLUDES) $^
lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la

4
src/classes/PRunAsymmetry.cpp
View File

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

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 ## Process this file with automake to create Makefile.in
## $Id$
h_sources = MuSR_td_PSI_bin.h h_sources = MuSR_td_PSI_bin.h
cpp_sources = MuSR_td_PSI_bin.cpp 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 */ #else /* other operating system */
/* 32 bit word length */ /* 32 bit word length */
#if (defined(_WIN32) || defined(__linux__) || defined(_WIN32GCC)) #if (defined(_WIN32) || defined(__linux__) || defined(_Darwin_) || defined(_WIN32GCC))
typedef short Int16; typedef short Int16;
typedef int Int32; typedef int Int32;
#else #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 Bool_t fValid; ///< flag indicating if initialization went through smoothly
static const Double_t fDegToRad = 0.0174532925199432955; constexpr static const Double_t fDegToRad = 0.0174532925199432955;
static const Double_t fTwoPi = 6.28318530717958623; constexpr static const Double_t fTwoPi = 6.28318530717958623;
Double_t InuMinus(const Double_t nu, const Double_t x) const; 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; 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 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) 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; constexpr static const Double_t fDegToRad = 0.0174532925199432955;
static const Double_t fTwoPi = 6.28318530717958623; constexpr static const Double_t fTwoPi = 6.28318530717958623;
// definition of the class for the ROOT dictionary // definition of the class for the ROOT dictionary
ClassDef(PSkewedLorentzian, 1) ClassDef(PSkewedLorentzian, 1)