diff --git a/configure.ac b/configure.ac index 5b4c245c..a62bde21 100644 --- a/configure.ac +++ b/configure.ac @@ -490,17 +490,17 @@ AC_SUBST(PMUSR_LIBS) AC_SUBST(PMUSR_CFLAGS) if test "${BUILD_BMW_LIBS}" = "1"; then - BMWSTARTUP_SRCDIR="${SRCDIR}/external/BMWStartupHandler" - BMWSTARTUP_LIBS="${BMWSTARTUP_SRCDIR}/libBMWstartup.la" - BMWSTARTUP_CFLAGS="-I${BMWSTARTUP_SRCDIR}" - AC_SUBST(BMWSTARTUP_LIBS) - AC_SUBST(BMWSTARTUP_CFLAGS) + BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools" + BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la" + BMWTOOLS_CFLAGS="-I${BMWTOOLS_SRCDIR}" + AC_SUBST(BMWTOOLS_LIBS) + AC_SUBST(BMWTOOLS_CFLAGS) - TFITPOFB_SRCDIR="${SRCDIR}/external/TFitPofB-lib" - TFITPOFB_LIBS="${TFITPOFB_SRCDIR}/classes/libTFitPofB.la" - TFITPOFB_CFLAGS="-I${TFITPOFB_SRCDIR}/include" - AC_SUBST(TFITPOFB_LIBS) - AC_SUBST(TFITPOFB_CFLAGS) + FITPOFB_SRCDIR="${SRCDIR}/external/libFitPofB" + FITPOFB_LIBS="${FITPOFB_SRCDIR}/classes/libFitPofB.la" + FITPOFB_CFLAGS="-I${FITPOFB_SRCDIR}/include" + AC_SUBST(FITPOFB_LIBS) + AC_SUBST(FITPOFB_CFLAGS) # Check for fftw3_threads-library. If available musrfit is also linked against it (used in libTFitPofB). SAVED_CFLAGS="$CFLAGS" @@ -633,9 +633,9 @@ AC_CONFIG_FILES([Makefile \ src/external/libCuba/Makefile \ src/external/libCuba/src/Makefile \ src/external/libCuba/src/cuba.pc \ - src/external/BMWStartupHandler/Makefile \ - src/external/TFitPofB-lib/Makefile \ - src/external/TFitPofB-lib/classes/Makefile \ + src/external/BMWtools/Makefile \ + src/external/libFitPofB/Makefile \ + src/external/libFitPofB/classes/Makefile \ src/external/libLFRelaxation/Makefile \ src/external/libGapIntegrals/Makefile \ src/external/libCalcMeanFieldsLEM/Makefile \ diff --git a/src/classes/PFunctionHandler.cpp b/src/classes/PFunctionHandler.cpp index e5a88383..802cd26e 100644 --- a/src/classes/PFunctionHandler.cpp +++ b/src/classes/PFunctionHandler.cpp @@ -81,7 +81,7 @@ Bool_t PFunctionHandler::DoParse() // do parsing tree_parse_info<> info = ast_parse(line.Data(), function, space_p); - if (info.full) { // parsing successfull + if (info.full) { // parsing successful PFunction func(info); // generate an evaluation function object based on the AST tree fFuncs.push_back(func); // feeds it to the functions vector } else { diff --git a/src/external/BMWIntegrator/BMWIntegrator.cpp b/src/external/BMWtools/BMWIntegrator.cpp similarity index 100% rename from src/external/BMWIntegrator/BMWIntegrator.cpp rename to src/external/BMWtools/BMWIntegrator.cpp diff --git a/src/external/BMWIntegrator/BMWIntegrator.h b/src/external/BMWtools/BMWIntegrator.h similarity index 100% rename from src/external/BMWIntegrator/BMWIntegrator.h rename to src/external/BMWtools/BMWIntegrator.h diff --git a/src/external/BMWStartupHandler/BMWStartupHandler.cpp b/src/external/BMWtools/BMWStartupHandler.cpp similarity index 100% rename from src/external/BMWStartupHandler/BMWStartupHandler.cpp rename to src/external/BMWtools/BMWStartupHandler.cpp diff --git a/src/external/BMWStartupHandler/BMWStartupHandler.h b/src/external/BMWtools/BMWStartupHandler.h similarity index 100% rename from src/external/BMWStartupHandler/BMWStartupHandler.h rename to src/external/BMWtools/BMWStartupHandler.h diff --git a/src/external/BMWStartupHandler/BMWStartupHandlerLinkDef.h b/src/external/BMWtools/BMWStartupHandlerLinkDef.h similarity index 100% rename from src/external/BMWStartupHandler/BMWStartupHandlerLinkDef.h rename to src/external/BMWtools/BMWStartupHandlerLinkDef.h diff --git a/src/external/BMWStartupHandler/Makefile.am b/src/external/BMWtools/Makefile.am similarity index 61% rename from src/external/BMWStartupHandler/Makefile.am rename to src/external/BMWtools/Makefile.am index f00bb3f1..145bc5a6 100644 --- a/src/external/BMWStartupHandler/Makefile.am +++ b/src/external/BMWtools/Makefile.am @@ -1,7 +1,9 @@ ## Process this file with automake to create Makefile.in h_sources = \ - BMWStartupHandler.h + BMWStartupHandler.h \ + TTrimSPDataHandler.h \ + BMWIntegrator.h h_linkdef = \ BMWStartupHandlerLinkDef.h @@ -10,7 +12,9 @@ dict_h_sources = \ BMWStartupHandlerDict.h cpp_sources = \ - BMWStartupHandler.cpp + BMWStartupHandler.cpp \ + TTrimSPDataHandler.cpp \ + BMWIntegrator.cpp dict_cpp_sources = \ BMWStartupHandlerDict.cpp @@ -28,11 +32,11 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ -lib_LTLIBRARIES = libBMWstartup.la +lib_LTLIBRARIES = libBMWtools.la -libBMWstartup_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libBMWstartup_la_LIBADD = $(ROOT_LIBS) -libBMWstartup_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) +libBMWtools_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) +libBMWtools_la_LIBADD = $(ROOT_LIBS) +libBMWtools_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) ## For the moment do not build pkgconfig files for musrfit plug-ins... ## pkgconfigdir = $(libdir)/pkgconfig @@ -43,14 +47,14 @@ libBMWstartup_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PL if IS_DARWIN install-exec-hook: - $(LN_S) $(libdir)/libBMWstartup.dylib $(libdir)/libBMWstartup.so + $(LN_S) $(libdir)/libBMWtools.dylib $(libdir)/libBMWtools.so uninstall-hook: - rm -f $(libdir)/libBMWstartup.so + rm -f $(libdir)/libBMWtools.so endif if IS_CYGWIN install-exec-hook: - $(LN_S) $(bindir)/cygBMWstartup-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libBMWstartup.so + $(LN_S) $(bindir)/cygBMWtools-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libBMWtools.so uninstall-hook: - rm -f $(libdir)/libBMWstartup.so + rm -f $(libdir)/libBMWtools.so endif diff --git a/src/external/TFitPofB-lib/classes/TTrimSPDataHandler.cpp b/src/external/BMWtools/TTrimSPDataHandler.cpp similarity index 100% rename from src/external/TFitPofB-lib/classes/TTrimSPDataHandler.cpp rename to src/external/BMWtools/TTrimSPDataHandler.cpp diff --git a/src/external/TFitPofB-lib/include/TTrimSPDataHandler.h b/src/external/BMWtools/TTrimSPDataHandler.h similarity index 100% rename from src/external/TFitPofB-lib/include/TTrimSPDataHandler.h rename to src/external/BMWtools/TTrimSPDataHandler.h diff --git a/src/external/Makefile.am b/src/external/Makefile.am index c8f91b4b..9f26ca75 100644 --- a/src/external/Makefile.am +++ b/src/external/Makefile.am @@ -8,8 +8,8 @@ if BUILD_CUBALIB endif if BUILD_BMWLIBS - BMWDIRS = BMWStartupHandler \ - TFitPofB-lib \ + BMWDIRS = BMWtools \ + libFitPofB \ libLFRelaxation \ libGapIntegrals \ libCalcMeanFieldsLEM diff --git a/src/external/TFitPofB-lib/classes/Makefile.libTFitPofB b/src/external/TFitPofB-lib/classes/Makefile.libTFitPofB deleted file mode 100644 index dd05c607..00000000 --- a/src/external/TFitPofB-lib/classes/Makefile.libTFitPofB +++ /dev/null @@ -1,187 +0,0 @@ -#--------------------------------------------------- -# Makefile.libTFitPofB -# -# 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 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../../../include -MNPATH = $(ROOTSYS)/include -LOCALPATH = ../include -FFTW3PATH = /usr/include -INCLUDES = -I$(LOCALPATH) -I$(PMUSRPATH) -I$(MNPATH) -I$(FFTW3PATH) -LD = g++ -LDFLAGS = -O -SOFLAGS = -shared -SHLIB = libTFitPofB.so -endif - -# -- Windows/Cygwin -ifeq ($(OS),WIN32GCC) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -D_DLL -PMUSRPATH = ../../../include -MNPATH = $(ROOTSYS)/include -LOCALPATH = ../include -FFTW3PATH = /usr/include -INCLUDES = -I$(LOCALPATH) -I$(PMUSRPATH) -I$(MNPATH) -I$(FFTW3PATH) -LD = g++ -LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -SOFLAGS = -shared -Wl,--export-all-symbols -SHLIB = libTFitPofB.dll -endif - -# -- MacOSX/Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../../../include -MNPATH = $(ROOTSYS)/include -FINKPATH = /sw/include -LOCALPATH = ../include -FFTW3PATH = /sw/include -INCLUDES = -I$(LOCALPATH) -I$(PMUSRPATH) -I$(MNPATH) -I$(FINKPATH) -I$(FFTW3PATH) -LD = g++ -LDFLAGS = -O -Xlinker -bind_at_load -SOFLAGS = -dynamiclib -flat_namespace -undefined suppress -Wl,-x -SHLIB = libTFitPofB.dylib -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -GLIBS = $(ROOTGLIBS) - -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -# FFTW lib -FFTW3LIB = -lfftw3_threads -lfftw3 -lm -lpthread - -ifeq ($(OS),WIN32GCC) -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lMathMore -endif - -ifeq ($(OS),DARWIN) -# FFTW lib -FFTW3LIB = -L/sw/lib -lfftw3_threads -lfftw3 -lm -lpthread -# PMusr lib -PMUSRLIB = -L$(ROOTSYS)/lib -lPMusr -lMathMore -endif - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += TTrimSPDataHandler.o -OBJS += TBulkTriVortexFieldCalc.o -OBJS += TBofZCalc.o -OBJS += TPofBCalc.o -OBJS += TPofTCalc.o -OBJS += TFitPofBStartupHandler.o TFitPofBStartupHandlerDict.o -OBJS += TVortex.o TVortexDict.o -OBJS += TLondon1D.o TLondon1DDict.o -OBJS += TSkewedGss.o TSkewedGssDict.o - -INST_HEADER = -INST_HEADER += ../include/TBofZCalc.h -INST_HEADER += ../include/TBulkTriVortexFieldCalc.h -INST_HEADER += ../include/TFitPofBStartupHandler.h -INST_HEADER += ../include/TLondon1D.h -INST_HEADER += ../include/TPofBCalc.h -INST_HEADER += ../include/TPofTCalc.h -INST_HEADER += ../include/TSkewedGss.h -INST_HEADER += ../include/TTrimSPDataHandler.h -INST_HEADER += ../include/TVortex.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) $(FFTW3LIB) - @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 - -TVortexDict.cpp: ../include/TVortex.h ../include/TVortexLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(PMUSRPATH) $^ - -TLondon1DDict.cpp: ../include/TLondon1D.h ../include/TLondon1DLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(PMUSRPATH) $^ - -TSkewedGssDict.cpp: ../include/TSkewedGss.h ../include/TSkewedGssLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(PMUSRPATH) $^ - -TFitPofBStartupHandlerDict.cpp: ../include/TFitPofBStartupHandler.h ../include/TFitPofBStartupHandlerLinkDef.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 $(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/TFitPofB-lib/test/Makefile.test b/src/external/TFitPofB-lib/test/Makefile.test deleted file mode 100644 index 4416b01a..00000000 --- a/src/external/TFitPofB-lib/test/Makefile.test +++ /dev/null @@ -1,49 +0,0 @@ -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) - -#--------------------------------------------------- - -CXX = g++ -CXXFLAGS = -g -Wall -LOCALINCLUDE = ../include -ROOTINCLUDE = $(ROOTSYS)/include -INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE) -LD = g++ -LDFLAGS = -g -L/apps/cern/root/lib -lTFitPofB -lfftw3 -lm -lPMusr - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries -LIBS = $(ROOTLIBS) -lXMLParser -lMathMore - -EXEC = test - -# some definitions: headers, sources, objects,... -OBJS = -OBJS += $(EXEC).o - -# make the executable: -# -all: $(EXEC) - -$(EXEC): $(OBJS) - @echo "---> Building $(EXEC) ..." - $(LD) $(LDFLAGS) $(OBJS) -o $(EXEC) $(LIBS) - @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) - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - diff --git a/src/external/TFitPofB-lib/test/Makefile.testVortex b/src/external/TFitPofB-lib/test/Makefile.testVortex deleted file mode 100644 index e7195be1..00000000 --- a/src/external/TFitPofB-lib/test/Makefile.testVortex +++ /dev/null @@ -1,49 +0,0 @@ -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) - -#--------------------------------------------------- - -CXX = g++-4.4.0 -CXXFLAGS = -O3 -Wall -LOCALINCLUDE = ../include -ROOTINCLUDE = $(ROOTSYS)/include -INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE) -LD = g++-4.4.0 -LDFLAGS = -O3 -L../classes -lTFitPofB -lfftw3 -lm -fopenmp -lPMusr - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries -LIBS = $(ROOTLIBS) -lXMLParser -lMathMore - -EXEC = testVortex - -# some definitions: headers, sources, objects,... -OBJS = -OBJS += $(EXEC).o - -# make the executable: -# -all: $(EXEC) - -$(EXEC): $(OBJS) - @echo "---> Building $(EXEC) ..." - $(LD) $(LDFLAGS) $(OBJS) -o $(EXEC) $(LIBS) - @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) - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - diff --git a/src/external/TFitPofB-lib/test/Makefile.testVortex-v2 b/src/external/TFitPofB-lib/test/Makefile.testVortex-v2 deleted file mode 100644 index 01c48ff3..00000000 --- a/src/external/TFitPofB-lib/test/Makefile.testVortex-v2 +++ /dev/null @@ -1,49 +0,0 @@ -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) - -#--------------------------------------------------- - -CXX = g++-4.4.2 -CXXFLAGS = -O3 -Wall -LOCALINCLUDE = ../include -ROOTINCLUDE = $(ROOTSYS)/include -INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE) -LD = g++-4.4.2 -LDFLAGS = -O3 -L../classes -lTFitPofB -lfftw3_threads -lfftw3 -lm -lpthread -fopenmp -lPMusr - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries -LIBS = $(ROOTLIBS) -lXMLParser -lMathMore - -EXEC = testVortex-v2 - -# some definitions: headers, sources, objects,... -OBJS = -OBJS += $(EXEC).o - -# make the executable: -# -all: $(EXEC) - -$(EXEC): $(OBJS) - @echo "---> Building $(EXEC) ..." - $(LD) $(LDFLAGS) $(OBJS) -o $(EXEC) $(LIBS) - @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) - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - diff --git a/src/external/TFitPofB-lib/test/Makefile.testVortexFilm b/src/external/TFitPofB-lib/test/Makefile.testVortexFilm deleted file mode 100644 index 0b8bc788..00000000 --- a/src/external/TFitPofB-lib/test/Makefile.testVortexFilm +++ /dev/null @@ -1,49 +0,0 @@ -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) - -#--------------------------------------------------- - -CXX = g++-4.4.2 -CXXFLAGS = -g -O3 -Wall -LOCALINCLUDE = ../include -ROOTINCLUDE = $(ROOTSYS)/include -INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE) -LD = g++-4.4.2 -LDFLAGS = -g -O3 -L../classes -lTFitPofB -lfftw3_threads -lfftw3 -lfftw3f -lm -lpthread -fopenmp -lPMusr - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries -LIBS = $(ROOTLIBS) -lXMLParser -lMathMore - -EXEC = testVortexFilm - -# some definitions: headers, sources, objects,... -OBJS = -OBJS += $(EXEC).o - -# make the executable: -# -all: $(EXEC) - -$(EXEC): $(OBJS) - @echo "---> Building $(EXEC) ..." - $(LD) $(LDFLAGS) $(OBJS) -o $(EXEC) $(LIBS) - @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) - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - diff --git a/src/external/TFitPofB-lib/test/TFitPofB_startup.xml b/src/external/TFitPofB-lib/test/TFitPofB_startup.xml deleted file mode 100644 index 0e4c327c..00000000 --- a/src/external/TFitPofB-lib/test/TFitPofB_startup.xml +++ /dev/null @@ -1,78 +0,0 @@ - - - - TFitPofB_startup.xml - Here some external parameters used in conjunction with the TFitPofB-library are set. - There are different sections: - * Common parameters which are used for any kind of function - * Parameters for low energy uSR data analysis with given B(z) - * Parameters for bulk uSR data analysis (currently only four model to calculate field distributions for a triangular vortex lattice) - - Common parameters: - - debug : set it to 1 in order to obtain some information what is read from the xml-file - - wisdom : sets the path to an FFTW-wisdom file - if there is no valid wisdom at the given path, wisdom handling will be disabled - - delta_t : time resolution of P(t) in microseconds - - delta_B : field resolution of P(B) in Gauss - - LEM parameters (if the LEM tag is present it is expected that the data_path tag contains a valid path): - - data_path, energy_list : Defines path/prefix, energy-labels and energies (keV) of TrimSP-rge-files - The expected file-names are then: data_path + energy_label + .rge - - N_theory : determines the number of points in "real space" where the theory function B(z) will be calculated (if necessary) - - bulk parameters: - - N_VortexGrid : determines the number of points used for the calculation of the vortex lattice field distribution (the grid will be N*N) - - 0 - /home/l_wojek/analysis/WordsOfWisdom.dat - 0.01 - 0.1 - - 256 - - - /home/l_wojek/TrimSP/YBCOxtal/YBCOxtal-500000- - 5000 - - 03_0 - 3.0 - 03_6 - 3.6 - 05_0 - 5.0 - 05_3 - 5.3 - 07_0 - 7.0 - 07_7 - 7.7 - 08_0 - 8.0 - 09_0 - 9.0 - 10_0 - 10.0 - 10_2 - 10.2 - 12_0 - 12.0 - 14_1 - 14.1 - 16_0 - 16.0 - 16_4 - 16.4 - 18_0 - 18.0 - 19_7 - 19.7 - 20_0 - 20.0 - 22_0 - 22.0 - 24_0 - 24.0 - 24_6 - 24.6 - - - diff --git a/src/external/TFitPofB-lib/test/test.cpp b/src/external/TFitPofB-lib/test/test.cpp deleted file mode 100644 index 7f85b1f4..00000000 --- a/src/external/TFitPofB-lib/test/test.cpp +++ /dev/null @@ -1,493 +0,0 @@ -#include "TLondon1D.h" -#include -#include -#include - -using namespace std; - -int main(){ - string rge_path("/home/l_wojek/TrimSP/YBCOxtal/YBCOxtal-500000-"); - string energy_arr[] = {"03_0", "03_6", "05_0", "05_3", "07_0", "07_7", "08_0", "09_0", "10_0", "10_2", "12_0", "14_1", "16_0", "16_4", "18_0", "19_7", "20_0", "22_0", "24_0", "24_6"}; - - double E(24.0); - - vector energy_vec(energy_arr, energy_arr+(sizeof(energy_arr)/sizeof(energy_arr[0]))); - - TTrimSPData calcData(rge_path, energy_vec); - -/* vector energies(calcData.Energy()); - for (unsigned int i(0); i z(calcData.DataZ(E)); - vector nz(calcData.DataNZ(E)); - - ofstream of("Implantation-profile-normal.dat"); - for (unsigned int i(0); i par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector interfaces; - interfaces.push_back(par_vec[3]+par_vec[4]); - interfaces.push_back(par_vec[3]+par_vec[4]+par_vec[5]); - interfaces.push_back(par_vec[3]+par_vec[4]+par_vec[5]+par_vec[6]); - - vector parForBofZ; - for (unsigned int i(2); i parForPofB; - parForPofB.push_back(0.01); //dt - parForPofB.push_back(0.05); //dB - parForPofB.push_back(par_vec[1]); - - vector parForPofT; - parForPofT.push_back(par_vec[0]); //phase - parForPofT.push_back(0.01); //dt - parForPofT.push_back(0.05); //dB - - TLondon1D_3L BofZ(5000, parForBofZ); - - vector zz; - vector Bz; - for(double i(0.5); i<2001; i+=1.0) { - zz.push_back(i/10.0); - if(!(i/10.0 < parForBofZ[1]) && !(i/10.0 > parForBofZ[1]+parForBofZ[2]+parForBofZ[3]+parForBofZ[4])) { - Bz.push_back(BofZ.GetBofZ(i/10.0)); - } - else { - Bz.push_back(parForBofZ[0]); - } - } - - char debugfile1[50]; - int nn = sprintf (debugfile1, "4Ltest-Bz_z-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]); - if (nn > 0) { - ofstream of01(debugfile1); - for (unsigned int i(0); i<2000; i++) { - of01 << zz[i] << " " << Bz[i] << endl; - } - of01.close(); - } - - TPofBCalc PofB(BofZ, calcData, parForPofB); -// PofB.ConvolveGss(1.17); - - PofB.AddBackground(par_vec[2], 0.2, calcData.LayerFraction(E, 4, interfaces)); - PofB.ConvolveGss(1.17); - - vector hurgaB(PofB.DataB()); - vector hurgaPB(PofB.DataPB()); - - char debugfile[50]; - int n = sprintf (debugfile, "4Ltest-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]); - - if (n > 0) { - ofstream of7(debugfile); - for (unsigned int i(0); i 0) { - ofstream of8(debugfilex); - for (double i(0.); i<12.0; i+=0.003) { - of8 << i << " " << poft.Eval(i) << endl; - } - of8.close(); - } -/* - PofB.ConvolveGss(8.8); - - vector hurgaB1(PofB.DataB()); - vector hurgaPB1(PofB.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend8.8G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of1(debugfile); - for (unsigned int i(0); i z2(calcData.DataZ(par_vec[1])); - vector nz2(calcData.DataNZ(par_vec[1])); - - ofstream of2("Implantation-profile-broad.dat"); - for (unsigned int i(0); i hurgaB2(PofB2.DataB()); - vector hurgaPB2(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n>0) { - ofstream of8(debugfile); - for (unsigned int i(0); i hurgaB3(PofB2.DataB()); - vector hurgaPB3(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm+7.5G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of9(debugfile); - for (unsigned int i(0); i parameter(param,param+8); - vector param_for_BofZ; - vector param_for_PofB; - vector param_for_PofT; - - for (unsigned int i(0); i<4; i++) - param_for_BofZ.push_back(parameter[i]); - - for (unsigned int i(5); i<8; i++) - param_for_PofB.push_back(parameter[i]); - - for (unsigned int i(4); i<7; i++) - param_for_PofT.push_back(parameter[i]); - - TLondon1D_1L bofz(param_for_BofZ); - - cout << "Bmin = " << bofz.GetBmin() << endl; - cout << "Bmax = " << bofz.GetBmax() << endl; - cout << "dZ = " << bofz.GetdZ() << endl; - - ofstream of5("test_Bz.dat"); - for (double i(0); i<50.; i+=0.1) { - of5 << i << " " << bofz.GetBofZ(i) << endl; - } - of5.close(); - - ofstream of6("test_zBz.dat"); - for (unsigned int i(0); i hurgaB(pofb.DataB()); - vector hurgaPB(pofb.DataPB()); - - ofstream of7("test_BpB.dat"); - for (unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - -// vector par_vec_sub; - -// for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i data01, data02, data03, data04, data05, data06, data07, data08, data09, data10; - - for (double i(0.); i<12.0; i+=0.003) - data01.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data02.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data03.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data04.push_back(fitter.Eval(i, par_vec_sub)); - - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data05.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data06.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data07.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] = 190.0; - - for (double i(0.); i<12.0; i+=0.003) - data08.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data09.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data10.push_back(fitter.Eval(i, par_vec_sub)); - - */ - - -// par_vec.clear(); - - - - - - return EXIT_SUCCESS; -} diff --git a/src/external/TFitPofB-lib/test/testVortex-v2.cpp b/src/external/TFitPofB-lib/test/testVortex-v2.cpp deleted file mode 100644 index 5f4685d5..00000000 --- a/src/external/TFitPofB-lib/test/testVortex-v2.cpp +++ /dev/null @@ -1,635 +0,0 @@ -#include "TPofTCalc.h" -#include -#include - -using namespace std; - -#include -#include - -int main(){ - - unsigned int NFFT(256); - - vector parForVortex; - parForVortex.resize(3); - -// parForVortex[0] = 100.0; //app.field -// parForVortex[1] = 200.0; //lambda -// parForVortex[2] = 4.0; //xi - - vector parForPofB; - parForPofB.push_back(0.005); //dt - parForPofB.push_back(20.0); //dB - - vector parForPofT; - parForPofT.push_back(0.0); //phase - parForPofT.push_back(0.005); //dt - parForPofT.push_back(20.0); //dB - - TBulkTriVortexLondonFieldCalc *vortexLattice = new TBulkTriVortexLondonFieldCalc("/home/l_wojek/analysis/WordsOfWisdom.dat", NFFT); - - parForVortex[0] = 3000.0; //app.field - parForVortex[1] = 100.0; //lambda - parForVortex[2] = 4.0; //xi - - vortexLattice->SetParameters(parForVortex); - vortexLattice->CalculateGrid(); - - ofstream ofy("testVortex-B.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofy << vortexLattice->DataB()[j] << " "; - if (!((j+1)%(NFFT))) - ofy << endl; - } - ofy.close(); - - TPofBCalc *PofB = new TPofBCalc(parForPofB); - PofB->Calculate(vortexLattice, parForPofB); - - const double *b(PofB->DataB()); - double *pb(PofB->DataPB()); - unsigned int s(PofB->GetPBSize()); - - double test(0.0); - - ofstream ofx("testVortex.dat"); - for (unsigned int i(0); i < s; i++) { - ofx << b[i] << " " << pb[i] << endl; - test+=pb[i]; - } - ofx.close(); - - cout << test << endl; - - TPofTCalc poft(PofB, "/home/l_wojek/analysis/WordsOfWisdom.dat", parForPofT); - - poft.DoFFT(); - poft.CalcPol(parForPofT); - - - - ofstream of8("testVortex-Pt.dat"); - for (double i(0.); i<12.0; i+=0.003) { - test = poft.Eval(i); - of8 << i << " " << poft.Eval(i) << endl; - } - of8.close(); - -// parForVortex[0] = 500.0; //app.field -// parForVortex[1] = 100.0; //lambda -// parForVortex[2] = 3.0; //xi -// -// vortexLattice->SetParameters(parForVortex); -// vortexLattice->CalculateGrid(); -// PofB->UnsetPBExists(); -// PofB->Calculate(vortexLattice, parForPofB); -// -// poft.DoFFT(); -// poft.CalcPol(parForPofT); -// -// ofstream of9("testVortex-Pt1.dat"); -// for (double i(0.); i<12.0; i+=0.003) { -// // test = poft.Eval(i); -// of9 << i << " " << poft.Eval(i) << endl; -// } -// of9.close(); - - delete vortexLattice; - vortexLattice = 0; - delete PofB; - PofB = 0; - - parForPofB.clear(); - parForPofT.clear(); - parForVortex.clear(); - -/* - double par_arr[] = {24.4974, E, 94.6, 10.0, 130.0}; - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - - vector parForBofZ; - for (unsigned int i(2); i parForPofB; - parForPofB.push_back(0.01); //dt - parForPofB.push_back(0.1); //dB - parForPofB.push_back(par_vec[1]); - parForPofB.push_back(par_vec[2]); // Bkg-Field - parForPofB.push_back(0.005); // Bkg-width (in principle zero) - vector interfaces; - interfaces.push_back(par_vec[3]); // dead layer - parForPofB.push_back(calcData.LayerFraction(par_vec[1], 1, interfaces)); // Fraction of muons in the deadlayer - - - vector zonk; - vector donk; - vector hurgaB; - vector hurgaPB; - - for (unsigned int u(0); u<10 ; u++) { - - parForBofZ[par_vec.size()-3] = par_vec[4] + double(u)*5.; - - TLondon1D_HS *BofZ = new TLondon1D_HS(parForBofZ); - TPofBCalc *PofB = new TPofBCalc(*BofZ, calcData, parForPofB); - - if(u == 0){ - hurgaB = PofB->DataB(); - hurgaPB = PofB->DataPB(); - PofB->ConvolveGss(7.0); - donk = PofB->DataPB(); - } - - delete BofZ; - delete PofB; - } - -// TPofBCalc sumPB(hurgaB, zonk); - -// sumPB.AddBackground(par_vec[2], 0.15, 0.1); -// sumPB.ConvolveGss(7.0); -// donk = sumPB.DataPB(); - - char debugfile[50]; - int n = sprintf (debugfile, "testInverseExp-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of7(debugfile); - for (unsigned int i(0); i parForPofT; -// parForPofT.push_back(par_vec[0]); //phase -// parForPofT.push_back(0.01); //dt -// parForPofT.push_back(0.02); //dB - -// TLondon1D_HS BofZ(parForBofZ); - -// vector zz; -// vector Bz; -// for(double i(0.5); i<2001; i+=1.0) { -// zz.push_back(i/10.0); -// if(!(i/10.0 < parForBofZ[1])) { -// Bz.push_back(BofZ.GetBofZ(i/10.0)); -// } -// else { -// Bz.push_back(parForBofZ[0]); -// } -// } -/* - char debugfile1[50]; - int nn = sprintf (debugfile1, "testInverseExp-Bz_z-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]); - if (nn > 0) { - ofstream of01(debugfile1); - for (unsigned int i(0); i<2000; i++) { - of01 << zz[i] << " " << Bz[i] << endl; - } - of01.close(); - } - */ -// TPofBCalc PofB(BofZ, calcData, parForPofB); - - -// double t1(0.0); -// get start time -// struct timeval tv_start, tv_stop; -// gettimeofday(&tv_start, 0); -// -// TPofBCalc PofB(BofZ, calcData, parForPofB); -// -// gettimeofday(&tv_stop, 0); -// t1 = (tv_stop.tv_sec - tv_start.tv_sec)*1000.0 + (tv_stop.tv_usec - tv_start.tv_usec)/1000.0; - -// cout << "p(B) calculation time with derivatives of the inverse function: " << t1 << " ms" << endl; - -// gettimeofday(&tv_start, 0); -// -// BofZ.Calculate(); -// TPofBCalc PofB1(BofZ, calcData, parForPofB, 1); -// -// gettimeofday(&tv_stop, 0); -// t1 = (tv_stop.tv_sec - tv_start.tv_sec)*1000.0 + (tv_stop.tv_usec - tv_start.tv_usec)/1000.0; -// -// cout << "p(B) calculation time without derivatives of the inverse function: " << t1 << " ms" << endl; - -// PofB.ConvolveGss(1.17); - -// PofB.AddBackground(par_vec[2], 0.2, calcData.LayerFraction(E, 4, interfaces)); -// PofB.ConvolveGss(1.17); - -// vector hurgaB(PofB.DataB()); -// vector hurgaPB(PofB.DataPB()); -// vector hurgaPB1(PofB1.DataPB()); -// -// char debugfile[50]; -// int n = sprintf (debugfile, "testInverseExp-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[4], par_vec[1]); -// -// if (n > 0) { -// ofstream of7(debugfile); -// for (unsigned int i(0); i 0) { -// ofstream of8(debugfilex); -// for (double i(0.); i<12.0; i+=0.003) { -// of8 << i << " " << poft.Eval(i) << endl; -// } -// of8.close(); -// } -/* - PofB.ConvolveGss(8.8); - - vector hurgaB1(PofB.DataB()); - vector hurgaPB1(PofB.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend8.8G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of1(debugfile); - for (unsigned int i(0); i z2(calcData.DataZ(par_vec[1])); - vector nz2(calcData.DataNZ(par_vec[1])); - - ofstream of2("Implantation-profile-broad.dat"); - for (unsigned int i(0); i hurgaB2(PofB2.DataB()); - vector hurgaPB2(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n>0) { - ofstream of8(debugfile); - for (unsigned int i(0); i hurgaB3(PofB2.DataB()); - vector hurgaPB3(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm+7.5G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of9(debugfile); - for (unsigned int i(0); i parameter(param,param+8); - vector param_for_BofZ; - vector param_for_PofB; - vector param_for_PofT; - - for (unsigned int i(0); i<4; i++) - param_for_BofZ.push_back(parameter[i]); - - for (unsigned int i(5); i<8; i++) - param_for_PofB.push_back(parameter[i]); - - for (unsigned int i(4); i<7; i++) - param_for_PofT.push_back(parameter[i]); - - TLondon1D_1L bofz(param_for_BofZ); - - cout << "Bmin = " << bofz.GetBmin() << endl; - cout << "Bmax = " << bofz.GetBmax() << endl; - cout << "dZ = " << bofz.GetdZ() << endl; - - ofstream of5("test_Bz.dat"); - for (double i(0); i<50.; i+=0.1) { - of5 << i << " " << bofz.GetBofZ(i) << endl; - } - of5.close(); - - ofstream of6("test_zBz.dat"); - for (unsigned int i(0); i hurgaB(pofb.DataB()); - vector hurgaPB(pofb.DataPB()); - - ofstream of7("test_BpB.dat"); - for (unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - -// vector par_vec_sub; - -// for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i data01, data02, data03, data04, data05, data06, data07, data08, data09, data10; - - for (double i(0.); i<12.0; i+=0.003) - data01.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data02.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data03.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data04.push_back(fitter.Eval(i, par_vec_sub)); - - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data05.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data06.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data07.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] = 190.0; - - for (double i(0.); i<12.0; i+=0.003) - data08.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data09.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data10.push_back(fitter.Eval(i, par_vec_sub)); - - */ - - -// par_vec.clear(); - - - - - - return 0; -} diff --git a/src/external/TFitPofB-lib/test/testVortex.cpp b/src/external/TFitPofB-lib/test/testVortex.cpp deleted file mode 100644 index d109e1e6..00000000 --- a/src/external/TFitPofB-lib/test/testVortex.cpp +++ /dev/null @@ -1,565 +0,0 @@ -#include "TPofTCalc.h" -#include -#include - -using namespace std; - -#include -#include - -int main(){ - - vector parForVortex; - parForVortex.push_back(150.0); //lambda - parForVortex.push_back(3.0); //xi - parForVortex.push_back(500.0); //app.field - - vector parForPofB; - parForPofB.push_back(0.01); //dt - parForPofB.push_back(1.0); //dB - - TBulkTriVortexLondonFieldCalc *vortexLattice = new TBulkTriVortexLondonFieldCalc(parForVortex, 250, 17); - TPofBCalc *PofB = new TPofBCalc(*vortexLattice, parForPofB); - - vector b(PofB->DataB()); - vector pb(PofB->DataPB()); - - double test(0.0); - - ofstream ofx("testVector.dat"); - for (unsigned int i(0); i par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - - vector parForBofZ; - for (unsigned int i(2); i parForPofB; - parForPofB.push_back(0.01); //dt - parForPofB.push_back(0.1); //dB - parForPofB.push_back(par_vec[1]); - parForPofB.push_back(par_vec[2]); // Bkg-Field - parForPofB.push_back(0.005); // Bkg-width (in principle zero) - vector interfaces; - interfaces.push_back(par_vec[3]); // dead layer - parForPofB.push_back(calcData.LayerFraction(par_vec[1], 1, interfaces)); // Fraction of muons in the deadlayer - - - vector zonk; - vector donk; - vector hurgaB; - vector hurgaPB; - - for (unsigned int u(0); u<10 ; u++) { - - parForBofZ[par_vec.size()-3] = par_vec[4] + double(u)*5.; - - TLondon1D_HS *BofZ = new TLondon1D_HS(parForBofZ); - TPofBCalc *PofB = new TPofBCalc(*BofZ, calcData, parForPofB); - - if(u == 0){ - hurgaB = PofB->DataB(); - hurgaPB = PofB->DataPB(); - PofB->ConvolveGss(7.0); - donk = PofB->DataPB(); - } - - delete BofZ; - delete PofB; - } - -// TPofBCalc sumPB(hurgaB, zonk); - -// sumPB.AddBackground(par_vec[2], 0.15, 0.1); -// sumPB.ConvolveGss(7.0); -// donk = sumPB.DataPB(); - - char debugfile[50]; - int n = sprintf (debugfile, "testInverseExp-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of7(debugfile); - for (unsigned int i(0); i parForPofT; -// parForPofT.push_back(par_vec[0]); //phase -// parForPofT.push_back(0.01); //dt -// parForPofT.push_back(0.02); //dB - -// TLondon1D_HS BofZ(parForBofZ); - -// vector zz; -// vector Bz; -// for(double i(0.5); i<2001; i+=1.0) { -// zz.push_back(i/10.0); -// if(!(i/10.0 < parForBofZ[1])) { -// Bz.push_back(BofZ.GetBofZ(i/10.0)); -// } -// else { -// Bz.push_back(parForBofZ[0]); -// } -// } -/* - char debugfile1[50]; - int nn = sprintf (debugfile1, "testInverseExp-Bz_z-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]); - if (nn > 0) { - ofstream of01(debugfile1); - for (unsigned int i(0); i<2000; i++) { - of01 << zz[i] << " " << Bz[i] << endl; - } - of01.close(); - } - */ -// TPofBCalc PofB(BofZ, calcData, parForPofB); - - -// double t1(0.0); -// get start time -// struct timeval tv_start, tv_stop; -// gettimeofday(&tv_start, 0); -// -// TPofBCalc PofB(BofZ, calcData, parForPofB); -// -// gettimeofday(&tv_stop, 0); -// t1 = (tv_stop.tv_sec - tv_start.tv_sec)*1000.0 + (tv_stop.tv_usec - tv_start.tv_usec)/1000.0; - -// cout << "p(B) calculation time with derivatives of the inverse function: " << t1 << " ms" << endl; - -// gettimeofday(&tv_start, 0); -// -// BofZ.Calculate(); -// TPofBCalc PofB1(BofZ, calcData, parForPofB, 1); -// -// gettimeofday(&tv_stop, 0); -// t1 = (tv_stop.tv_sec - tv_start.tv_sec)*1000.0 + (tv_stop.tv_usec - tv_start.tv_usec)/1000.0; -// -// cout << "p(B) calculation time without derivatives of the inverse function: " << t1 << " ms" << endl; - -// PofB.ConvolveGss(1.17); - -// PofB.AddBackground(par_vec[2], 0.2, calcData.LayerFraction(E, 4, interfaces)); -// PofB.ConvolveGss(1.17); - -// vector hurgaB(PofB.DataB()); -// vector hurgaPB(PofB.DataPB()); -// vector hurgaPB1(PofB1.DataPB()); -// -// char debugfile[50]; -// int n = sprintf (debugfile, "testInverseExp-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[4], par_vec[1]); -// -// if (n > 0) { -// ofstream of7(debugfile); -// for (unsigned int i(0); i 0) { -// ofstream of8(debugfilex); -// for (double i(0.); i<12.0; i+=0.003) { -// of8 << i << " " << poft.Eval(i) << endl; -// } -// of8.close(); -// } -/* - PofB.ConvolveGss(8.8); - - vector hurgaB1(PofB.DataB()); - vector hurgaPB1(PofB.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend8.8G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of1(debugfile); - for (unsigned int i(0); i z2(calcData.DataZ(par_vec[1])); - vector nz2(calcData.DataNZ(par_vec[1])); - - ofstream of2("Implantation-profile-broad.dat"); - for (unsigned int i(0); i hurgaB2(PofB2.DataB()); - vector hurgaPB2(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n>0) { - ofstream of8(debugfile); - for (unsigned int i(0); i hurgaB3(PofB2.DataB()); - vector hurgaPB3(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm+7.5G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of9(debugfile); - for (unsigned int i(0); i parameter(param,param+8); - vector param_for_BofZ; - vector param_for_PofB; - vector param_for_PofT; - - for (unsigned int i(0); i<4; i++) - param_for_BofZ.push_back(parameter[i]); - - for (unsigned int i(5); i<8; i++) - param_for_PofB.push_back(parameter[i]); - - for (unsigned int i(4); i<7; i++) - param_for_PofT.push_back(parameter[i]); - - TLondon1D_1L bofz(param_for_BofZ); - - cout << "Bmin = " << bofz.GetBmin() << endl; - cout << "Bmax = " << bofz.GetBmax() << endl; - cout << "dZ = " << bofz.GetdZ() << endl; - - ofstream of5("test_Bz.dat"); - for (double i(0); i<50.; i+=0.1) { - of5 << i << " " << bofz.GetBofZ(i) << endl; - } - of5.close(); - - ofstream of6("test_zBz.dat"); - for (unsigned int i(0); i hurgaB(pofb.DataB()); - vector hurgaPB(pofb.DataPB()); - - ofstream of7("test_BpB.dat"); - for (unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - -// vector par_vec_sub; - -// for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i data01, data02, data03, data04, data05, data06, data07, data08, data09, data10; - - for (double i(0.); i<12.0; i+=0.003) - data01.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data02.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data03.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data04.push_back(fitter.Eval(i, par_vec_sub)); - - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data05.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data06.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data07.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] = 190.0; - - for (double i(0.); i<12.0; i+=0.003) - data08.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data09.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data10.push_back(fitter.Eval(i, par_vec_sub)); - - */ - - -// par_vec.clear(); - - - - - - return 0; -} diff --git a/src/external/TFitPofB-lib/test/testVortexFilm.cpp b/src/external/TFitPofB-lib/test/testVortexFilm.cpp deleted file mode 100644 index b94a26c8..00000000 --- a/src/external/TFitPofB-lib/test/testVortexFilm.cpp +++ /dev/null @@ -1,1005 +0,0 @@ -#include "TPofTCalc.h" -#include "TFilmTriVortexFieldCalc.h" -#include -#include - -using namespace std; - -#include -#include -#include - -int main(){ - - unsigned int NFFT(64), NFFTz(64), k(0); - - vector parForVortex; - parForVortex.resize(4); - -// parForVortex[0] = 100.0; //app.field -// parForVortex[1] = 200.0; //lambda -// parForVortex[2] = 4.0; //xi - - vector parForPofB; - parForPofB.push_back(0.001); //dt - parForPofB.push_back(1.0); //dB - - vector parForPofT; - parForPofT.push_back(0.0); //phase - parForPofT.push_back(0.001); //dt - parForPofT.push_back(1.0); //dB - - TFilmTriVortexNGLFieldCalc *vortexLattice = new TFilmTriVortexNGLFieldCalc("/home/l_wojek/analysis/WordsOfWisdomFloat.dat", NFFT, NFFTz); - - parForVortex[0] = 258.0f; //app.field - parForVortex[1] = 10.0f; //lambda - parForVortex[2] = 7.143f; //xi - parForVortex[3] = 80.f; // film-thickness - - vortexLattice->SetParameters(parForVortex); - vortexLattice->CalculateGrid(); - - char debugfile[50]; - int n; - ofstream *of; - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-AkReal%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetAkMatrix()[l + NFFTz*(j + NFFT*i)][0] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-AkImag%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetAkMatrix()[l + NFFTz*(j + NFFT*i)][1] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-BkReal%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetBkMatrix()[l + NFFTz*(j + NFFT*i)][0] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-BkImag%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetBkMatrix()[l + NFFTz*(j + NFFT*i)][1] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - n = sprintf (debugfile, "testFilmVortex-BkS%02u.dat", 0); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetBkSMatrix()[(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - - - k = 1; - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-omega%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetOmegaMatrix()[l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-RealSpaceReal%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetRealSpaceMatrix()[l + NFFTz*(j + NFFT*i)][0] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-RealSpaceImag%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetRealSpaceMatrix()[l + NFFTz*(j + NFFT*i)][1] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-omegaDX%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetOmegaDiffMatrix()[0][l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-omegaDY%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetOmegaDiffMatrix()[1][l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-omegaDZ%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetOmegaDiffMatrix()[2][l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-Qx%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetQMatrix()[l + NFFTz*(j + NFFT*i)][0] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-Qy%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetQMatrix()[l + NFFTz*(j + NFFT*i)][1] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-Px%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetPMatrix()[l + NFFTz*(j + NFFT*i)][0] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-Py%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->GetPMatrix()[l + NFFTz*(j + NFFT*i)][1] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-Bx%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->DataB()[0][l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-By%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->DataB()[1][l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - - for (unsigned int l = 0; l < NFFTz; ++l) { - n = sprintf (debugfile, "testFilmVortex-Bz%02u.dat", l); - - if (n > 0) { - of = new ofstream(debugfile); - for (unsigned int i(0); i < NFFT; i++) { - for (unsigned int j(0); j < NFFT; j++) { - *of << vortexLattice->DataB()[2][l + NFFTz*(j + NFFT*i)] << " "; - } - *of << endl; - } - } - of->close(); - delete of; of = 0; - } - -/* - ofstream ofx1("testVortex-omegaDY.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofx1 << vortexLattice->GetOmegaDiffMatrix()[j][1] << " "; - if (!((j+1)%(NFFT))) - ofx1 << endl; - } - ofx1.close(); - - ofstream ofx2("testVortex-B.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofx2 << vortexLattice->GetBMatrix()[j] << " "; - if (!((j+1)%(NFFT))) - ofx2 << endl; - } - ofx2.close(); - - ofstream ofx3("testVortex-Qx.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofx3 << vortexLattice->GetQMatrix()[j][0] << " "; - if (!((j+1)%(NFFT))) - ofx3 << endl; - } - ofx3.close(); - - ofstream ofx4("testVortex-Qy.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofx4 << vortexLattice->GetQMatrix()[j][1] << " "; - if (!((j+1)%(NFFT))) - ofx4 << endl; - } - ofx4.close(); -*/ -// ofstream ofx5("testVortex-TempReal.dat"); -// for (unsigned int j(0); j < NFFT * NFFT; j++) { -// ofx5 << vortexLattice->GetTempMatrix()[j][0] << " "; -// if (!((j+1)%(NFFT))) -// ofx5 << endl; -// } -// ofx5.close(); -// -// ofstream ofx6("testVortex-TempImag.dat"); -// for (unsigned int j(0); j < NFFT * NFFT; j++) { -// ofx6 << vortexLattice->GetTempMatrix()[j][1] << " "; -// if (!((j+1)%(NFFT))) -// ofx6 << endl; -// } -// ofx6.close(); -/* - ofstream ofz("testVortex-AReal.dat"); - for (unsigned int j(0); j < (NFFT/2 + 1) * NFFT; j++) { - ofz << vortexLattice->GetAkMatrix()[j][0] << " "; - if (!((j+1)%(NFFT/2 + 1))) - ofz << endl; - } - ofz.close(); - - ofstream ofz1("testVortex-AImag.dat"); - for (unsigned int j(0); j < (NFFT/2 + 1) * NFFT; j++) { - ofz1 << vortexLattice->GetAkMatrix()[j][1] << " "; - if (!((j+1)%(NFFT/2 + 1))) - ofz1 << endl; - } - ofz1.close(); - - ofstream ofz2("testVortex-BReal.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofz2 << vortexLattice->GetBkMatrix()[j][0] << " "; - if (!((j+1)%(NFFT))) - ofz2 << endl; - } - ofz2.close(); - - ofstream ofz3("testVortex-BImag.dat"); - for (unsigned int j(0); j < NFFT * NFFT; j++) { - ofz3 << vortexLattice->GetBkMatrix()[j][1] << " "; - if (!((j+1)%(NFFT))) - ofz3 << endl; - } - ofz3.close(); - - TPofBCalc *PofB = new TPofBCalc(parForPofB); - PofB->Calculate(vortexLattice, parForPofB); - - const double *b(PofB->DataB()); - double *pb(PofB->DataPB()); - unsigned int s(PofB->GetPBSize()); - - double test(0.0); - - ofstream ofxx("testVortex.dat"); - for (unsigned int i(0); i < s; i++) { - ofxx << b[i] << " " << pb[i] << endl; - test+=pb[i]; - } - ofxx.close(); - - cout << test << endl; - - TPofTCalc poft(PofB, "/home/l_wojek/analysis/WordsOfWisdom.dat", parForPofT); - - poft.DoFFT(); - poft.CalcPol(parForPofT); - - - - ofstream of8("testVortex-Pt.dat"); - for (double i(0.); i<12.0; i+=0.003) { - test = poft.Eval(i); - of8 << i << " " << poft.Eval(i) << endl; - } - of8.close(); -*/ -// parForVortex[0] = 500.0; //app.field -// parForVortex[1] = 100.0; //lambda -// parForVortex[2] = 3.0; //xi -// -// vortexLattice->SetParameters(parForVortex); -// vortexLattice->CalculateGrid(); -// PofB->UnsetPBExists(); -// PofB->Calculate(vortexLattice, parForPofB); -// -// poft.DoFFT(); -// poft.CalcPol(parForPofT); -// -// ofstream of9("testVortex-Pt1.dat"); -// for (double i(0.); i<12.0; i+=0.003) { -// // test = poft.Eval(i); -// of9 << i << " " << poft.Eval(i) << endl; -// } -// of9.close(); - - delete vortexLattice; - vortexLattice = 0; -// delete PofB; -// PofB = 0; - - parForPofB.clear(); - parForPofT.clear(); - parForVortex.clear(); - -/* - double par_arr[] = {24.4974, E, 94.6, 10.0, 130.0}; - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - - vector parForBofZ; - for (unsigned int i(2); i parForPofB; - parForPofB.push_back(0.01); //dt - parForPofB.push_back(0.1); //dB - parForPofB.push_back(par_vec[1]); - parForPofB.push_back(par_vec[2]); // Bkg-Field - parForPofB.push_back(0.005); // Bkg-width (in principle zero) - vector interfaces; - interfaces.push_back(par_vec[3]); // dead layer - parForPofB.push_back(calcData.LayerFraction(par_vec[1], 1, interfaces)); // Fraction of muons in the deadlayer - - - vector zonk; - vector donk; - vector hurgaB; - vector hurgaPB; - - for (unsigned int u(0); u<10 ; u++) { - - parForBofZ[par_vec.size()-3] = par_vec[4] + double(u)*5.; - - TLondon1D_HS *BofZ = new TLondon1D_HS(parForBofZ); - TPofBCalc *PofB = new TPofBCalc(*BofZ, calcData, parForPofB); - - if(u == 0){ - hurgaB = PofB->DataB(); - hurgaPB = PofB->DataPB(); - PofB->ConvolveGss(7.0); - donk = PofB->DataPB(); - } - - delete BofZ; - delete PofB; - } - -// TPofBCalc sumPB(hurgaB, zonk); - -// sumPB.AddBackground(par_vec[2], 0.15, 0.1); -// sumPB.ConvolveGss(7.0); -// donk = sumPB.DataPB(); - - char debugfile[50]; - int n = sprintf (debugfile, "testInverseExp-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of7(debugfile); - for (unsigned int i(0); i parForPofT; -// parForPofT.push_back(par_vec[0]); //phase -// parForPofT.push_back(0.01); //dt -// parForPofT.push_back(0.02); //dB - -// TLondon1D_HS BofZ(parForBofZ); - -// vector zz; -// vector Bz; -// for(double i(0.5); i<2001; i+=1.0) { -// zz.push_back(i/10.0); -// if(!(i/10.0 < parForBofZ[1])) { -// Bz.push_back(BofZ.GetBofZ(i/10.0)); -// } -// else { -// Bz.push_back(parForBofZ[0]); -// } -// } -/* - char debugfile1[50]; - int nn = sprintf (debugfile1, "testInverseExp-Bz_z-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]); - if (nn > 0) { - ofstream of01(debugfile1); - for (unsigned int i(0); i<2000; i++) { - of01 << zz[i] << " " << Bz[i] << endl; - } - of01.close(); - } - */ -// TPofBCalc PofB(BofZ, calcData, parForPofB); - - -// double t1(0.0); -// get start time -// struct timeval tv_start, tv_stop; -// gettimeofday(&tv_start, 0); -// -// TPofBCalc PofB(BofZ, calcData, parForPofB); -// -// gettimeofday(&tv_stop, 0); -// t1 = (tv_stop.tv_sec - tv_start.tv_sec)*1000.0 + (tv_stop.tv_usec - tv_start.tv_usec)/1000.0; - -// cout << "p(B) calculation time with derivatives of the inverse function: " << t1 << " ms" << endl; - -// gettimeofday(&tv_start, 0); -// -// BofZ.Calculate(); -// TPofBCalc PofB1(BofZ, calcData, parForPofB, 1); -// -// gettimeofday(&tv_stop, 0); -// t1 = (tv_stop.tv_sec - tv_start.tv_sec)*1000.0 + (tv_stop.tv_usec - tv_start.tv_usec)/1000.0; -// -// cout << "p(B) calculation time without derivatives of the inverse function: " << t1 << " ms" << endl; - -// PofB.ConvolveGss(1.17); - -// PofB.AddBackground(par_vec[2], 0.2, calcData.LayerFraction(E, 4, interfaces)); -// PofB.ConvolveGss(1.17); - -// vector hurgaB(PofB.DataB()); -// vector hurgaPB(PofB.DataPB()); -// vector hurgaPB1(PofB1.DataPB()); -// -// char debugfile[50]; -// int n = sprintf (debugfile, "testInverseExp-BpB_B-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[4], par_vec[1]); -// -// if (n > 0) { -// ofstream of7(debugfile); -// for (unsigned int i(0); i 0) { -// ofstream of8(debugfilex); -// for (double i(0.); i<12.0; i+=0.003) { -// of8 << i << " " << poft.Eval(i) << endl; -// } -// of8.close(); -// } -/* - PofB.ConvolveGss(8.8); - - vector hurgaB1(PofB.DataB()); - vector hurgaPB1(PofB.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend8.8G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of1(debugfile); - for (unsigned int i(0); i z2(calcData.DataZ(par_vec[1])); - vector nz2(calcData.DataNZ(par_vec[1])); - - ofstream of2("Implantation-profile-broad.dat"); - for (unsigned int i(0); i hurgaB2(PofB2.DataB()); - vector hurgaPB2(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n>0) { - ofstream of8(debugfile); - for (unsigned int i(0); i hurgaB3(PofB2.DataB()); - vector hurgaPB3(PofB2.DataPB()); - - n = sprintf (debugfile, "BpB_B-%.4f_l-%.3f_E-%.1f_broadend10nm+7.5G.dat", par_vec[2], par_vec[4], par_vec[1]); - - if (n > 0) { - ofstream of9(debugfile); - for (unsigned int i(0); i parameter(param,param+8); - vector param_for_BofZ; - vector param_for_PofB; - vector param_for_PofT; - - for (unsigned int i(0); i<4; i++) - param_for_BofZ.push_back(parameter[i]); - - for (unsigned int i(5); i<8; i++) - param_for_PofB.push_back(parameter[i]); - - for (unsigned int i(4); i<7; i++) - param_for_PofT.push_back(parameter[i]); - - TLondon1D_1L bofz(param_for_BofZ); - - cout << "Bmin = " << bofz.GetBmin() << endl; - cout << "Bmax = " << bofz.GetBmax() << endl; - cout << "dZ = " << bofz.GetdZ() << endl; - - ofstream of5("test_Bz.dat"); - for (double i(0); i<50.; i+=0.1) { - of5 << i << " " << bofz.GetBofZ(i) << endl; - } - of5.close(); - - ofstream of6("test_zBz.dat"); - for (unsigned int i(0); i hurgaB(pofb.DataB()); - vector hurgaPB(pofb.DataPB()); - - ofstream of7("test_BpB.dat"); - for (unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - -// vector par_vec_sub; - -// for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0]))); - vector par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0]))); - - vector par_vec_sub; - - for(unsigned int i(0); i data01, data02, data03, data04, data05, data06, data07, data08, data09, data10; - - for (double i(0.); i<12.0; i+=0.003) - data01.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data02.push_back(fitter.Eval(i, par_vec_sub)); - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data03.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data04.push_back(fitter.Eval(i, par_vec_sub)); - - - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data05.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data06.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data07.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] = 190.0; - - for (double i(0.); i<12.0; i+=0.003) - data08.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - par_vec_sub[10] -= 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data09.push_back(fitter.Eval(i, par_vec_sub)); - - par_vec_sub[0] += 10.0; - - for (double i(0.); i<12.0; i+=0.003) - data10.push_back(fitter.Eval(i, par_vec_sub)); - - */ - - -// par_vec.clear(); - - - - - - return 0; -} diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am index 1e502f41..5a5c51f8 100644 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ b/src/external/libCalcMeanFieldsLEM/Makefile.am @@ -18,7 +18,7 @@ dict_cpp_sources = \ include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) -INCLUDES = -I$(top_srcdir)/src/include $(BMWSTARTUP_CFLAGS) $(TFITPOFB_CFLAGS) $(PMUSR_CFLAGS) $(ROOT_CFLAGS) $(FFTW3_CFLAGS) +INCLUDES = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(FITPOFB_CFLAGS) $(PMUSR_CFLAGS) $(ROOT_CFLAGS) $(FFTW3_CFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) @@ -31,7 +31,7 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core lib_LTLIBRARIES = libCalcMeanFieldsLEM.la libCalcMeanFieldsLEM_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libCalcMeanFieldsLEM_la_LIBADD = $(BMWSTARTUP_LIBS) $(TFITPOFB_LIBS) $(PMUSR_LIBS) $(ROOT_LIBS) +libCalcMeanFieldsLEM_la_LIBADD = $(BMWTOOLS_LIBS) $(FITPOFB_LIBS) $(PMUSR_LIBS) $(ROOT_LIBS) libCalcMeanFieldsLEM_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) ## For the moment do not build pkgconfig files for musrfit plug-ins... diff --git a/src/external/TFitPofB-lib/Makefile.am b/src/external/libFitPofB/Makefile.am similarity index 100% rename from src/external/TFitPofB-lib/Makefile.am rename to src/external/libFitPofB/Makefile.am diff --git a/src/external/TFitPofB-lib/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am similarity index 63% rename from src/external/TFitPofB-lib/classes/Makefile.am rename to src/external/libFitPofB/classes/Makefile.am index 23f5e564..b7154ced 100644 --- a/src/external/TFitPofB-lib/classes/Makefile.am +++ b/src/external/libFitPofB/classes/Makefile.am @@ -7,7 +7,6 @@ h_sources = \ ../include/TPofBCalc.h \ ../include/TPofTCalc.h \ ../include/TSkewedGss.h \ - ../include/TTrimSPDataHandler.h \ ../include/TVortex.h h_linkdef = \ @@ -27,7 +26,6 @@ cpp_sources = \ TPofBCalc.cpp \ TPofTCalc.cpp \ TSkewedGss.cpp \ - TTrimSPDataHandler.cpp \ TVortex.cpp dict_cpp_sources = \ @@ -38,21 +36,21 @@ dict_cpp_sources = \ include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) -INCLUDES = -I$(top_srcdir)/src/include -I../include $(BMWSTARTUP_CFLAGS) $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(ROOT_CFLAGS) +INCLUDES = -I$(top_srcdir)/src/include -I../include $(BMWTOOLS_CFLAGS) $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(ROOT_CFLAGS) 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 *~ ../include/*~ core %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ -lib_LTLIBRARIES = libTFitPofB.la +lib_LTLIBRARIES = libFitPofB.la -libTFitPofB_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libTFitPofB_la_LIBADD = $(BMWSTARTUP_LIBS) $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS) -libTFitPofB_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) +libFitPofB_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) +libFitPofB_la_LIBADD = $(BMWTOOLS_LIBS) $(LEM_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS) +libFitPofB_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) ## For the moment do not build pkgconfig files for musrfit plug-ins... ## pkgconfigdir = $(libdir)/pkgconfig @@ -63,14 +61,14 @@ libTFitPofB_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUG if IS_DARWIN install-exec-hook: - $(LN_S) $(libdir)/libTFitPofB.dylib $(libdir)/libTFitPofB.so + $(LN_S) $(libdir)/libFitPofB.dylib $(libdir)/libFitPofB.so uninstall-hook: - rm -f $(libdir)/libTFitPofB.so + rm -f $(libdir)/libFitPofB.so endif if IS_CYGWIN install-exec-hook: - $(LN_S) $(bindir)/cygTFitPofB-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libTFitPofB.so + $(LN_S) $(bindir)/cygFitPofB-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libFitPofB.so uninstall-hook: - rm -f $(libdir)/libTFitPofB.so + rm -f $(libdir)/libFitPofB.so endif diff --git a/src/external/TFitPofB-lib/classes/TBofZCalc.cpp b/src/external/libFitPofB/classes/TBofZCalc.cpp similarity index 100% rename from src/external/TFitPofB-lib/classes/TBofZCalc.cpp rename to src/external/libFitPofB/classes/TBofZCalc.cpp diff --git a/src/external/TFitPofB-lib/classes/TBulkTriVortexFieldCalc.cpp b/src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp similarity index 100% rename from src/external/TFitPofB-lib/classes/TBulkTriVortexFieldCalc.cpp rename to src/external/libFitPofB/classes/TBulkTriVortexFieldCalc.cpp diff --git a/src/external/TFitPofB-lib/classes/TFilmTriVortexFieldCalc.cpp b/src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp similarity index 100% rename from src/external/TFitPofB-lib/classes/TFilmTriVortexFieldCalc.cpp rename to src/external/libFitPofB/classes/TFilmTriVortexFieldCalc.cpp diff --git a/src/external/TFitPofB-lib/classes/TLondon1D.cpp b/src/external/libFitPofB/classes/TLondon1D.cpp similarity index 99% rename from src/external/TFitPofB-lib/classes/TLondon1D.cpp rename to src/external/libFitPofB/classes/TLondon1D.cpp index 1d2011bf..0015d1e9 100644 --- a/src/external/TFitPofB-lib/classes/TLondon1D.cpp +++ b/src/external/libFitPofB/classes/TLondon1D.cpp @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - $Id$ + $Id: TLondon1D.cpp 4800 2011-03-16 16:43:13Z l_wojek $ ***************************************************************************/ diff --git a/src/external/TFitPofB-lib/classes/TPofBCalc.cpp b/src/external/libFitPofB/classes/TPofBCalc.cpp similarity index 100% rename from src/external/TFitPofB-lib/classes/TPofBCalc.cpp rename to src/external/libFitPofB/classes/TPofBCalc.cpp diff --git a/src/external/TFitPofB-lib/classes/TPofTCalc.cpp b/src/external/libFitPofB/classes/TPofTCalc.cpp similarity index 100% rename from src/external/TFitPofB-lib/classes/TPofTCalc.cpp rename to src/external/libFitPofB/classes/TPofTCalc.cpp diff --git a/src/external/TFitPofB-lib/classes/TSkewedGss.cpp b/src/external/libFitPofB/classes/TSkewedGss.cpp similarity index 98% rename from src/external/TFitPofB-lib/classes/TSkewedGss.cpp rename to src/external/libFitPofB/classes/TSkewedGss.cpp index 5eb98b1d..a38cede7 100644 --- a/src/external/TFitPofB-lib/classes/TSkewedGss.cpp +++ b/src/external/libFitPofB/classes/TSkewedGss.cpp @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - $Id$ + $Id: TSkewedGss.cpp 4800 2011-03-16 16:43:13Z l_wojek $ ***************************************************************************/ diff --git a/src/external/TFitPofB-lib/classes/TVortex.cpp b/src/external/libFitPofB/classes/TVortex.cpp similarity index 99% rename from src/external/TFitPofB-lib/classes/TVortex.cpp rename to src/external/libFitPofB/classes/TVortex.cpp index 230f4286..302260c1 100644 --- a/src/external/TFitPofB-lib/classes/TVortex.cpp +++ b/src/external/libFitPofB/classes/TVortex.cpp @@ -5,7 +5,7 @@ Author: Bastian M. Wojek e-mail: bastian.wojek@psi.ch - $Id$ + $Id: TVortex.cpp 4800 2011-03-16 16:43:13Z l_wojek $ ***************************************************************************/ diff --git a/src/external/TFitPofB-lib/include/TBofZCalc.h b/src/external/libFitPofB/include/TBofZCalc.h similarity index 100% rename from src/external/TFitPofB-lib/include/TBofZCalc.h rename to src/external/libFitPofB/include/TBofZCalc.h diff --git a/src/external/TFitPofB-lib/include/TBulkTriVortexFieldCalc.h b/src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h similarity index 100% rename from src/external/TFitPofB-lib/include/TBulkTriVortexFieldCalc.h rename to src/external/libFitPofB/include/TBulkTriVortexFieldCalc.h diff --git a/src/external/TFitPofB-lib/include/TFilmTriVortexFieldCalc.h b/src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h similarity index 100% rename from src/external/TFitPofB-lib/include/TFilmTriVortexFieldCalc.h rename to src/external/libFitPofB/include/TFilmTriVortexFieldCalc.h diff --git a/src/external/TFitPofB-lib/include/TLondon1D.h b/src/external/libFitPofB/include/TLondon1D.h similarity index 100% rename from src/external/TFitPofB-lib/include/TLondon1D.h rename to src/external/libFitPofB/include/TLondon1D.h diff --git a/src/external/TFitPofB-lib/include/TLondon1DLinkDef.h b/src/external/libFitPofB/include/TLondon1DLinkDef.h similarity index 100% rename from src/external/TFitPofB-lib/include/TLondon1DLinkDef.h rename to src/external/libFitPofB/include/TLondon1DLinkDef.h diff --git a/src/external/TFitPofB-lib/include/TPofBCalc.h b/src/external/libFitPofB/include/TPofBCalc.h similarity index 100% rename from src/external/TFitPofB-lib/include/TPofBCalc.h rename to src/external/libFitPofB/include/TPofBCalc.h diff --git a/src/external/TFitPofB-lib/include/TPofTCalc.h b/src/external/libFitPofB/include/TPofTCalc.h similarity index 100% rename from src/external/TFitPofB-lib/include/TPofTCalc.h rename to src/external/libFitPofB/include/TPofTCalc.h diff --git a/src/external/TFitPofB-lib/include/TSkewedGss.h b/src/external/libFitPofB/include/TSkewedGss.h similarity index 100% rename from src/external/TFitPofB-lib/include/TSkewedGss.h rename to src/external/libFitPofB/include/TSkewedGss.h diff --git a/src/external/TFitPofB-lib/include/TSkewedGssLinkDef.h b/src/external/libFitPofB/include/TSkewedGssLinkDef.h similarity index 100% rename from src/external/TFitPofB-lib/include/TSkewedGssLinkDef.h rename to src/external/libFitPofB/include/TSkewedGssLinkDef.h diff --git a/src/external/TFitPofB-lib/include/TVortex.h b/src/external/libFitPofB/include/TVortex.h similarity index 100% rename from src/external/TFitPofB-lib/include/TVortex.h rename to src/external/libFitPofB/include/TVortex.h diff --git a/src/external/TFitPofB-lib/include/TVortexLinkDef.h b/src/external/libFitPofB/include/TVortexLinkDef.h similarity index 100% rename from src/external/TFitPofB-lib/include/TVortexLinkDef.h rename to src/external/libFitPofB/include/TVortexLinkDef.h diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am index b60a6ec1..a2b90518 100644 --- a/src/external/libGapIntegrals/Makefile.am +++ b/src/external/libGapIntegrals/Makefile.am @@ -1,8 +1,7 @@ ## Process this file with automake to create Makefile.in h_sources = \ - TGapIntegrals.h \ - ../BMWIntegrator/BMWIntegrator.h + TGapIntegrals.h h_linkdef = \ TGapIntegralsLinkDef.h @@ -11,8 +10,7 @@ dict_h_sources = \ TGapIntegralsDict.h cpp_sources = \ - TGapIntegrals.cpp \ - ../BMWIntegrator/BMWIntegrator.cpp + TGapIntegrals.cpp dict_cpp_sources = \ TGapIntegralsDict.cpp @@ -20,7 +18,7 @@ dict_cpp_sources = \ include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) -INCLUDES = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS) +INCLUDES = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(PMUSR_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) @@ -33,7 +31,7 @@ CLEANFILES = *Dict.cpp *Dict.h *~ core lib_LTLIBRARIES = libGapIntegrals.la libGapIntegrals_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libGapIntegrals_la_LIBADD = $(PMUSR_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS) +libGapIntegrals_la_LIBADD = $(BMWTOOLS_LIBS) $(PMUSR_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS) libGapIntegrals_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) ## For the moment do not build pkgconfig files for musrfit plug-ins... diff --git a/src/external/libGapIntegrals/TGapIntegrals.cpp b/src/external/libGapIntegrals/TGapIntegrals.cpp index f7414956..a7334df4 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.cpp +++ b/src/external/libGapIntegrals/TGapIntegrals.cpp @@ -34,7 +34,7 @@ using namespace std; -#include "../BMWIntegrator/BMWIntegrator.h" +#include "BMWIntegrator.h" #include "TGapIntegrals.h" #define PI 3.14159265358979323846 diff --git a/src/external/libGapIntegrals/TGapIntegrals.h b/src/external/libGapIntegrals/TGapIntegrals.h index 0e9afd8b..31e503f2 100644 --- a/src/external/libGapIntegrals/TGapIntegrals.h +++ b/src/external/libGapIntegrals/TGapIntegrals.h @@ -38,7 +38,7 @@ using namespace std; #include "PUserFcnBase.h" -#include "../BMWIntegrator/BMWIntegrator.h" +#include "BMWIntegrator.h" class TGapSWave : public PUserFcnBase { diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am index 23a86b25..7097a105 100644 --- a/src/external/libLFRelaxation/Makefile.am +++ b/src/external/libLFRelaxation/Makefile.am @@ -1,10 +1,7 @@ ## Process this file with automake to create Makefile.in -integrator_path = ../BMWIntegrator - h_sources = \ - TLFRelaxation.h \ - $(integrator_path)/BMWIntegrator.h + TLFRelaxation.h h_linkdef = \ TLFRelaxationLinkDef.h @@ -13,8 +10,7 @@ dict_h_sources = \ TLFRelaxationDict.h cpp_sources = \ - TLFRelaxation.cpp \ - $(integrator_path)/BMWIntegrator.cpp + TLFRelaxation.cpp dict_cpp_sources = \ TLFRelaxationDict.cpp @@ -22,12 +18,12 @@ dict_cpp_sources = \ include_HEADERS = $(h_sources) noinst_HEADERS = $(h_linkdef) $(dict_h_sources) -INCLUDES = -I$(top_srcdir)/src/include $(BMWSTARTUP_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS) +INCLUDES = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(ROOT_CFLAGS) $(CUBA_CFLAGS) AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = $(integrator_path)/*~ *Dict.cpp *Dict.h *~ core +CLEANFILES = *Dict.cpp *Dict.h *~ core %Dict.cpp %Dict.h: %.h %LinkDef.h @ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^ @@ -35,7 +31,7 @@ CLEANFILES = $(integrator_path)/*~ *Dict.cpp *Dict.h *~ core lib_LTLIBRARIES = libLFRelaxation.la libLFRelaxation_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libLFRelaxation_la_LIBADD = $(BMWSTARTUP_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS) +libLFRelaxation_la_LIBADD = $(BMWTOOLS_LIBS) $(PMUSR_LIBS) $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(CUBA_LIBS) libLFRelaxation_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) ## For the moment do not build pkgconfig files for musrfit plug-ins... diff --git a/src/external/libLFRelaxation/TLFRelaxation.cpp b/src/external/libLFRelaxation/TLFRelaxation.cpp index 1201f37d..6a28cba3 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.cpp +++ b/src/external/libLFRelaxation/TLFRelaxation.cpp @@ -43,7 +43,7 @@ #endif #include -#include "../BMWIntegrator/BMWIntegrator.h" +#include "BMWIntegrator.h" #include "BMWStartupHandler.h" #include "TLFRelaxation.h" diff --git a/src/external/libLFRelaxation/TLFRelaxation.h b/src/external/libLFRelaxation/TLFRelaxation.h index 7f1ba006..b89f5a05 100644 --- a/src/external/libLFRelaxation/TLFRelaxation.h +++ b/src/external/libLFRelaxation/TLFRelaxation.h @@ -49,7 +49,7 @@ using namespace std; //#include "TMath.h" #include "PUserFcnBase.h" #include "fftw3.h" -#include "../BMWIntegrator/BMWIntegrator.h" +#include "BMWIntegrator.h" //----------------------------------------------------------------------------------------------------------------- /** diff --git a/src/tests/CheckMusrfitInstall/BMWlibs/test-libTFitPofB_Abrikosov-PSI-BIN.msr b/src/tests/CheckMusrfitInstall/BMWlibs/test-libFitPofB_Abrikosov-PSI-BIN.msr similarity index 98% rename from src/tests/CheckMusrfitInstall/BMWlibs/test-libTFitPofB_Abrikosov-PSI-BIN.msr rename to src/tests/CheckMusrfitInstall/BMWlibs/test-libFitPofB_Abrikosov-PSI-BIN.msr index b2cc6c5e..f0ea78c5 100644 --- a/src/tests/CheckMusrfitInstall/BMWlibs/test-libTFitPofB_Abrikosov-PSI-BIN.msr +++ b/src/tests/CheckMusrfitInstall/BMWlibs/test-libFitPofB_Abrikosov-PSI-BIN.msr @@ -25,7 +25,7 @@ FITPARAMETER THEORY asymmetry fun3 simpleGss 6 (rate) -userFcn libTFitPofB TBulkTriVortexML fun2 2 3 4 +userFcn libFitPofB TBulkTriVortexML fun2 2 3 4 + asymmetry fun4 simpleGss 8 (rate) diff --git a/src/tests/CheckMusrfitInstall/BMWlibs/test-libTFitPofB_Meissner-ROOT-NPP.msr b/src/tests/CheckMusrfitInstall/BMWlibs/test-libFitPofB_Meissner-ROOT-NPP.msr similarity index 98% rename from src/tests/CheckMusrfitInstall/BMWlibs/test-libTFitPofB_Meissner-ROOT-NPP.msr rename to src/tests/CheckMusrfitInstall/BMWlibs/test-libFitPofB_Meissner-ROOT-NPP.msr index f923daf7..8c158feb 100644 --- a/src/tests/CheckMusrfitInstall/BMWlibs/test-libTFitPofB_Meissner-ROOT-NPP.msr +++ b/src/tests/CheckMusrfitInstall/BMWlibs/test-libFitPofB_Meissner-ROOT-NPP.msr @@ -26,7 +26,7 @@ FITPARAMETER THEORY asymmetry fun1 simpleGss map3 (rate) -userFcn libTFitPofB TLondon1DHS fun2 map6 1 2 3 +userFcn libFitPofB TLondon1DHS fun2 map6 1 2 3 ############################################################### FUNCTIONS