Restructured the interdependencies within the BMWlibs (maybe other commits will follow)
This commit is contained in:
Bastian M. Wojek committed
1 parent
dc86404f88
commit
aaa0638729
51 files changed
+60
-3223
No files matched your search
+13
-13
@@ -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 \
|
||||
|
||||
@@ -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 {
|
||||
|
||||
File renamed without changes.
File renamed without changes.
Vendored
File renamed without changes.
Vendored
File renamed without changes.
File renamed without changes.
+14
-10
@@ -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
|
||||
File renamed without changes.
Vendored
File renamed without changes.
Vendored
+2
-2
@@ -8,8 +8,8 @@ if BUILD_CUBALIB
|
||||
endif
|
||||
|
||||
if BUILD_BMWLIBS
|
||||
BMWDIRS = BMWStartupHandler \
|
||||
TFitPofB-lib \
|
||||
BMWDIRS = BMWtools \
|
||||
libFitPofB \
|
||||
libLFRelaxation \
|
||||
libGapIntegrals \
|
||||
libCalcMeanFieldsLEM
|
||||
|
||||
@@ -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
|
||||
-49
@@ -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 $<
|
||||
|
||||
@@ -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 $<
|
||||
|
||||
@@ -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 $<
|
||||
|
||||
@@ -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 $<
|
||||
|
||||
@@ -1,78 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<TFitPofB>
|
||||
<comment>
|
||||
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)
|
||||
</comment>
|
||||
<debug>0</debug>
|
||||
<wisdom>/home/l_wojek/analysis/WordsOfWisdom.dat</wisdom>
|
||||
<delta_t>0.01</delta_t>
|
||||
<delta_B>0.1</delta_B>
|
||||
<VortexLattice>
|
||||
<N_VortexGrid>256</N_VortexGrid>
|
||||
</VortexLattice>
|
||||
<LEM>
|
||||
<data_path>/home/l_wojek/TrimSP/YBCOxtal/YBCOxtal-500000-</data_path>
|
||||
<N_theory>5000</N_theory>
|
||||
<energy_list>
|
||||
<energy_label>03_0</energy_label>
|
||||
<energy>3.0</energy>
|
||||
<energy_label>03_6</energy_label>
|
||||
<energy>3.6</energy>
|
||||
<energy_label>05_0</energy_label>
|
||||
<energy>5.0</energy>
|
||||
<energy_label>05_3</energy_label>
|
||||
<energy>5.3</energy>
|
||||
<energy_label>07_0</energy_label>
|
||||
<energy>7.0</energy>
|
||||
<energy_label>07_7</energy_label>
|
||||
<energy>7.7</energy>
|
||||
<energy_label>08_0</energy_label>
|
||||
<energy>8.0</energy>
|
||||
<energy_label>09_0</energy_label>
|
||||
<energy>9.0</energy>
|
||||
<energy_label>10_0</energy_label>
|
||||
<energy>10.0</energy>
|
||||
<energy_label>10_2</energy_label>
|
||||
<energy>10.2</energy>
|
||||
<energy_label>12_0</energy_label>
|
||||
<energy>12.0</energy>
|
||||
<energy_label>14_1</energy_label>
|
||||
<energy>14.1</energy>
|
||||
<energy_label>16_0</energy_label>
|
||||
<energy>16.0</energy>
|
||||
<energy_label>16_4</energy_label>
|
||||
<energy>16.4</energy>
|
||||
<energy_label>18_0</energy_label>
|
||||
<energy>18.0</energy>
|
||||
<energy_label>19_7</energy_label>
|
||||
<energy>19.7</energy>
|
||||
<energy_label>20_0</energy_label>
|
||||
<energy>20.0</energy>
|
||||
<energy_label>22_0</energy_label>
|
||||
<energy>22.0</energy>
|
||||
<energy_label>24_0</energy_label>
|
||||
<energy>24.0</energy>
|
||||
<energy_label>24_6</energy_label>
|
||||
<energy>24.6</energy>
|
||||
</energy_list>
|
||||
</LEM>
|
||||
</TFitPofB>
|
||||
-493
@@ -1,493 +0,0 @@
|
||||
#include "TLondon1D.h"
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
#include <cstdio>
|
||||
|
||||
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<string> energy_vec(energy_arr, energy_arr+(sizeof(energy_arr)/sizeof(energy_arr[0])));
|
||||
|
||||
TTrimSPData calcData(rge_path, energy_vec);
|
||||
|
||||
/* vector<double> energies(calcData.Energy());
|
||||
for (unsigned int i(0); i<energies.size(); i++)
|
||||
cout << energies[i] << endl;
|
||||
*/
|
||||
calcData.Normalize(E);
|
||||
|
||||
vector<double> z(calcData.DataZ(E));
|
||||
vector<double> nz(calcData.DataNZ(E));
|
||||
|
||||
ofstream of("Implantation-profile-normal.dat");
|
||||
for (unsigned int i(0); i<z.size(); i++) {
|
||||
of << z[i] << " " << nz[i] << endl;
|
||||
}
|
||||
of.close();
|
||||
|
||||
double par_arr[] = {24.4974, E, 95.8253, 0.0, 45.0, 45.0, 45.0, 200.0, 400.0, 200.0};
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> 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<double> parForBofZ;
|
||||
for (unsigned int i(2); i<par_vec.size(); i++)
|
||||
parForBofZ.push_back(par_vec[i]);
|
||||
|
||||
vector<double> parForPofB;
|
||||
parForPofB.push_back(0.01); //dt
|
||||
parForPofB.push_back(0.05); //dB
|
||||
parForPofB.push_back(par_vec[1]);
|
||||
|
||||
vector<double> 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<double> zz;
|
||||
vector<double> 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<double> hurgaB(PofB.DataB());
|
||||
vector<double> 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<hurgaB.size(); i++) {
|
||||
of7 << hurgaB[i] << " " << hurgaPB[i] << endl;
|
||||
}
|
||||
of7.close();
|
||||
}
|
||||
|
||||
TPofTCalc poft("/home/l_wojek/analysis/WordsOfWisdom.dat", parForPofT);
|
||||
|
||||
poft.DoFFT(PofB);
|
||||
poft.CalcPol(parForPofT);
|
||||
|
||||
char debugfilex[50];
|
||||
int nx = sprintf (debugfilex, "4Ltest-P_t-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]);
|
||||
|
||||
if (nx > 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<double> hurgaB1(PofB.DataB());
|
||||
vector<double> 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<hurgaB1.size(); i++) {
|
||||
of1 << hurgaB1[i] << " " << hurgaPB1[i] << endl;
|
||||
}
|
||||
of1.close();
|
||||
}
|
||||
|
||||
calcData.ConvolveGss(10.0, par_vec[1]);
|
||||
calcData.Normalize(par_vec[1]);
|
||||
|
||||
TPofBCalc PofB2(BofZ, calcData, parForPofB);
|
||||
|
||||
vector<double> z2(calcData.DataZ(par_vec[1]));
|
||||
vector<double> nz2(calcData.DataNZ(par_vec[1]));
|
||||
|
||||
ofstream of2("Implantation-profile-broad.dat");
|
||||
for (unsigned int i(0); i<z2.size(); i++) {
|
||||
of2 << z2[i] << " " << nz2[i] << endl;
|
||||
}
|
||||
of2.close();
|
||||
|
||||
vector<double> hurgaB2(PofB2.DataB());
|
||||
vector<double> 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<hurgaB2.size(); i++) {
|
||||
of8 << hurgaB2[i] << " " << hurgaPB2[i] << endl;
|
||||
}
|
||||
of8.close();
|
||||
}
|
||||
|
||||
PofB2.ConvolveGss(7.5);
|
||||
|
||||
vector<double> hurgaB3(PofB2.DataB());
|
||||
vector<double> 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<hurgaB3.size(); i++) {
|
||||
of9 << hurgaB3[i] << " " << hurgaPB3[i] << endl;
|
||||
}
|
||||
of9.close();
|
||||
}
|
||||
|
||||
z.clear();
|
||||
nz.clear();
|
||||
z2.clear();
|
||||
nz2.clear();
|
||||
*/
|
||||
/*
|
||||
|
||||
double param[8] = {100.0, 5.0, 50.0, 100.0, 40.0, 0.01, 0.1, 15.0};
|
||||
vector<double> parameter(param,param+8);
|
||||
vector<double> param_for_BofZ;
|
||||
vector<double> param_for_PofB;
|
||||
vector<double> 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<bofz.DataZ().size(); i++) {
|
||||
of6 << bofz.DataZ()[i] << " " << bofz.DataBZ()[i] << endl;
|
||||
}
|
||||
of6.close();
|
||||
|
||||
TPofBCalc pofb(bofz, calcData, param_for_PofB);
|
||||
|
||||
cout << "Output to file now..." << endl;
|
||||
|
||||
vector<double> hurgaB(pofb.DataB());
|
||||
vector<double> hurgaPB(pofb.DataPB());
|
||||
|
||||
ofstream of7("test_BpB.dat");
|
||||
for (unsigned int i(0); i<hurgaB.size(); i++) {
|
||||
of7 << hurgaB[i] << " " << hurgaPB[i] << endl;
|
||||
}
|
||||
of7.close();
|
||||
|
||||
TPofTCalc poft(param_for_PofT);
|
||||
|
||||
poft.DoFFT(pofb, param_for_PofT);
|
||||
|
||||
ofstream of8("test_tpt4.dat");
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of8 << i << " " << poft(i) << endl;
|
||||
}
|
||||
of8.close();
|
||||
|
||||
*/
|
||||
/**************** Test TLondon1DHS *********************************
|
||||
|
||||
// unsigned int parNo_arr[] = {1, 2, 5, 7, 9, 10, 11, 12};
|
||||
double par_arr[] = {24.4974, 22.0, 95.8253, 7.62096, 143.215};
|
||||
|
||||
// vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
// vector<double> par_vec_sub;
|
||||
|
||||
// for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
// par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
// }
|
||||
|
||||
TLondon1DHS fitter;
|
||||
|
||||
************************************************************************/
|
||||
|
||||
|
||||
/**************** Test TLondon1D1L *********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 4.6, 999.0, 100.0, 5.0, 190.0, 180.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D1L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
/**************** Test TLondon1D2L **********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 21.6, 999.0, 100.0, 5.0, 70.0, 70.0, 180.0, 500.0, 1.0, 0.3};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D2L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
/**************** Test TLondon1D3L ********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 4.6, 999.0, 100.0, 5.0, 70.0, 50.0, 70.0, 180.0, 180.0, 180.0, 1.0, 1.0, 1.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D3L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
|
||||
/**************** Test TLondon1D3LS *********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 21.6, 999.0, 100.0, 5.0, 70.0, 50.0, 70.0, 180.0, 500.0, 1.0, 0.3, 1.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D3LS fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
// ofstream of01("test_fitter01.dat");
|
||||
// ofstream of02("test_fitter02.dat");
|
||||
// ofstream of03("test_fitter03.dat");
|
||||
// ofstream of04("test_fitter04.dat");
|
||||
// ofstream of05("test_fitter05.dat");
|
||||
// ofstream of06("test_fitter06.dat");
|
||||
// ofstream of07("test_fitter07.dat");
|
||||
// ofstream of08("test_fitter08.dat");
|
||||
// ofstream of09("test_fitter09.dat");
|
||||
// ofstream of10("test_fitter10.dat");
|
||||
|
||||
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of01 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of01.close();
|
||||
|
||||
// par_vec[1] = 7.7;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of02 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of02.close();
|
||||
//
|
||||
// par_vec[0] = 0.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of03 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of03.close();
|
||||
//
|
||||
// par_vec[2] = 200.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of04 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of04.close();
|
||||
//
|
||||
// par_vec[4] = 100.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of05 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of05.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 15.0;
|
||||
// par_vec[4] = 130.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of06 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of06.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 15.0;
|
||||
// par_vec[4] = 140.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of07 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of07.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 20.0;
|
||||
// par_vec[4] = 130.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of08 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of08.close();
|
||||
/*
|
||||
par_vec_sub[0] = 0.0;
|
||||
par_vec_sub[7] = 1000.0;
|
||||
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of09 << i << " " << fitter.Eval(i, par_vec_sub) << endl;
|
||||
}
|
||||
of09.close();
|
||||
|
||||
par_vec_sub[0] = 0.0;
|
||||
par_vec_sub[7] = 10.0;
|
||||
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of10 << i << " " << fitter.Eval(i, par_vec_sub) << endl;
|
||||
}
|
||||
of10.close();
|
||||
*/
|
||||
/*
|
||||
vector<double> 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;
|
||||
}
|
||||
-635
@@ -1,635 +0,0 @@
|
||||
#include "TPofTCalc.h"
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
||||
using namespace std;
|
||||
|
||||
#include <cstdio>
|
||||
#include <sys/time.h>
|
||||
|
||||
int main(){
|
||||
|
||||
unsigned int NFFT(256);
|
||||
|
||||
vector<double> parForVortex;
|
||||
parForVortex.resize(3);
|
||||
|
||||
// parForVortex[0] = 100.0; //app.field
|
||||
// parForVortex[1] = 200.0; //lambda
|
||||
// parForVortex[2] = 4.0; //xi
|
||||
|
||||
vector<double> parForPofB;
|
||||
parForPofB.push_back(0.005); //dt
|
||||
parForPofB.push_back(20.0); //dB
|
||||
|
||||
vector<double> 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<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
|
||||
vector<double> parForBofZ;
|
||||
for (unsigned int i(2); i<par_vec.size(); i++)
|
||||
parForBofZ.push_back(par_vec[i]);
|
||||
|
||||
vector<double> 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<double> 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<double> zonk;
|
||||
vector<double> donk;
|
||||
vector<double> hurgaB;
|
||||
vector<double> 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<hurgaB.size(); i++) {
|
||||
of7 << hurgaB[i] << " " << donk[i] << " " << hurgaPB[i] << endl;
|
||||
}
|
||||
of7.close();
|
||||
}
|
||||
*/
|
||||
// vector<double> 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<double> zz;
|
||||
// vector<double> 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<double> hurgaB(PofB.DataB());
|
||||
// vector<double> hurgaPB(PofB.DataPB());
|
||||
// vector<double> 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<hurgaB.size(); i++) {
|
||||
// of7 << hurgaB[i] << " " << hurgaPB[i] << " " << hurgaPB1[i] << endl;
|
||||
// }
|
||||
// of7.close();
|
||||
// }
|
||||
|
||||
// TPofTCalc poft("/home/l_wojek/analysis/WordsOfWisdom.dat", parForPofT);
|
||||
//
|
||||
// poft.DoFFT(PofB);
|
||||
// poft.CalcPol(parForPofT);
|
||||
//
|
||||
// char debugfilex[50];
|
||||
// int nx = sprintf (debugfilex, "4Ltest-P_t-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]);
|
||||
//
|
||||
// if (nx > 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<double> hurgaB1(PofB.DataB());
|
||||
vector<double> 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<hurgaB1.size(); i++) {
|
||||
of1 << hurgaB1[i] << " " << hurgaPB1[i] << endl;
|
||||
}
|
||||
of1.close();
|
||||
}
|
||||
|
||||
calcData.ConvolveGss(10.0, par_vec[1]);
|
||||
calcData.Normalize(par_vec[1]);
|
||||
|
||||
TPofBCalc PofB2(BofZ, calcData, parForPofB);
|
||||
|
||||
vector<double> z2(calcData.DataZ(par_vec[1]));
|
||||
vector<double> nz2(calcData.DataNZ(par_vec[1]));
|
||||
|
||||
ofstream of2("Implantation-profile-broad.dat");
|
||||
for (unsigned int i(0); i<z2.size(); i++) {
|
||||
of2 << z2[i] << " " << nz2[i] << endl;
|
||||
}
|
||||
of2.close();
|
||||
|
||||
vector<double> hurgaB2(PofB2.DataB());
|
||||
vector<double> 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<hurgaB2.size(); i++) {
|
||||
of8 << hurgaB2[i] << " " << hurgaPB2[i] << endl;
|
||||
}
|
||||
of8.close();
|
||||
}
|
||||
|
||||
PofB2.ConvolveGss(7.5);
|
||||
|
||||
vector<double> hurgaB3(PofB2.DataB());
|
||||
vector<double> 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<hurgaB3.size(); i++) {
|
||||
of9 << hurgaB3[i] << " " << hurgaPB3[i] << endl;
|
||||
}
|
||||
of9.close();
|
||||
}
|
||||
|
||||
z.clear();
|
||||
nz.clear();
|
||||
z2.clear();
|
||||
nz2.clear();
|
||||
*/
|
||||
/*
|
||||
|
||||
double param[8] = {100.0, 5.0, 50.0, 100.0, 40.0, 0.01, 0.1, 15.0};
|
||||
vector<double> parameter(param,param+8);
|
||||
vector<double> param_for_BofZ;
|
||||
vector<double> param_for_PofB;
|
||||
vector<double> 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<bofz.DataZ().size(); i++) {
|
||||
of6 << bofz.DataZ()[i] << " " << bofz.DataBZ()[i] << endl;
|
||||
}
|
||||
of6.close();
|
||||
|
||||
TPofBCalc pofb(bofz, calcData, param_for_PofB);
|
||||
|
||||
cout << "Output to file now..." << endl;
|
||||
|
||||
vector<double> hurgaB(pofb.DataB());
|
||||
vector<double> hurgaPB(pofb.DataPB());
|
||||
|
||||
ofstream of7("test_BpB.dat");
|
||||
for (unsigned int i(0); i<hurgaB.size(); i++) {
|
||||
of7 << hurgaB[i] << " " << hurgaPB[i] << endl;
|
||||
}
|
||||
of7.close();
|
||||
|
||||
TPofTCalc poft(param_for_PofT);
|
||||
|
||||
poft.DoFFT(pofb, param_for_PofT);
|
||||
|
||||
ofstream of8("test_tpt4.dat");
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of8 << i << " " << poft(i) << endl;
|
||||
}
|
||||
of8.close();
|
||||
|
||||
*/
|
||||
/**************** Test TLondon1DHS *********************************
|
||||
|
||||
// unsigned int parNo_arr[] = {1, 2, 5, 7, 9, 10, 11, 12};
|
||||
double par_arr[] = {24.4974, 22.0, 95.8253, 7.62096, 143.215};
|
||||
|
||||
// vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
// vector<double> par_vec_sub;
|
||||
|
||||
// for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
// par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
// }
|
||||
|
||||
TLondon1DHS fitter;
|
||||
|
||||
************************************************************************/
|
||||
|
||||
|
||||
/**************** Test TLondon1D1L *********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 4.6, 999.0, 100.0, 5.0, 190.0, 180.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D1L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
/**************** Test TLondon1D2L **********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 21.6, 999.0, 100.0, 5.0, 70.0, 70.0, 180.0, 500.0, 1.0, 0.3};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D2L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
/**************** Test TLondon1D3L ********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 4.6, 999.0, 100.0, 5.0, 70.0, 50.0, 70.0, 180.0, 180.0, 180.0, 1.0, 1.0, 1.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D3L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
|
||||
/**************** Test TLondon1D3LS *********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 21.6, 999.0, 100.0, 5.0, 70.0, 50.0, 70.0, 180.0, 500.0, 1.0, 0.3, 1.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D3LS fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
// ofstream of01("test_fitter01.dat");
|
||||
// ofstream of02("test_fitter02.dat");
|
||||
// ofstream of03("test_fitter03.dat");
|
||||
// ofstream of04("test_fitter04.dat");
|
||||
// ofstream of05("test_fitter05.dat");
|
||||
// ofstream of06("test_fitter06.dat");
|
||||
// ofstream of07("test_fitter07.dat");
|
||||
// ofstream of08("test_fitter08.dat");
|
||||
// ofstream of09("test_fitter09.dat");
|
||||
// ofstream of10("test_fitter10.dat");
|
||||
|
||||
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of01 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of01.close();
|
||||
|
||||
// par_vec[1] = 7.7;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of02 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of02.close();
|
||||
//
|
||||
// par_vec[0] = 0.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of03 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of03.close();
|
||||
//
|
||||
// par_vec[2] = 200.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of04 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of04.close();
|
||||
//
|
||||
// par_vec[4] = 100.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of05 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of05.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 15.0;
|
||||
// par_vec[4] = 130.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of06 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of06.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 15.0;
|
||||
// par_vec[4] = 140.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of07 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of07.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 20.0;
|
||||
// par_vec[4] = 130.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of08 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of08.close();
|
||||
/*
|
||||
par_vec_sub[0] = 0.0;
|
||||
par_vec_sub[7] = 1000.0;
|
||||
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of09 << i << " " << fitter.Eval(i, par_vec_sub) << endl;
|
||||
}
|
||||
of09.close();
|
||||
|
||||
par_vec_sub[0] = 0.0;
|
||||
par_vec_sub[7] = 10.0;
|
||||
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of10 << i << " " << fitter.Eval(i, par_vec_sub) << endl;
|
||||
}
|
||||
of10.close();
|
||||
*/
|
||||
/*
|
||||
vector<double> 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;
|
||||
}
|
||||
-565
@@ -1,565 +0,0 @@
|
||||
#include "TPofTCalc.h"
|
||||
#include <iostream>
|
||||
#include <fstream>
|
||||
|
||||
using namespace std;
|
||||
|
||||
#include <cstdio>
|
||||
#include <sys/time.h>
|
||||
|
||||
int main(){
|
||||
|
||||
vector<double> parForVortex;
|
||||
parForVortex.push_back(150.0); //lambda
|
||||
parForVortex.push_back(3.0); //xi
|
||||
parForVortex.push_back(500.0); //app.field
|
||||
|
||||
vector<double> 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<double> b(PofB->DataB());
|
||||
vector<double> pb(PofB->DataPB());
|
||||
|
||||
double test(0.0);
|
||||
|
||||
ofstream ofx("testVector.dat");
|
||||
for (unsigned int i(0); i<b.size(); i++) {
|
||||
ofx << b[i] << " " << pb[i] << endl;
|
||||
test+=pb[i];
|
||||
}
|
||||
ofx.close();
|
||||
|
||||
cout << test << endl;
|
||||
/*
|
||||
double par_arr[] = {24.4974, E, 94.6, 10.0, 130.0};
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
|
||||
vector<double> parForBofZ;
|
||||
for (unsigned int i(2); i<par_vec.size(); i++)
|
||||
parForBofZ.push_back(par_vec[i]);
|
||||
|
||||
vector<double> 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<double> 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<double> zonk;
|
||||
vector<double> donk;
|
||||
vector<double> hurgaB;
|
||||
vector<double> 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<hurgaB.size(); i++) {
|
||||
of7 << hurgaB[i] << " " << donk[i] << " " << hurgaPB[i] << endl;
|
||||
}
|
||||
of7.close();
|
||||
}
|
||||
*/
|
||||
// vector<double> 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<double> zz;
|
||||
// vector<double> 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<double> hurgaB(PofB.DataB());
|
||||
// vector<double> hurgaPB(PofB.DataPB());
|
||||
// vector<double> 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<hurgaB.size(); i++) {
|
||||
// of7 << hurgaB[i] << " " << hurgaPB[i] << " " << hurgaPB1[i] << endl;
|
||||
// }
|
||||
// of7.close();
|
||||
// }
|
||||
|
||||
// TPofTCalc poft("/home/l_wojek/analysis/WordsOfWisdom.dat", parForPofT);
|
||||
//
|
||||
// poft.DoFFT(PofB);
|
||||
// poft.CalcPol(parForPofT);
|
||||
//
|
||||
// char debugfilex[50];
|
||||
// int nx = sprintf (debugfilex, "4Ltest-P_t-%.4f_l-%.3f_E-%.1f_normal.dat", par_vec[2], par_vec[9], par_vec[1]);
|
||||
//
|
||||
// if (nx > 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<double> hurgaB1(PofB.DataB());
|
||||
vector<double> 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<hurgaB1.size(); i++) {
|
||||
of1 << hurgaB1[i] << " " << hurgaPB1[i] << endl;
|
||||
}
|
||||
of1.close();
|
||||
}
|
||||
|
||||
calcData.ConvolveGss(10.0, par_vec[1]);
|
||||
calcData.Normalize(par_vec[1]);
|
||||
|
||||
TPofBCalc PofB2(BofZ, calcData, parForPofB);
|
||||
|
||||
vector<double> z2(calcData.DataZ(par_vec[1]));
|
||||
vector<double> nz2(calcData.DataNZ(par_vec[1]));
|
||||
|
||||
ofstream of2("Implantation-profile-broad.dat");
|
||||
for (unsigned int i(0); i<z2.size(); i++) {
|
||||
of2 << z2[i] << " " << nz2[i] << endl;
|
||||
}
|
||||
of2.close();
|
||||
|
||||
vector<double> hurgaB2(PofB2.DataB());
|
||||
vector<double> 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<hurgaB2.size(); i++) {
|
||||
of8 << hurgaB2[i] << " " << hurgaPB2[i] << endl;
|
||||
}
|
||||
of8.close();
|
||||
}
|
||||
|
||||
PofB2.ConvolveGss(7.5);
|
||||
|
||||
vector<double> hurgaB3(PofB2.DataB());
|
||||
vector<double> 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<hurgaB3.size(); i++) {
|
||||
of9 << hurgaB3[i] << " " << hurgaPB3[i] << endl;
|
||||
}
|
||||
of9.close();
|
||||
}
|
||||
|
||||
z.clear();
|
||||
nz.clear();
|
||||
z2.clear();
|
||||
nz2.clear();
|
||||
*/
|
||||
/*
|
||||
|
||||
double param[8] = {100.0, 5.0, 50.0, 100.0, 40.0, 0.01, 0.1, 15.0};
|
||||
vector<double> parameter(param,param+8);
|
||||
vector<double> param_for_BofZ;
|
||||
vector<double> param_for_PofB;
|
||||
vector<double> 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<bofz.DataZ().size(); i++) {
|
||||
of6 << bofz.DataZ()[i] << " " << bofz.DataBZ()[i] << endl;
|
||||
}
|
||||
of6.close();
|
||||
|
||||
TPofBCalc pofb(bofz, calcData, param_for_PofB);
|
||||
|
||||
cout << "Output to file now..." << endl;
|
||||
|
||||
vector<double> hurgaB(pofb.DataB());
|
||||
vector<double> hurgaPB(pofb.DataPB());
|
||||
|
||||
ofstream of7("test_BpB.dat");
|
||||
for (unsigned int i(0); i<hurgaB.size(); i++) {
|
||||
of7 << hurgaB[i] << " " << hurgaPB[i] << endl;
|
||||
}
|
||||
of7.close();
|
||||
|
||||
TPofTCalc poft(param_for_PofT);
|
||||
|
||||
poft.DoFFT(pofb, param_for_PofT);
|
||||
|
||||
ofstream of8("test_tpt4.dat");
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of8 << i << " " << poft(i) << endl;
|
||||
}
|
||||
of8.close();
|
||||
|
||||
*/
|
||||
/**************** Test TLondon1DHS *********************************
|
||||
|
||||
// unsigned int parNo_arr[] = {1, 2, 5, 7, 9, 10, 11, 12};
|
||||
double par_arr[] = {24.4974, 22.0, 95.8253, 7.62096, 143.215};
|
||||
|
||||
// vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
// vector<double> par_vec_sub;
|
||||
|
||||
// for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
// par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
// }
|
||||
|
||||
TLondon1DHS fitter;
|
||||
|
||||
************************************************************************/
|
||||
|
||||
|
||||
/**************** Test TLondon1D1L *********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 4.6, 999.0, 100.0, 5.0, 190.0, 180.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D1L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
/**************** Test TLondon1D2L **********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 21.6, 999.0, 100.0, 5.0, 70.0, 70.0, 180.0, 500.0, 1.0, 0.3};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D2L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
/**************** Test TLondon1D3L ********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 4.6, 999.0, 100.0, 5.0, 70.0, 50.0, 70.0, 180.0, 180.0, 180.0, 1.0, 1.0, 1.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D3L fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
|
||||
/**************** Test TLondon1D3LS *********************************
|
||||
|
||||
unsigned int parNo_arr[] = {1, 3, 5, 7, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18};
|
||||
double par_arr[] = {0.0, 999.0, 0.01, 999.0, 0.01, 999.0, 21.6, 999.0, 100.0, 5.0, 70.0, 50.0, 70.0, 180.0, 500.0, 1.0, 0.3, 1.0};
|
||||
|
||||
vector<unsigned int> parNo_vec(parNo_arr, parNo_arr+(sizeof(parNo_arr)/sizeof(parNo_arr[0])));
|
||||
vector<double> par_vec(par_arr, par_arr+(sizeof(par_arr)/sizeof(par_arr[0])));
|
||||
|
||||
vector<double> par_vec_sub;
|
||||
|
||||
for(unsigned int i(0); i<parNo_vec.size(); i++) {
|
||||
par_vec_sub.push_back(par_vec[parNo_vec[i]-1]);
|
||||
}
|
||||
|
||||
TLondon1D3LS fitter(parNo_vec, par_vec);
|
||||
|
||||
************************************************************************/
|
||||
|
||||
// ofstream of01("test_fitter01.dat");
|
||||
// ofstream of02("test_fitter02.dat");
|
||||
// ofstream of03("test_fitter03.dat");
|
||||
// ofstream of04("test_fitter04.dat");
|
||||
// ofstream of05("test_fitter05.dat");
|
||||
// ofstream of06("test_fitter06.dat");
|
||||
// ofstream of07("test_fitter07.dat");
|
||||
// ofstream of08("test_fitter08.dat");
|
||||
// ofstream of09("test_fitter09.dat");
|
||||
// ofstream of10("test_fitter10.dat");
|
||||
|
||||
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of01 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of01.close();
|
||||
|
||||
// par_vec[1] = 7.7;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of02 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of02.close();
|
||||
//
|
||||
// par_vec[0] = 0.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of03 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of03.close();
|
||||
//
|
||||
// par_vec[2] = 200.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of04 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of04.close();
|
||||
//
|
||||
// par_vec[4] = 100.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of05 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of05.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 15.0;
|
||||
// par_vec[4] = 130.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of06 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of06.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 15.0;
|
||||
// par_vec[4] = 140.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of07 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of07.close();
|
||||
//
|
||||
// par_vec[0] = 20.0;
|
||||
// par_vec[1] = 24.6;
|
||||
// par_vec[2] = 96.5;
|
||||
// par_vec[3] = 20.0;
|
||||
// par_vec[4] = 130.0;
|
||||
//
|
||||
// for (double i(0.); i<12.0; i+=0.003) {
|
||||
// of08 << i << " " << fitter(i, par_vec) << endl;
|
||||
// }
|
||||
// of08.close();
|
||||
/*
|
||||
par_vec_sub[0] = 0.0;
|
||||
par_vec_sub[7] = 1000.0;
|
||||
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of09 << i << " " << fitter.Eval(i, par_vec_sub) << endl;
|
||||
}
|
||||
of09.close();
|
||||
|
||||
par_vec_sub[0] = 0.0;
|
||||
par_vec_sub[7] = 10.0;
|
||||
|
||||
for (double i(0.); i<12.0; i+=0.003) {
|
||||
of10 << i << " " << fitter.Eval(i, par_vec_sub) << endl;
|
||||
}
|
||||
of10.close();
|
||||
*/
|
||||
/*
|
||||
vector<double> 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;
|
||||
}
|
||||
-1005
File diff suppressed because it is too large.
Load diff
+2
-2
@@ -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...
|
||||
|
||||
File renamed without changes.
Vendored
+10
-12
@@ -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
|
||||
Vendored
File renamed without changes.
File renamed without changes.
File renamed without changes.
Vendored
+1
-1
@@ -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 $
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
Vendored
File renamed without changes.
Vendored
File renamed without changes.
Vendored
+1
-1
@@ -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 $
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
Vendored
+1
-1
@@ -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 $
|
||||
|
||||
***************************************************************************/
|
||||
|
||||
Vendored
File renamed without changes.
File renamed without changes.
File renamed without changes.
Vendored
File renamed without changes.
File renamed without changes.
Vendored
File renamed without changes.
Vendored
File renamed without changes.
Vendored
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
+4
-6
@@ -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...
|
||||
|
||||
+1
-1
@@ -34,7 +34,7 @@
|
||||
|
||||
using namespace std;
|
||||
|
||||
#include "../BMWIntegrator/BMWIntegrator.h"
|
||||
#include "BMWIntegrator.h"
|
||||
#include "TGapIntegrals.h"
|
||||
|
||||
#define PI 3.14159265358979323846
|
||||
|
||||
+1
-1
@@ -38,7 +38,7 @@
|
||||
using namespace std;
|
||||
|
||||
#include "PUserFcnBase.h"
|
||||
#include "../BMWIntegrator/BMWIntegrator.h"
|
||||
#include "BMWIntegrator.h"
|
||||
|
||||
class TGapSWave : public PUserFcnBase {
|
||||
|
||||
|
||||
+5
-9
@@ -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...
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@
|
||||
#endif
|
||||
|
||||
#include <TSAXParser.h>
|
||||
#include "../BMWIntegrator/BMWIntegrator.h"
|
||||
#include "BMWIntegrator.h"
|
||||
#include "BMWStartupHandler.h"
|
||||
#include "TLFRelaxation.h"
|
||||
|
||||
|
||||
+1
-1
@@ -49,7 +49,7 @@ using namespace std;
|
||||
//#include "TMath.h"
|
||||
#include "PUserFcnBase.h"
|
||||
#include "fftw3.h"
|
||||
#include "../BMWIntegrator/BMWIntegrator.h"
|
||||
#include "BMWIntegrator.h"
|
||||
|
||||
//-----------------------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
|
||||
+1
-1
@@ -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)
|
||||
+1
-1
@@ -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
|
||||
Reference in new issue
Block a user