From 56799142dc16e6af703cdd7678f04bac9e7f7e21 Mon Sep 17 00:00:00 2001 From: "Bastian M. Wojek" Date: Mon, 21 Mar 2011 14:33:34 +0000 Subject: [PATCH] Restructured the interdependencies within the BMWlibs (maybe other commits will follow) --- src/external/BMWtools/BMWIntegrator.cpp | 1 - src/external/BMWtools/BMWIntegrator.h | 1 - src/external/BMWtools/BMWStartupHandler.cpp | 1 - src/external/BMWtools/BMWStartupHandler.h | 1 - .../BMWtools/BMWStartupHandlerLinkDef.h | 1 - src/external/BMWtools/Makefile.am | 1 + src/external/BMWtools/TTrimSPDataHandler.cpp | 3 +- src/external/BMWtools/TTrimSPDataHandler.h | 3 +- src/external/Makefile.am | 2 + .../MuSR_software/Class_MuSR_PSI/Makefile.am | 1 + src/external/MuSR_software/Makefile.am | 2 + src/external/TLemRunHeader/Makefile.am | 1 + src/external/libCalcMeanFieldsLEM/Makefile.am | 1 + .../Makefile.libCalcMeanFieldsLEM | 146 --------------- .../TCalcMeanFieldsLEM.cpp | 1 - .../libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h | 1 - .../TCalcMeanFieldsLEMLinkDef.h | 1 - src/external/libCuba/Makefile.am | 2 + src/external/libCuba/src/Makefile.am | 7 +- src/external/libFitPofB/Makefile.am | 2 + src/external/libFitPofB/classes/Makefile.am | 1 + src/external/libFitPofB/classes/TBofZCalc.cpp | 3 +- .../classes/TBulkTriVortexFieldCalc.cpp | 3 +- .../classes/TFilmTriVortexFieldCalc.cpp | 3 +- src/external/libFitPofB/classes/TLondon1D.cpp | 3 +- src/external/libFitPofB/classes/TPofBCalc.cpp | 3 +- src/external/libFitPofB/classes/TPofTCalc.cpp | 3 +- .../libFitPofB/classes/TSkewedGss.cpp | 3 +- src/external/libFitPofB/classes/TVortex.cpp | 3 +- src/external/libFitPofB/include/TBofZCalc.h | 3 +- .../include/TBulkTriVortexFieldCalc.h | 3 +- .../include/TFilmTriVortexFieldCalc.h | 3 +- src/external/libFitPofB/include/TLondon1D.h | 3 +- .../libFitPofB/include/TLondon1DLinkDef.h | 3 +- src/external/libFitPofB/include/TPofBCalc.h | 3 +- src/external/libFitPofB/include/TPofTCalc.h | 3 +- src/external/libFitPofB/include/TSkewedGss.h | 3 +- .../libFitPofB/include/TSkewedGssLinkDef.h | 3 +- src/external/libFitPofB/include/TVortex.h | 3 +- .../libFitPofB/include/TVortexLinkDef.h | 3 +- src/external/libGapIntegrals/INSTALL | 32 +--- src/external/libGapIntegrals/Makefile.am | 1 + .../libGapIntegrals/Makefile.libGapIntegrals | 169 ------------------ .../libGapIntegrals/PMusrCanvas.cpp.BMWpatch | 101 ----------- .../libGapIntegrals/TGapIntegrals.cpp | 1 - src/external/libGapIntegrals/TGapIntegrals.h | 5 +- .../libGapIntegrals/TGapIntegralsLinkDef.h | 1 - src/external/libLFRelaxation/Makefile.am | 1 + .../libLFRelaxation/Makefile.libLFRelaxation | 169 ------------------ src/external/libLFRelaxation/README | 9 +- .../libLFRelaxation/TLFRelaxation.cpp | 3 +- src/external/libLFRelaxation/TLFRelaxation.h | 3 +- .../libLFRelaxation/TLFRelaxationLinkDef.h | 3 +- src/external/mud/Makefile.am | 2 + src/external/mud/src/Makefile.am | 1 + 55 files changed, 61 insertions(+), 677 deletions(-) delete mode 100644 src/external/libCalcMeanFieldsLEM/Makefile.libCalcMeanFieldsLEM delete mode 100644 src/external/libGapIntegrals/Makefile.libGapIntegrals delete mode 100644 src/external/libGapIntegrals/PMusrCanvas.cpp.BMWpatch delete mode 100644 src/external/libLFRelaxation/Makefile.libLFRelaxation diff --git a/src/external/BMWtools/BMWIntegrator.cpp b/src/external/BMWtools/BMWIntegrator.cpp index 831e06f1..72c2d523 100644 --- a/src/external/BMWtools/BMWIntegrator.cpp +++ b/src/external/BMWtools/BMWIntegrator.cpp @@ -3,7 +3,6 @@ BMWIntegrator.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/BMWtools/BMWIntegrator.h b/src/external/BMWtools/BMWIntegrator.h index 2ff34c9b..813f9006 100644 --- a/src/external/BMWtools/BMWIntegrator.h +++ b/src/external/BMWtools/BMWIntegrator.h @@ -3,7 +3,6 @@ BMWIntegrator.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/BMWtools/BMWStartupHandler.cpp b/src/external/BMWtools/BMWStartupHandler.cpp index 18232b50..84ec8cb5 100644 --- a/src/external/BMWtools/BMWStartupHandler.cpp +++ b/src/external/BMWtools/BMWStartupHandler.cpp @@ -3,7 +3,6 @@ BMWStartupHandler.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/BMWtools/BMWStartupHandler.h b/src/external/BMWtools/BMWStartupHandler.h index 541e0add..89001940 100644 --- a/src/external/BMWtools/BMWStartupHandler.h +++ b/src/external/BMWtools/BMWStartupHandler.h @@ -3,7 +3,6 @@ BMWStartupHandler.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/BMWtools/BMWStartupHandlerLinkDef.h b/src/external/BMWtools/BMWStartupHandlerLinkDef.h index 05355acb..73640057 100644 --- a/src/external/BMWtools/BMWStartupHandlerLinkDef.h +++ b/src/external/BMWtools/BMWStartupHandlerLinkDef.h @@ -3,7 +3,6 @@ BMWStartupHandlerLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/BMWtools/Makefile.am b/src/external/BMWtools/Makefile.am index cf71b1b9..185f9a21 100644 --- a/src/external/BMWtools/Makefile.am +++ b/src/external/BMWtools/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = \ BMWStartupHandler.h \ diff --git a/src/external/BMWtools/TTrimSPDataHandler.cpp b/src/external/BMWtools/TTrimSPDataHandler.cpp index 637ebcab..4f6c4893 100644 --- a/src/external/BMWtools/TTrimSPDataHandler.cpp +++ b/src/external/BMWtools/TTrimSPDataHandler.cpp @@ -3,9 +3,8 @@ TTrimSPDataHandler.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/05/15 + $Id$ ***************************************************************************/ diff --git a/src/external/BMWtools/TTrimSPDataHandler.h b/src/external/BMWtools/TTrimSPDataHandler.h index e09682b5..091f5da3 100644 --- a/src/external/BMWtools/TTrimSPDataHandler.h +++ b/src/external/BMWtools/TTrimSPDataHandler.h @@ -3,9 +3,8 @@ TTrimSPDataHandler.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/05/15 + $Id$ ***************************************************************************/ diff --git a/src/external/Makefile.am b/src/external/Makefile.am index 9f26ca75..ad090ce6 100644 --- a/src/external/Makefile.am +++ b/src/external/Makefile.am @@ -1,3 +1,5 @@ +## $Id$ + if BUILD_ASLIBS ASDIRS = Nonlocal \ MagProximity diff --git a/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am b/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am index 60d0e141..66b77e3b 100644 --- a/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am +++ b/src/external/MuSR_software/Class_MuSR_PSI/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = MuSR_td_PSI_bin.h cpp_sources = MuSR_td_PSI_bin.cpp diff --git a/src/external/MuSR_software/Makefile.am b/src/external/MuSR_software/Makefile.am index 3721bf7a..9e7e4f47 100644 --- a/src/external/MuSR_software/Makefile.am +++ b/src/external/MuSR_software/Makefile.am @@ -1 +1,3 @@ +## $Id$ + SUBDIRS = Class_MuSR_PSI diff --git a/src/external/TLemRunHeader/Makefile.am b/src/external/TLemRunHeader/Makefile.am index 02eb6290..90adaa5a 100644 --- a/src/external/TLemRunHeader/Makefile.am +++ b/src/external/TLemRunHeader/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = \ TLemStats.h \ diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am index 5a5c51f8..c5c273cc 100644 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ b/src/external/libCalcMeanFieldsLEM/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = \ TCalcMeanFieldsLEM.h diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.libCalcMeanFieldsLEM b/src/external/libCalcMeanFieldsLEM/Makefile.libCalcMeanFieldsLEM deleted file mode 100644 index a7b5cad6..00000000 --- a/src/external/libCalcMeanFieldsLEM/Makefile.libCalcMeanFieldsLEM +++ /dev/null @@ -1,146 +0,0 @@ -#--------------------------------------------------- -# Makefile.libCalcMeanFieldsLEM -# -# Author: Bastian M. Wojek -# e-mail: bastian.wojek@psi.ch -# -# $Id$ -# -#--------------------------------------------------- - -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) -ROOTGLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) - -#--------------------------------------------------- -# depending on the architecture, choose the compiler, -# linker, and the flags to use -# - -ARCH = $(shell $(ROOTSYS)/bin/root-config --arch) - -ifeq ($(ARCH),linux) -OS = LINUX -endif -ifeq ($(ARCH),linuxx8664gcc) -OS = LINUX -endif -ifeq ($(ARCH),win32gcc) -OS = WIN32GCC -endif -ifeq ($(ARCH),macosx) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -g -O3 -fopenmp -Wall -Wno-trigraphs -fPIC -PMUSRPATH = $(ROOTSYS)/include -LOCALPATH = . -INCLUDES = -I$(LOCALPATH) -I$(PMUSRPATH) -LD = g++ -LDFLAGS = -O -fopenmp -SOFLAGS = -shared -SHLIB = libCalcMeanFieldsLEM.so -endif - -# -- Windows/Cygwin -ifeq ($(OS),WIN32GCC) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -D_DLL -PMUSRPATH = $(ROOTSYS)/include -LOCALPATH = . -INCLUDES = -I$(LOCALPATH) -I$(PMUSRPATH) -LD = g++ -LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -SOFLAGS = -shared -Wl,--export-all-symbols -SHLIB = libCalcMeanFieldsLEM.dll -endif - -# -- MacOSX/Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = $(ROOTSYS)/include -LOCALPATH = . -INCLUDES = -I$(LOCALPATH) -I$(PMUSRPATH) -LD = g++ -LDFLAGS = -O -Xlinker -bind_at_load -SOFLAGS = -dynamiclib -flat_namespace -undefined suppress -Wl,-x -SHLIB = libCalcMeanFieldsLEM.dylib -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -GLIBS = $(ROOTGLIBS) - -# PMusr libs -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lTFitPofB - -ifeq ($(OS),WIN32GCC) -PMUSRLIB = $(PMUSRLIB) -lMathMore -endif - -ifeq ($(OS),DARWIN) -PMUSRLIB = $(PMUSRLIB) -lMathMore -endif - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += TCalcMeanFieldsLEM.o TCalcMeanFieldsLEMDict.o - -INST_HEADER = -INST_HEADER += ./TCalcMeanFieldsLEM.h - -# make the shared libs: - -all: $(SHLIB) - -$(SHLIB): $(EXTOBJS) $(OBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(SOFLAGS) $(LDFLAGS) -o $(SHLIB) $(OBJS) $(LIBS) $(PMUSRLIB) - @echo "done" - -# clean up: remove all object file (and core files) -# semicolon needed to tell make there is no source -# for this target! -# -clean:; @rm -f $(OBJS) $(EXTOBJS) $(SHLIB) *Dict* core* *~ - @echo "---> removing $(OBJS) $(SHLIB)" - - -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -# Generate the ROOT CINT dictionary - -TCalcMeanFieldsLEMDict.cpp: ./TCalcMeanFieldsLEM.h ./TCalcMeanFieldsLEMLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(PMUSRPATH) $^ - -install: all - @echo "Installing shared lib: $(SHLIB)" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv $(INST_HEADER) $(ROOTSYS)/include -endif -ifeq ($(OS),WIN32GCC) - cp -pv $(SHLIB) $(ROOTSYS)/bin - ln -sf $(ROOTSYS)/bin/$(SHLIB) $(ROOTSYS)/lib/$(SHLIB) - cp -pv $(INST_HEADER) $(ROOTSYS)/include -endif -ifeq ($(OS),DARWIN) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv $(INST_HEADER) $(ROOTSYS)/include -endif - -cleaninstall: clean install diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp index 69047c24..e274c274 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.cpp @@ -3,7 +3,6 @@ TCalcMeanFieldsLEM.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h index 1808f112..ba6c8d8b 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEM.h @@ -3,7 +3,6 @@ TCalcMeanFieldsLEM.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h index 68665a5d..460f3a46 100644 --- a/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h +++ b/src/external/libCalcMeanFieldsLEM/TCalcMeanFieldsLEMLinkDef.h @@ -3,7 +3,6 @@ TCalcMeanFieldsLEMLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/libCuba/Makefile.am b/src/external/libCuba/Makefile.am index af437a64..42fa5f46 100644 --- a/src/external/libCuba/Makefile.am +++ b/src/external/libCuba/Makefile.am @@ -1 +1,3 @@ +## $Id$ + SUBDIRS = src diff --git a/src/external/libCuba/src/Makefile.am b/src/external/libCuba/src/Makefile.am index c10c3260..f29be29d 100644 --- a/src/external/libCuba/src/Makefile.am +++ b/src/external/libCuba/src/Makefile.am @@ -1,11 +1,12 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = cuba.h c_sources = cuhre/Cuhre.c \ - divonne/Divonne.c \ - suave/Suave.c \ - vegas/Vegas.c + divonne/Divonne.c \ + suave/Suave.c \ + vegas/Vegas.c include_HEADERS = cuba.h diff --git a/src/external/libFitPofB/Makefile.am b/src/external/libFitPofB/Makefile.am index be500d10..69292210 100644 --- a/src/external/libFitPofB/Makefile.am +++ b/src/external/libFitPofB/Makefile.am @@ -1 +1,3 @@ +## $Id$ + SUBDIRS = classes diff --git a/src/external/libFitPofB/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am index b7154ced..80020cf4 100644 --- a/src/external/libFitPofB/classes/Makefile.am +++ b/src/external/libFitPofB/classes/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = \ ../include/TBofZCalc.h \ diff --git a/src/external/libFitPofB/classes/TBofZCalc.cpp b/src/external/libFitPofB/classes/TBofZCalc.cpp index 2fe186e3..91361198 100644 --- a/src/external/libFitPofB/classes/TBofZCalc.cpp +++ b/src/external/libFitPofB/classes/TBofZCalc.cpp @@ -3,9 +3,8 @@ TBofZCalc.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/04/25 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp b/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp index e8bf322e..de0ee522 100644 --- a/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp +++ b/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp @@ -3,9 +3,8 @@ TBulkTriVortexFieldCalc.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/10/17 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp b/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp index 32b6a82a..6fdd0675 100644 --- a/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp +++ b/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp @@ -3,9 +3,8 @@ TFilmTriVortexFieldCalc.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2010/02/21 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TLondon1D.cpp b/src/external/libFitPofB/classes/TLondon1D.cpp index 0015d1e9..1f7af1b7 100644 --- a/src/external/libFitPofB/classes/TLondon1D.cpp +++ b/src/external/libFitPofB/classes/TLondon1D.cpp @@ -3,9 +3,8 @@ TLondon1D.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - $Id: TLondon1D.cpp 4800 2011-03-16 16:43:13Z l_wojek $ + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TPofBCalc.cpp b/src/external/libFitPofB/classes/TPofBCalc.cpp index 6b09530a..3f0fa70d 100644 --- a/src/external/libFitPofB/classes/TPofBCalc.cpp +++ b/src/external/libFitPofB/classes/TPofBCalc.cpp @@ -3,9 +3,8 @@ TPofBCalc.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2008/09/04 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TPofTCalc.cpp b/src/external/libFitPofB/classes/TPofTCalc.cpp index fa0dd2cc..52b6c4c3 100644 --- a/src/external/libFitPofB/classes/TPofTCalc.cpp +++ b/src/external/libFitPofB/classes/TPofTCalc.cpp @@ -3,9 +3,8 @@ TPofTCalc.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2008/11/16 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TSkewedGss.cpp b/src/external/libFitPofB/classes/TSkewedGss.cpp index a38cede7..94de644b 100644 --- a/src/external/libFitPofB/classes/TSkewedGss.cpp +++ b/src/external/libFitPofB/classes/TSkewedGss.cpp @@ -3,9 +3,8 @@ TSkewedGss.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - $Id: TSkewedGss.cpp 4800 2011-03-16 16:43:13Z l_wojek $ + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/classes/TVortex.cpp b/src/external/libFitPofB/classes/TVortex.cpp index 302260c1..1cf0e533 100644 --- a/src/external/libFitPofB/classes/TVortex.cpp +++ b/src/external/libFitPofB/classes/TVortex.cpp @@ -3,9 +3,8 @@ TVortex.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - $Id: TVortex.cpp 4800 2011-03-16 16:43:13Z l_wojek $ + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TBofZCalc.h b/src/external/libFitPofB/include/TBofZCalc.h index 485bb049..7f08cf43 100644 --- a/src/external/libFitPofB/include/TBofZCalc.h +++ b/src/external/libFitPofB/include/TBofZCalc.h @@ -3,9 +3,8 @@ TBofZCalc.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/04/25 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h index 3ba86759..8af4af28 100644 --- a/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h @@ -3,9 +3,8 @@ TBulkTriVortexFieldCalc.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/10/17 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h index efc5668b..d6f8e922 100644 --- a/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h +++ b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h @@ -3,9 +3,8 @@ TFilmTriVortexFieldCalc.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2010/02/19 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TLondon1D.h b/src/external/libFitPofB/include/TLondon1D.h index 7eada2a8..1a712b92 100644 --- a/src/external/libFitPofB/include/TLondon1D.h +++ b/src/external/libFitPofB/include/TLondon1D.h @@ -3,9 +3,8 @@ TLondon1D.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2008/06/30 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TLondon1DLinkDef.h b/src/external/libFitPofB/include/TLondon1DLinkDef.h index 84553614..ba6cbce0 100644 --- a/src/external/libFitPofB/include/TLondon1DLinkDef.h +++ b/src/external/libFitPofB/include/TLondon1DLinkDef.h @@ -3,9 +3,8 @@ TLondon1DLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2008/06/30 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TPofBCalc.h b/src/external/libFitPofB/include/TPofBCalc.h index ff0c866c..08476bd1 100644 --- a/src/external/libFitPofB/include/TPofBCalc.h +++ b/src/external/libFitPofB/include/TPofBCalc.h @@ -3,9 +3,8 @@ TPofBCalc.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2008/09/04 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TPofTCalc.h b/src/external/libFitPofB/include/TPofTCalc.h index 0745eae1..3988aefd 100644 --- a/src/external/libFitPofB/include/TPofTCalc.h +++ b/src/external/libFitPofB/include/TPofTCalc.h @@ -3,9 +3,8 @@ TPofTCalc.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2008/11/16 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TSkewedGss.h b/src/external/libFitPofB/include/TSkewedGss.h index 51d2b480..661dce14 100644 --- a/src/external/libFitPofB/include/TSkewedGss.h +++ b/src/external/libFitPofB/include/TSkewedGss.h @@ -3,9 +3,8 @@ TSkewedGss.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/01/24 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TSkewedGssLinkDef.h b/src/external/libFitPofB/include/TSkewedGssLinkDef.h index 23fe4c47..578eac91 100644 --- a/src/external/libFitPofB/include/TSkewedGssLinkDef.h +++ b/src/external/libFitPofB/include/TSkewedGssLinkDef.h @@ -3,9 +3,8 @@ TSkewedGssLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/01/24 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TVortex.h b/src/external/libFitPofB/include/TVortex.h index 930f3076..482cf209 100644 --- a/src/external/libFitPofB/include/TVortex.h +++ b/src/external/libFitPofB/include/TVortex.h @@ -3,9 +3,8 @@ TVortex.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/10/17 + $Id$ ***************************************************************************/ diff --git a/src/external/libFitPofB/include/TVortexLinkDef.h b/src/external/libFitPofB/include/TVortexLinkDef.h index c7869dca..59412579 100644 --- a/src/external/libFitPofB/include/TVortexLinkDef.h +++ b/src/external/libFitPofB/include/TVortexLinkDef.h @@ -3,9 +3,8 @@ TVortexLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2009/10/17 + $Id$ ***************************************************************************/ diff --git a/src/external/libGapIntegrals/INSTALL b/src/external/libGapIntegrals/INSTALL index e8163714..a03772ae 100644 --- a/src/external/libGapIntegrals/INSTALL +++ b/src/external/libGapIntegrals/INSTALL @@ -1,34 +1,20 @@ #--------------------------------------------------------------------- # INSTALL -# Bastian M. Wojek # $Id$ #--------------------------------------------------------------------- -Installation of the musrfit-plugin "libGapIntegrals.so" +Installation of the musrfit-plugin "libGapIntegrals" -* Download the latest version of the Cuba library ( http://www.feynarts.de/cuba/ ) -* Install Cuba using the following inside the extracted directory - - CFLAGS=-fPIC ./configure - make - make install +* Configure musrfit with the option --enable-BMWlibs and the plugin will be built. -* Build the plugin inside the plugin source directory: +* The plugin classes can be accessed inside THEORY blocks of musrfit msr files via: - make -f Makefile.libGapIntegrals - -* Install the plugin to your $ROOTSYS - - make -f Makefile.libGapIntegrals install - -* The plugin classes can now be accessed inside THEORY blocks of musrfit msr-files via: - - userFcn libGapIntegrals.so TGapSWave 1 2 (Tc Delta0) - userFcn libGapIntegrals.so TGapDWave 1 2 (Tc Delta0) - userFcn libGapIntegrals.so TGapAnSWave 1 2 3 (Tc Delta0 a) - userFcn libGapIntegrals.so TGapNonMonDWave1 1 2 3 (Tc Delta0 a) - userFcn libGapIntegrals.so TGapNonMonDWave2 1 2 3 (Tc Delta0 a) - userFcn libGapIntegrals.so TGapPowerLaw 1 2 (Tc n) + userFcn libGapIntegrals TGapSWave 1 2 (Tc Delta0) + userFcn libGapIntegrals TGapDWave 1 2 (Tc Delta0) + userFcn libGapIntegrals TGapAnSWave 1 2 3 (Tc Delta0 a) + userFcn libGapIntegrals TGapNonMonDWave1 1 2 3 (Tc Delta0 a) + userFcn libGapIntegrals TGapNonMonDWave2 1 2 3 (Tc Delta0 a) + userFcn libGapIntegrals TGapPowerLaw 1 2 (Tc n) * For an introductory discussion on which functions are actually calculated, please refer to GapIntegrals.pdf diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am index a2b90518..8bb9d9d4 100644 --- a/src/external/libGapIntegrals/Makefile.am +++ b/src/external/libGapIntegrals/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = \ TGapIntegrals.h diff --git a/src/external/libGapIntegrals/Makefile.libGapIntegrals b/src/external/libGapIntegrals/Makefile.libGapIntegrals deleted file mode 100644 index d6ea25f5..00000000 --- a/src/external/libGapIntegrals/Makefile.libGapIntegrals +++ /dev/null @@ -1,169 +0,0 @@ -#--------------------------------------------------- -# Makefile.libGapIntegrals -# -# Author: Bastian M. Wojek -# e-mail: bastian.wojek@psi.ch -# -# $Id$ -# -#--------------------------------------------------- - -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) -ROOTGLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) - -#--------------------------------------------------- -# depending on the architecture, choose the compiler, -# linker, and the flags to use -# - -ARCH = $(shell $(ROOTSYS)/bin/root-config --arch) - -ifeq ($(ARCH),linux) -OS = LINUX -endif -ifeq ($(ARCH),linuxx8664gcc) -OS = LINUX -endif -ifeq ($(ARCH),win32gcc) -OS = WIN32GCC -endif -ifeq ($(ARCH),macosx) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../../include -MNPATH = $(ROOTSYS)/include -GSLPATH = /usr/include/gsl -CUBAPATH = /usr/local/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(CUBAPATH) -LD = g++ -LDFLAGS = -O -SOFLAGS = -shared -SHLIB = libGapIntegrals.so -endif - -# -- Windows/Cygwin -ifeq ($(OS),WIN32GCC) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -D_DLL -PMUSRPATH = ../../include -MNPATH = $(ROOTSYS)/include -GSLPATH = /usr/include/gsl -CUBAPATH = /usr/local/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(CUBAPATH) -LD = g++ -LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -SOFLAGS = -shared -Wl,--export-all-symbols -SHLIB = libGapIntegrals.dll -endif - -# -- MacOSX/Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../../include -MNPATH = $(ROOTSYS)/include -FINKPATH = /sw/include -GSLPATH = $(FINKPATH)/gsl -CUBAPATH = $(FINKPATH) -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(CUBAPATH) -LD = g++ -LDFLAGS = -O -Xlinker -bind_at_load -SOFLAGS = -dynamiclib -flat_namespace -undefined suppress -Wl,-x -SHLIB = libGapIntegrals.dylib -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -GLIBS = $(ROOTGLIBS) - -# GSL lib -GSLLIB = -lgslcblas -lgsl -# Cuba lib -CUBALIB = -L/usr/local/lib -lcuba -lm -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr - -ifeq ($(OS),WIN32GCC) -# GSL lib -GSLLIB = -L/usr/lib -lgslcblas -lgsl -# Cuba lib -CUBALIB = -L/usr/local/lib -lcuba -lm -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lMathMore -endif - -ifeq ($(OS),DARWIN) -# GSL lib -GSLLIB = -L/sw/lib -lgslcblas -lgsl -# Cuba lib -CUBALIB = -L/sw/lib -lcuba -lm -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lMathMore -endif - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += TGapIntegrals.o TGapIntegralsDict.o - -EXTOBJS = BMWIntegrator.o - -# make the shared libs: - -all: $(SHLIB) - -$(SHLIB): $(EXTOBJS) $(OBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(SOFLAGS) $(LDFLAGS) -o $(SHLIB) $(EXTOBJS) $(OBJS) $(LIBS) $(PMUSRLIB) $(GSLLIB) $(CUBALIB) - @echo "done" - -# clean up: remove all object file (and core files) -# semicolon needed to tell make there is no source -# for this target! -# -clean:; @rm -f $(OBJS) $(EXTOBJS) $(SHLIB) *Dict* core* *~ - @echo "---> removing $(OBJS) $(EXTOBJS) $(SHLIB)" - -# -BMWIntegrator.o: ../BMWIntegrator/BMWIntegrator.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -# Generate the ROOT CINT dictionary - -TGapIntegralsDict.cpp: ../BMWIntegrator/BMWIntegrator.h ./TGapIntegrals.h ./TGapIntegralsLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ - -install: all - @echo "Installing shared lib: $(SHLIB)" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv ../BMWIntegrator/BMWIntegrator.h TGapIntegrals.h $(ROOTSYS)/include -endif -ifeq ($(OS),WIN32GCC) - cp -pv $(SHLIB) $(ROOTSYS)/bin - ln -sf $(ROOTSYS)/bin/$(SHLIB) $(ROOTSYS)/lib/$(SHLIB) - cp -pv ../BMWIntegrator/BMWIntegrator.h TGapIntegrals.h $(ROOTSYS)/include -endif -ifeq ($(OS),DARWIN) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv ../BMWIntegrator/BMWIntegrator.h TGapIntegrals.h $(ROOTSYS)/include -endif - -cleaninstall: clean install diff --git a/src/external/libGapIntegrals/PMusrCanvas.cpp.BMWpatch b/src/external/libGapIntegrals/PMusrCanvas.cpp.BMWpatch deleted file mode 100644 index 4ffdbad3..00000000 --- a/src/external/libGapIntegrals/PMusrCanvas.cpp.BMWpatch +++ /dev/null @@ -1,101 +0,0 @@ ---- PMusrCanvas.cpp.orig 2009-09-18 18:58:50.000000000 +0200 -+++ PMusrCanvas.cpp 2009-09-16 21:51:45.000000000 +0200 -@@ -5,7 +5,7 @@ - Author: Andreas Suter - e-mail: andreas.suter@psi.ch - -- $Id$ -+ $Id: PMusrCanvas.cpp 4106 2009-08-31 11:19:03Z nemu $ - - ***************************************************************************/ - -@@ -3291,6 +3291,36 @@ - return; - } - -+// BMW: Writing an extra file with the complete theory curve only until the issue of writing only single theory points has been resolved -+ -+ // generate output filename -+ -+ // in order to handle names with "." correctly this slightly odd data-filename generation -+ tokens = fMsrHandler->GetFileName().Tokenize("."); -+ str = ""; -+ for (int i=0; iGetEntries()-1; i++) { -+ ostr = dynamic_cast(tokens->At(i)); -+ str += ostr->GetString() + TString("."); -+ } -+ str += "dataTheory"; -+ -+ if (tokens) { -+ delete tokens; -+ tokens = 0; -+ } -+ -+ // open file -+ ofstream foutTheory; -+ -+ // open data-file -+ foutTheory.open(str.Data(), iostream::out); -+ if (!fout.is_open()) { -+ cout << endl << ">> PMusrCanvas::SaveDataAscii: **ERROR** couldn't open file " << str.Data() << " for writing." << endl; -+ return; -+ } -+ -+// endofBMW -+ - // extract data - Double_t time, xval, yval; - Int_t xminBin; -@@ -3688,11 +3718,39 @@ - fout << "Data" << fNonMusrData.size()-1 << ", eData" << fNonMusrData.size()-1 << ", Theo" << fNonMusrData.size()-1; - fout << endl; - // write data -+ -+// BMW: Writing an extra file with the complete theory curve only until the issue of writing only single theory points has been resolved -+ -+ // get current x-range -+ xminBin = fNonMusrData[0].theory->GetXaxis()->GetFirst(); // first bin of the zoomed range -+ xmaxBin = fNonMusrData[0].theory->GetXaxis()->GetLast(); // last bin of the zoomed range -+ xmin = fNonMusrData[0].theory->GetXaxis()->GetBinCenter(xminBin); -+ xmax = fNonMusrData[0].theory->GetXaxis()->GetBinCenter(xmaxBin); -+ -+ // get data -+ for (int i=0; iGetN(); i++) { -+ fNonMusrData[0].theory->GetPoint(i,xval,yval); // get values -+ if ((xval < xmin) || (xval > xmax)) -+ continue; -+ foutTheory << xval << " "; -+ for (unsigned int j=0; jGetPoint(i,xval,yval); // get values -+ foutTheory << yval << " "; -+ } -+ // write last data set -+ fNonMusrData[fNonMusrData.size()-1].theory->GetPoint(i,xval,yval); // get values -+ foutTheory << yval << " "; -+ foutTheory << endl; -+ } -+ -+// endofBMW -+ - // get current x-range - xminBin = fNonMusrData[0].data->GetXaxis()->GetFirst(); // first bin of the zoomed range - xmaxBin = fNonMusrData[0].data->GetXaxis()->GetLast(); // last bin of the zoomed range - xmin = fNonMusrData[0].data->GetXaxis()->GetBinCenter(xminBin); - xmax = fNonMusrData[0].data->GetXaxis()->GetBinCenter(xmaxBin); -+ - // get data - for (int i=0; iGetN(); i++) { - fNonMusrData[0].data->GetPoint(i,xval,yval); // get values -@@ -3739,6 +3797,12 @@ - // close file - fout.close(); - -+// BMW: Writing an extra file with the complete theory curve only until the issue of writing only single theory points has been resolved -+ -+ foutTheory.close(); -+ -+// endofBMW -+ - cout << endl << ">> Data windows saved in ascii format ..." << endl; - } - diff --git a/src/external/libGapIntegrals/TGapIntegrals.cpp b/src/external/libGapIntegrals/TGapIntegrals.cpp index a7334df4..69363bc4 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.cpp +++ b/src/external/libGapIntegrals/TGapIntegrals.cpp @@ -3,7 +3,6 @@ TGapIntegrals.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/libGapIntegrals/TGapIntegrals.h b/src/external/libGapIntegrals/TGapIntegrals.h index 31e503f2..da8fb39a 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.h +++ b/src/external/libGapIntegrals/TGapIntegrals.h @@ -3,7 +3,6 @@ TGapIntegrals.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ @@ -29,8 +28,8 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _TTwoGaps_H_ -#define _TTwoGaps_H_ +#ifndef _TGapIntegrals_H_ +#define _TGapIntegrals_H_ #include #include diff --git a/src/external/libGapIntegrals/TGapIntegralsLinkDef.h b/src/external/libGapIntegrals/TGapIntegralsLinkDef.h index 65a5c5e7..2058d6e9 100644 --- a/src/external/libGapIntegrals/TGapIntegralsLinkDef.h +++ b/src/external/libGapIntegrals/TGapIntegralsLinkDef.h @@ -3,7 +3,6 @@ TGapIntegralsLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am index 7097a105..67d0d23b 100644 --- a/src/external/libLFRelaxation/Makefile.am +++ b/src/external/libLFRelaxation/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = \ TLFRelaxation.h diff --git a/src/external/libLFRelaxation/Makefile.libLFRelaxation b/src/external/libLFRelaxation/Makefile.libLFRelaxation deleted file mode 100644 index 79e69b69..00000000 --- a/src/external/libLFRelaxation/Makefile.libLFRelaxation +++ /dev/null @@ -1,169 +0,0 @@ -#--------------------------------------------------- -# Makefile.libGapIntegrals -# -# Author: Bastian M. Wojek -# e-mail: bastian.wojek@psi.ch -# -# $Id$ -# -#--------------------------------------------------- - -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) -ROOTGLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) - -#--------------------------------------------------- -# depending on the architecture, choose the compiler, -# linker, and the flags to use -# - -ARCH = $(shell $(ROOTSYS)/bin/root-config --arch) - -ifeq ($(ARCH),linux) -OS = LINUX -endif -ifeq ($(ARCH),linuxx8664gcc) -OS = LINUX -endif -ifeq ($(ARCH),win32gcc) -OS = WIN32GCC -endif -ifeq ($(ARCH),macosx) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../../include -MNPATH = $(ROOTSYS)/include -GSLPATH = /usr/include/gsl -CUBAPATH = /usr/local/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(CUBAPATH) -LD = g++ -LDFLAGS = -O -SOFLAGS = -shared -SHLIB = libLFRelaxation.so -endif - -# -- Windows/Cygwin -ifeq ($(OS),WIN32GCC) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -D_DLL -PMUSRPATH = ../../include -MNPATH = $(ROOTSYS)/include -GSLPATH = /usr/include/gsl -CUBAPATH = /usr/local/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(CUBAPATH) -LD = g++ -LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -SOFLAGS = -shared -Wl,--export-all-symbols -SHLIB = libLFRelaxation.dll -endif - -# -- MacOSX/Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../../include -MNPATH = $(ROOTSYS)/include -FINKPATH = /sw/include -GSLPATH = $(FINKPATH)/gsl -CUBAPATH = $(FINKPATH) -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(CUBAPATH) -LD = g++ -LDFLAGS = -O -Xlinker -bind_at_load -SOFLAGS = -dynamiclib -flat_namespace -undefined suppress -Wl,-x -SHLIB = libLFRelaxation.dylib -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -GLIBS = $(ROOTGLIBS) - -# GSL lib -GSLLIB = -lgslcblas -lgsl -# Cuba lib -CUBALIB = -L/usr/local/lib -lcuba -lm -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr - -ifeq ($(OS),WIN32GCC) -# GSL lib -GSLLIB = -L/usr/lib -lgslcblas -lgsl -# Cuba lib -CUBALIB = -L/usr/local/lib -lcuba -lm -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lMathMore -endif - -ifeq ($(OS),DARWIN) -# GSL lib -GSLLIB = -L/sw/lib -lgslcblas -lgsl -# Cuba lib -CUBALIB = -L/sw/lib -lcuba -lm -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lMathMore -endif - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += TLFRelaxation.o TLFRelaxationDict.o - -EXTOBJS = BMWIntegrator.o - -# make the shared libs: - -all: $(SHLIB) - -$(SHLIB): $(EXTOBJS) $(OBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(SOFLAGS) $(LDFLAGS) -o $(SHLIB) $(EXTOBJS) $(OBJS) $(LIBS) $(PMUSRLIB) $(GSLLIB) $(CUBALIB) - @echo "done" - -# clean up: remove all object file (and core files) -# semicolon needed to tell make there is no source -# for this target! -# -clean:; @rm -f $(OBJS) $(EXTOBJS) $(SHLIB) *Dict* core* *~ - @echo "---> removing $(OBJS) $(EXTOBJS) $(SHLIB)" - -# -BMWIntegrator.o: ../BMWIntegrator/BMWIntegrator.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -# Generate the ROOT CINT dictionary - -TLFRelaxationDict.cpp: ../BMWIntegrator/BMWIntegrator.h ./TLFRelaxation.h ./TLFRelaxationLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p $^ - -install: all - @echo "Installing shared lib: $(SHLIB)" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv ../BMWIntegrator/BMWIntegrator.h TLFRelaxation.h $(ROOTSYS)/include -endif -ifeq ($(OS),WIN32GCC) - cp -pv $(SHLIB) $(ROOTSYS)/bin - ln -sf $(ROOTSYS)/bin/$(SHLIB) $(ROOTSYS)/lib/$(SHLIB) - cp -pv ../BMWIntegrator/BMWIntegrator.h TLFRelaxation.h $(ROOTSYS)/include -endif -ifeq ($(OS),DARWIN) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv ../BMWIntegrator/BMWIntegrator.h TLFRelaxation.h $(ROOTSYS)/include -endif - -cleaninstall: clean install diff --git a/src/external/libLFRelaxation/README b/src/external/libLFRelaxation/README index 3beafd13..31bc1de7 100644 --- a/src/external/libLFRelaxation/README +++ b/src/external/libLFRelaxation/README @@ -1,9 +1,8 @@ /*************************************************************************** Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch - 2011/03/12 + $Id$ ***************************************************************************/ @@ -11,10 +10,10 @@ Implementation of a userFcn-interface to Gaussian and Lorentzian static and dyna At the moment this is a simple alternative implementation to the functions provided by musrfit itself. Mostly, this effort should be regarded as a design study which is not really indended for production use. -The functions are called from within musrfit as: +If musrfit has been configured with --enable-BMWlibs the functions can be called as: userFcn libLFRelaxation TLFStatGssKT 1 2 (frequency rate) -userFcn libLFRelaxation TLFStatLorKT 1 2 (frequency rate) +userFcn libLFRelaxation TLFStatExpKT 1 2 (frequency rate) userFcn libLFRelaxation TLFDynGssKT 1 2 3 (frequency rate fluct.rate) -userFcn libLFRelaxation TLFDynLorKT 1 2 3 (frequency rate fluct.rate) +userFcn libLFRelaxation TLFDynExpKT 1 2 3 (frequency rate fluct.rate) userFcn libLFRelaxation TLFDynSG 1 2 3 (frequency rate fluct.rate) diff --git a/src/external/libLFRelaxation/TLFRelaxation.cpp b/src/external/libLFRelaxation/TLFRelaxation.cpp index 6a28cba3..2da09e40 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.cpp +++ b/src/external/libLFRelaxation/TLFRelaxation.cpp @@ -3,7 +3,6 @@ TLFRelaxation.cpp Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ @@ -11,7 +10,7 @@ /*************************************************************************** * Copyright (C) 2009 by Bastian M. Wojek * - * bastian.wojek@psi.ch * + * * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index b89f5a05..0300ff2b 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -3,7 +3,6 @@ TLFRelaxation.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ @@ -11,7 +10,7 @@ /*************************************************************************** * Copyright (C) 2009 by Bastian M. Wojek * - * bastian.wojek@psi.ch * + * * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/external/libLFRelaxation/TLFRelaxationLinkDef.h b/src/external/libLFRelaxation/TLFRelaxationLinkDef.h index 01edf398..c1490c9e 100644 --- a/src/external/libLFRelaxation/TLFRelaxationLinkDef.h +++ b/src/external/libLFRelaxation/TLFRelaxationLinkDef.h @@ -3,7 +3,6 @@ TLFRelaxationLinkDef.h Author: Bastian M. Wojek - e-mail: bastian.wojek@psi.ch $Id$ @@ -11,7 +10,7 @@ /*************************************************************************** * Copyright (C) 2009 by Bastian M. Wojek * - * bastian.wojek@psi.ch * + * * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * diff --git a/src/external/mud/Makefile.am b/src/external/mud/Makefile.am index af437a64..42fa5f46 100644 --- a/src/external/mud/Makefile.am +++ b/src/external/mud/Makefile.am @@ -1 +1,3 @@ +## $Id$ + SUBDIRS = src diff --git a/src/external/mud/src/Makefile.am b/src/external/mud/src/Makefile.am index 23a50d1a..2508f91a 100644 --- a/src/external/mud/src/Makefile.am +++ b/src/external/mud/src/Makefile.am @@ -1,4 +1,5 @@ ## Process this file with automake to create Makefile.in +## $Id$ h_sources = mud.h cpp_sources = mud_all.c \