diff --git a/AUTHORS b/AUTHORS index 94cee900..9597edf6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -9,8 +9,6 @@ Andreas Suter Bastian M. Wojek msr2data; initial testing; full initial documentation; BMWlibs; - unified building process on Linux, MacOSX and Windows (Cygwin) - through autotools #--------------------------------------------------------------------- # this is the end ... diff --git a/CMakeLists.txt b/CMakeLists.txt index f6b17c1a..55df6f7a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # - musrfit cmake_minimum_required(VERSION 3.6) -project(musrfit VERSION 1.4.1 LANGUAGES C CXX) +project(musrfit VERSION 1.4.2 LANGUAGES C CXX) #--- musrfit specific options ------------------------------------------------- option(nexus "build optional NeXus support. Needed for ISIS" OFF) diff --git a/ChangeLog b/ChangeLog index a9e9a442..aff89d1a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,12 @@ or https://bitbucket.org/muonspin/musrfit/commits/all +Release of V1.4.2, 2019/03/08 +============================= + +The tool chain support for automake is removed. Only the cmake tool chain is +supported from now one. + Release of V1.2.0, 2017/10/26 ============================= diff --git a/INSTALL b/INSTALL index 5cce2650..7e1dc31b 100644 --- a/INSTALL +++ b/INSTALL @@ -2,45 +2,11 @@ # INSTALL #--------------------------------------------------------------------- -There are currently two ways to build musrfit, - -1) using automake tool chain (this will be phased out until 2019) -2) using cmake tool chain (this will be the default starting from now) - -In what follows we assume that the system variable ROOTSYS is already -defined and points to the installation directory of CERN/ROOT. +In the following it is assumed that the system variable ROOTSYS is already +defined and pointing to the place where CERN/ROOT is installed. #---------------------------------- -# Install using automake tool chain -#---------------------------------- - -To get it built: - - sh autogen.sh - ./configure --prefix=$ROOTSYS (or where ever musrfit should be installed) - make - make install (as superuser -- maybe) - /sbin/ldconfig (as superuser) - -configure comes with a couple of options. For details execute - - ./configure --help - -or check under http://lmu.web.psi.ch/musrfit/user/MUSR/MusrFitSetup.html -for a detailed description. - -For example, to include NeXus support and BNMRlibs, - - sh autogen.sh - ./configure --enable-NeXus --enable-BNMRlibs --prefix=$ROOTSYS - make - make install (as superuser -- maybe) - /sbin/ldconfig (as superuser) - -If all goes well, you should be good to go ;-) - -#---------------------------------- -# Install using cmake tool chain +# Install via cmake tool chain #---------------------------------- cmake minimal required version is 3.6. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 77cbf95e..00000000 --- a/Makefile.am +++ /dev/null @@ -1,32 +0,0 @@ -## Process this file with automake to create Makefile.in - -SUBDIRS = src - -EXTRA_DIST = autogen.sh acinclude.m4 - -# The following is to install the documentation -# It is a bit lengthy because one cannot simply install whole directories (except copying them recursively -- which also takes the .svn directories...) -DOCDIRS = examples \ - examples/data \ - examples/ASlibs \ - examples/ASlibs/data \ - examples/ASlibs/profiles \ - examples/BMWlibs \ - examples/BMWlibs/data \ - examples/BMWlibs/profiles \ - html/ \ - html/_downloads \ - html/_images \ - html/_sources \ - html/_static - #html/technical - -install-data-hook: - @$(NORMAL_INSTALL) - for DIR in $(DOCDIRS); do $(MKDIR_P) $(DOCDIR)/$$DIR; $(INSTALL_DATA) doc/$$DIR/*.* $(DOCDIR)/$$DIR; done - $(MKDIR_P) $(DOCDIR)/latex_images - $(INSTALL_DATA) src/musredit/latex_images/*.png $(DOCDIR)/latex_images - -uninstall-hook: - @$(NORMAL_UNINSTALL) - rm -rf $(DOCDIR) diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index 7d1ff84c..00000000 --- a/acinclude.m4 +++ /dev/null @@ -1,128 +0,0 @@ -dnl -*- mode: autoconf -*- -dnl -dnl $Id: root.m4,v 1.3 2005/03/21 21:42:21 rdm Exp $ -dnl $Author: rdm $ -dnl $Date: 2005/03/21 21:42:21 $ -dnl -dnl Autoconf macro to check for existence or ROOT on the system -dnl Synopsis: -dnl -dnl ROOT_PATH([MINIMUM-VERSION, [ACTION-IF-FOUND, [ACTION-IF-NOT-FOUND]]]) -dnl -dnl Some examples: -dnl -dnl ROOT_PATH(3.03/05, , AC_MSG_ERROR(Your ROOT version is too old)) -dnl ROOT_PATH(, AC_DEFINE([HAVE_ROOT])) -dnl -dnl The macro defines the following substitution variables -dnl -dnl ROOTCONF full path to root-config -dnl ROOTEXEC full path to root -dnl ROOTCLING full path to rootcling -dnl ROOTLIBDIR Where the ROOT libraries are -dnl ROOTINCDIR Where the ROOT headers are -dnl ROOTETCDIR Where the ROOT configuration is -dnl ROOTCFLAGS Extra compiler flags -dnl ROOTLIBS ROOT basic libraries -dnl ROOTGLIBS ROOT basic + GUI libraries -dnl ROOTAUXLIBS Auxilary libraries and linker flags for ROOT -dnl ROOTAUXCFLAGS Auxilary compiler flags -dnl ROOTRPATH Same as ROOTLIBDIR -dnl -dnl The macro will fail if root-config and rootcling isn't found. -dnl -dnl Christian Holm Christensen -dnl -AC_DEFUN([ROOT_PATH], -[ - AC_ARG_WITH([rootsys], - [AC_HELP_STRING([--with-rootsys], - [top of the ROOT installation directory])], - [user_rootsys=$withval], - [user_rootsys="none"]) - if test ! x"$user_rootsys" = xnone; then - rootbin="$user_rootsys/bin" - elif test ! x"$ROOTSYS" = x ; then - rootbin="$ROOTSYS/bin" - else - rootbin=$PATH - fi - AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin) - AC_PATH_PROG(ROOTEXEC, root , no, $rootbin) - AC_PATH_PROG(ROOTCLING, rootcling , no, $rootbin) - - if test ! x"$ROOTCONF" = "xno" && \ - test ! x"$ROOTCLING" = "xno" ; then - - # define some variables - ROOTLIBDIR=`$ROOTCONF --libdir` - ROOTINCDIR=`$ROOTCONF --incdir` - ROOTETCDIR=`$ROOTCONF --etcdir` - ROOTCFLAGS=`$ROOTCONF --noauxcflags --cflags` - ROOTLIBS=`$ROOTCONF --noauxlibs --noldflags --libs` - ROOTGLIBS=`$ROOTCONF --noauxlibs --noldflags --glibs` - ROOTAUXCFLAGS=`$ROOTCONF --auxcflags` - ROOTAUXLIBS=`$ROOTCONF --auxlibs` - ROOTRPATH=$ROOTLIBDIR - ROOTVERSION=`$ROOTCONF --version` - ROOTSOVERSION=`dirname $ROOTVERSION` - - if test $1 ; then - AC_MSG_CHECKING(whether ROOT version >= [$1]) - vers=`$ROOTCONF --version | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` - requ=`echo $1 | tr './' ' ' | awk 'BEGIN { FS = " "; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` - if test $vers -lt $requ ; then - AC_MSG_RESULT(no) - no_root="yes" - else - AC_MSG_RESULT(yes) - fi - fi - else - # otherwise, we say no_root - no_root="yes" - fi - - AC_SUBST(ROOTLIBDIR) - AC_SUBST(ROOTINCDIR) - AC_SUBST(ROOTETCDIR) - AC_SUBST(ROOTCFLAGS) - AC_SUBST(ROOTLIBS) - AC_SUBST(ROOTGLIBS) - AC_SUBST(ROOTAUXLIBS) - AC_SUBST(ROOTAUXCFLAGS) - AC_SUBST(ROOTRPATH) - AC_SUBST(ROOTVERSION) - AC_SUBST(ROOTSOVERSION) - - if test "x$no_root" = "x" ; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi -]) - -# -# Macro to check if ROOT has a specific feature: -# -# ROOT_FEATURE(FEATURE,[ACTION_IF_HAVE,[ACTION_IF_NOT]]) -# -# For example -# -# ROOT_FEATURE([ldap],[AC_DEFINE([HAVE_ROOT_LDAP])]) -# -AC_DEFUN([ROOT_FEATURE], -[ - AC_REQUIRE([ROOT_PATH]) - feat=$1 - res=`$ROOTCONF --has-$feat` - if test "x$res" = "xyes" ; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi -]) - -# -# EOF -# diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 74550064..00000000 --- a/autogen.sh +++ /dev/null @@ -1,101 +0,0 @@ -#! /bin/sh - -# autogen.sh -# -# Copyright (c) 2009 BMW -# Copyright (c) 2002 Daniel Elstner -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License VERSION 2 as -# published by the Free Software Foundation. You are not allowed to -# use any other version of the license; unless you got the explicit -# permission from the author to do so. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -PATHTOAUTOCONF=$(which autoconf) -PATHTOAUTOMAKE=$(which automake) -PATHTOLIBTOOL=$(which libtoolize) -PATHTOGLIBTOOL= -if [ "$PATHTOLIBTOOL" = "" ]; then - PATHTOGLIBTOOL=$(which glibtoolize) -fi - -if [ "$PATHTOAUTOCONF" = "" ]; then - echo - echo ">> GNU autoconf has not been found!" - echo ">> Please install it first and then re-run the script!" - echo - exit 1 -elif [ "$PATHTOAUTOMAKE" = "" ]; then - echo - echo ">> GNU automake has not been found!" - echo ">> Please install it first and then re-run the script!" - echo - exit 1 -elif [ "$PATHTOLIBTOOL" = "" ] && [ "$PATHTOGLIBTOOL" = "" ]; then - echo - echo ">> GNU libtool has not been found!" - echo ">> Please install it first and then re-run the script!" - echo - exit 1 -fi - -if [ "$PATHTOLIBTOOL" = "" ]; then - LIBTOOLIZE="glibtoolize" -else - LIBTOOLIZE="libtoolize" -fi - -dir=`echo "$0" | sed 's,[^/]*$,,'` -test "x${dir}" = "x" && dir='.' - -if test "x`cd "${dir}" 2>/dev/null && pwd`" != "x`pwd`" -then - echo "This script must be executed directly from the source directory!" - exit 1 -fi - -if !(test -d admin); then - mkdir admin -fi - -rm -f config.cache - -if test -e admin/depcomp && \ - test -e admin/install-sh && \ - test -e admin/ltmain.sh && \ - test -e admin/missing && \ - test -e aclocal.m4 -then - echo ">> autoreconf" && \ - autoreconf && exit 0 -else - echo "" && \ - echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" && \ - echo "+ This script prepares the building environment for the configuration of +" && \ - echo "+ musrfit. During this process some informative messages might appear which +" && \ - echo "+ can safely be ignored as long as they are not tagged as errors. +" && \ - echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" && \ - echo "" && \ - echo ">> libtoolize" && \ - $LIBTOOLIZE --force && \ - echo ">> aclocal" && \ - aclocal && \ - echo ">> autoconf" && \ - autoconf && \ - echo ">> autoheader" && \ - autoheader && \ - echo ">> automake" && \ - automake --add-missing --gnu && exit 0 -fi - -exit 1 - diff --git a/cmake/CPackOptions.cmake.in b/cmake/CPackOptions.cmake.in index 3a1c6a2b..49333f91 100644 --- a/cmake/CPackOptions.cmake.in +++ b/cmake/CPackOptions.cmake.in @@ -24,11 +24,11 @@ set (CPACK_SET_DESTDIR "OFF") set (CPACK_PACKAGE_RELOCATABLE "true") if (${CPACK_GENERATOR} STREQUAL "RPM") - set (CPACK_RPM_PACKAGE_REQUIRES "root >= 6.14.08") + set (CPACK_RPM_PACKAGE_REQUIRES "root >= 6.16.00") set (CPACK_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") set (CPACK_PACKAGING_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") set (CPACK_RPM_FILE_NAME "RPM-DEFAULT") - set (CPACK_RPM_PACKAGE_RELEASE "1") + set (CPACK_RPM_PACKAGE_RELEASE "2") # next variable for RHEL, CentOS, Fedfora set (CPACK_RPM_PACKAGE_RELEASE_DIST "") set (CPACK_RPM_PACKAGE_LICENSE "GPLv2") diff --git a/cmake/ChangeLogRPM b/cmake/ChangeLogRPM index eb75b666..f466dd30 100644 --- a/cmake/ChangeLogRPM +++ b/cmake/ChangeLogRPM @@ -1,2 +1,4 @@ +* Mon Mar 11 2019 Andreas Suter - 1.4.2-2 +- minor version update * Mon Jan 14 2019 Andreas Suter - 1.4.0-1 - first cpack/cmake version diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 9efd1188..00000000 --- a/configure.ac +++ /dev/null @@ -1,1475 +0,0 @@ -AC_REVISION([m4_esyscmd_s([git describe --always])]) - -AC_PREREQ(2.63) -AC_INIT([musrfit],[1.4.0],[andreas.suter@psi.ch]) -AC_CONFIG_AUX_DIR(admin) -AC_CANONICAL_HOST -#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}]) - -dnl ----------------------------------------------- -dnl Check if pkg-config is installed -dnl ----------------------------------------------- - -#PKG_PROG_PKG_CONFIG([0.9]) -#The above macro does not work if pkg-config is not installed, therefore, for the moment we stay with the solution below: -m4_ifdef([PKG_CHECK_MODULES],[],AC_MSG_ERROR([Please install pkg-config before configuring musrfit!])) - -dnl ----------------------------------------------- -dnl Package names and version numbers -dnl ----------------------------------------------- - -MUSR_PROGRAM_NAME=musrfit -MUSR_LIBRARY_NAME=PMusr -USERFCN_LIBRARY_NAME=PUserFcnBase -MUSR_ROOT_LIBRARY_NAME=TMusrRunHeader -LEM_LIBRARY_NAME=TLemRunHeader -PSIBIN_LIBRARY_NAME=Class_MuSR_PSI -MUD_LIBRARY_NAME=mud -PNEXUS_LIBRARY_NAME=PNeXus -CUBA_LIBRARY_NAME=cuba - -dnl ----------------------------------------------- -dnl Optional plug-ins -dnl ----------------------------------------------- - - -#release versioning -MUSR_MAJOR_VERSION=1 -MUSR_MINOR_VERSION=4 -MUSR_MICRO_VERSION=0 - -#release versioning -MUSR_ROOT_MAJOR_VERSION=1 -MUSR_ROOT_MINOR_VERSION=0 -MUSR_ROOT_MICRO_VERSION=0 - -#release versioning -LEM_MAJOR_VERSION=1 -LEM_MINOR_VERSION=5 -LEM_MICRO_VERSION=0 - -#release versioning -PSIBIN_MAJOR_VERSION=0 -PSIBIN_MINOR_VERSION=1 -PSIBIN_MICRO_VERSION=0 - -#release versioning -MUD_MAJOR_VERSION=1 -MUD_MINOR_VERSION=0 -MUD_MICRO_VERSION=0 - -#release versioning -PNEXUS_MAJOR_VERSION=0 -PNEXUS_MINOR_VERSION=9 -PNEXUS_MICRO_VERSION=0 - -#release versioning -PLUGIN_MAJOR_VERSION=1 -PLUGIN_MINOR_VERSION=0 -PLUGIN_MICRO_VERSION=0 - -#release versioning -CUBA_MAJOR_VERSION=4 -CUBA_MINOR_VERSION=2 -CUBA_MICRO_VERSION=0 - -#API version -MUSR_API_VERSION=$MUSR_MAJOR_VERSION.$MUSR_MINOR_VERSION -AC_SUBST(MUSR_API_VERSION) - -MUSR_ROOT_API_VERSION=$MUSR_ROOT_MAJOR_VERSION.$MUSR_ROOT_MINOR_VERSION -AC_SUBST(MUSR_ROOT_API_VERSION) - -LEM_API_VERSION=$LEM_MAJOR_VERSION.$LEM_MINOR_VERSION -AC_SUBST(LEM_API_VERSION) - -PSIBIN_API_VERSION=$PSIBIN_MAJOR_VERSION.$PSIBIN_MINOR_VERSION -AC_SUBST(PSIBIN_API_VERSION) - -MUD_API_VERSION=$MUD_MAJOR_VERSION.$MUD_MINOR_VERSION -AC_SUBST(MUD_API_VERSION) - -PNEXUS_API_VERSION=$PNEXUS_MAJOR_VERSION.$PNEXUS_MINOR_VERSION -AC_SUBST(PNEXUS_API_VERSION) - -PLUGIN_API_VERSION=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION -AC_SUBST(PLUGIN_API_VERSION) - -CUBA_API_VERSION=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION -AC_SUBST(CUBA_API_VERSION) - -#shared library versioning -CUBA_LIBRARY_VERSION=$CUBA_MAJOR_VERSION:$CUBA_MINOR_VERSION:$CUBA_MICRO_VERSION -PLUGIN_LIBRARY_VERSION=$PLUGIN_MAJOR_VERSION:$PLUGIN_MINOR_VERSION:$PLUGIN_MICRO_VERSION -MUSR_ROOT_LIBRARY_VERSION=$MUSR_ROOT_MAJOR_VERSION:$MUSR_ROOT_MINOR_VERSION:$MUSR_ROOT_MICRO_VERSION -LEM_LIBRARY_VERSION=$LEM_MAJOR_VERSION:$LEM_MINOR_VERSION:$LEM_MICRO_VERSION -PSIBIN_LIBRARY_VERSION=$PSIBIN_MAJOR_VERSION:$PSIBIN_MINOR_VERSION:$PSIBIN_MICRO_VERSION -MUD_LIBRARY_VERSION=$MUD_MAJOR_VERSION:$MUD_MINOR_VERSION:$MUD_MICRO_VERSION -PNEXUS_LIBRARY_VERSION=$PNEXUS_MAJOR_VERSION:$PNEXUS_MINOR_VERSION:$PNEXUS_MICRO_VERSION -MUSR_LIBRARY_VERSION=$MUSR_MAJOR_VERSION:$MUSR_MINOR_VERSION:$MUSR_MICRO_VERSION - -# This is definitely handled wrongly at the moment and needs to be fixed... -#XXX_LIBRARY_VERSION=X:Y:Z -# | | | -# +------+ | +---+ -# | | | -# current:revision:age -# | | | -# | | +- increment if interfaces have been added -# | | set to zero if interfaces have been removed -# or changed -# | +- increment if source code has changed -# | set to zero if current is incremented -# +- increment if interfaces have been added, removed or changed - -AC_SUBST(MUSR_LIBRARY_VERSION) -AC_SUBST(MUSR_ROOT_LIBRARY_VERSION) -AC_SUBST(LEM_LIBRARY_VERSION) -AC_SUBST(PSIBIN_LIBRARY_VERSION) -AC_SUBST(MUD_LIBRARY_VERSION) -AC_SUBST(PNEXUS_LIBRARY_VERSION) -AC_SUBST(PLUGIN_LIBRARY_VERSION) -AC_SUBST(CUBA_LIBRARY_VERSION) - -PACKAGE=$MUSR_PROGRAM_NAME -AC_SUBST(MUSR_LIBRARY_NAME) -AC_SUBST(USERFCN_LIBRARY_NAME) -AC_SUBST(MUSR_ROOT_LIBRARY_NAME) -AC_SUBST(LEM_LIBRARY_NAME) -AC_SUBST(PSIBIN_LIBRARY_NAME) -AC_SUBST(MUD_LIBRARY_NAME) -AC_SUBST(PNEXUS_LIBRARY_NAME) -AC_SUBST(CUBA_LIBRARY_NAME) - -PSIBIN_VERSION=$PSIBIN_MAJOR_VERSION.$PSIBIN_MINOR_VERSION.$PSIBIN_MICRO_VERSION -PSIBIN_RELEASE=$PSIBIN_MAJOR_VERSION.$PSIBIN_MINOR_VERSION -AC_SUBST(PSIBIN_RELEASE) -AC_SUBST(PSIBIN_VERSION) - -MUD_VERSION=$MUD_MAJOR_VERSION.$MUD_MINOR_VERSION.$MUD_MICRO_VERSION -MUD_RELEASE=$MUD_MAJOR_VERSION.$MUD_MINOR_VERSION -AC_SUBST(MUD_RELEASE) -AC_SUBST(MUD_VERSION) - -PNEXUS_VERSION=$PNEXUS_MAJOR_VERSION.$PNEXUS_MINOR_VERSION.$PNEXUS_MICRO_VERSION -PNEXUS_RELEASE=$PNEXUS_MAJOR_VERSION.$PNEXUS_MINOR_VERSION -AC_SUBST(PNEXUS_RELEASE) -AC_SUBST(PNEXUS_VERSION) - -LEM_VERSION=$LEM_MAJOR_VERSION.$LEM_MINOR_VERSION.$LEM_MICRO_VERSION -LEM_RELEASE=$LEM_MAJOR_VERSION.$LEM_MINOR_VERSION -AC_SUBST(LEM_RELEASE) -AC_SUBST(LEM_VERSION) - -MUSR_ROOT_VERSION=$MUSR_ROOT_MAJOR_VERSION.$MUSR_ROOT_MINOR_VERSION.$MUSR_ROOT_MICRO_VERSION -MUSR_ROOT_RELEASE=$MUSR_ROOT_MAJOR_VERSION.$MUSR_ROOT_MINOR_VERSION -AC_SUBST(MUSR_ROOT_RELEASE) -AC_SUBST(MUSR_ROOT_VERSION) - -MUSR_VERSION=$MUSR_MAJOR_VERSION.$MUSR_MINOR_VERSION.$MUSR_MICRO_VERSION -MUSR_RELEASE=$MUSR_MAJOR_VERSION.$MUSR_MINOR_VERSION -AC_SUBST(MUSR_RELEASE) -AC_SUBST(MUSR_VERSION) - -PLUGIN_VERSION=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION.$PLUGIN_MICRO_VERSION -PLUGIN_RELEASE=$PLUGIN_MAJOR_VERSION.$PLUGIN_MINOR_VERSION -AC_SUBST(PLUGIN_RELEASE) -AC_SUBST(PLUGIN_VERSION) -AC_SUBST(PLUGIN_MAJOR_VERSION) -AC_SUBST(PLUGIN_MINOR_VERSION) - -CUBA_VERSION=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION.$CUBA_MICRO_VERSION -CUBA_RELEASE=$CUBA_MAJOR_VERSION.$CUBA_MINOR_VERSION -AC_SUBST(CUBA_RELEASE) -AC_SUBST(CUBA_VERSION) - -VERSION=$MUSR_VERSION - -# Wordaround for gcc-bugs causing problems building libCuba -# which should be change when a real solution appears -# Set CFLAGS to "" and pass any user-CFLAGS to the mud-building -# user-CFLAGS will not be passed to the libCuba building process -# mud and cuba are currently the only C-routines -USER_CFLAGS="$CFLAGS" -CFLAGS= -if test "$USER_CFLAGS" = ""; then - USER_CFLAGS="-g -O2" -fi - -dnl ----------------------------------------------- -dnl Automake initialization and program checks -dnl ----------------------------------------------- - -AM_INIT_AUTOMAKE -# m4_ifdef([AM_SILENT_RULES], -# [AM_SILENT_RULES([yes])]) -AC_CONFIG_HEADER([config.h]) -AC_LANG([C++]) -AC_PROG_LN_S -AC_PROG_INSTALL - -m4_ifdef([AC_PROG_MKDIR_P], - [AC_PROG_MKDIR_P], - [MKDIR_P="mkdir -p" - AC_SUBST(MKDIR_P)]) - -m4_ifdef([LT_INIT], - [LT_INIT([disable-static]) - LT_LANG([C++]) - LT_LANG([C])], - [m4_defun([_LT_AC_LANG_F77_CONFIG], [:]) - AC_DISABLE_STATIC([]) - LT_INIT - AC_PROG_CXX - AC_PROG_CC]) - -dnl ----------------------------------------------- -dnl Ask user for path to fftw3 -dnl ----------------------------------------------- - -FFTW3_FOUND=0 -AC_ARG_WITH([fftw3], - [AS_HELP_STRING([--with-fftw3],[prefix of FFTW3 installation, e.g. /usr/local or /usr])], - [FFTW3_PREFIX=$with_fftw3 - AC_MSG_CHECKING([whether FFTW3 can be found at the specified location]) - if !(test -r ${FFTW3_PREFIX}/include/fftw3.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([FFTW3 cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${FFTW3_PREFIX}])], - [PKG_CHECK_MODULES(FFTW3, fftw3 >= 3.1.0, [FFTW3_FOUND=1], - [AC_MSG_CHECKING([whether FFTW3 is installed in a standard location]) - if test -r /usr/local/include/fftw3.h; then - FFTW3_PREFIX="/usr/local" - AC_MSG_RESULT([${FFTW3_PREFIX}]) - elif test -r /usr/include/fftw3.h; then - FFTW3_PREFIX="/usr" - AC_MSG_RESULT([${FFTW3_PREFIX}]) - elif test -r /sw/include/fftw3.h; then - FFTW3_PREFIX="/sw" - AC_MSG_RESULT([${FFTW3_PREFIX}]) - elif test -r /opt/local/include/fftw3.h; then - FFTW3_PREFIX="/opt/local" - AC_MSG_RESULT([${FFTW3_PREFIX}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [FFTW3 not found. Please call configure with the --with-fftw3 option. - This tells configure where to find the FFTW3 C libraries and headers, - e.g. --with-fftw3=/usr/local or --with-fftw3=/usr] - ) - fi - ] - ) - ] -) -AC_SUBST(FFTW3_PREFIX) -if test "${FFTW3_FOUND}" != "1"; then - FFTW3_LIBS="-L${FFTW3_PREFIX}/lib -lfftw3 -lm" - FFTW3_CFLAGS="-I${FFTW3_PREFIX}/include" -fi - -dnl ----------------------------------------------- -dnl Ask user for path to gsl -dnl ----------------------------------------------- - -GSL_FOUND=0 -AC_ARG_WITH([gsl], - [AS_HELP_STRING([--with-gsl],[prefix of GSL installation. e.g. /usr/local or /usr])], - [GSL_PREFIX=$with_gsl - AC_MSG_CHECKING([whether GSL can be found at the specified location]) - if !(test -r ${GSL_PREFIX}/include/gsl/gsl_sf_hyperg.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([GSL cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${GSL_PREFIX}])], - [PKG_CHECK_MODULES(GSL, gsl >= 1.9, [GSL_FOUND=1], - [AC_MSG_CHECKING([whether GSL is installed in a standard location]) - if test -r /usr/local/include/gsl/gsl_sf_hyperg.h; then - GSL_PREFIX="/usr/local" - AC_MSG_RESULT([${GSL_PREFIX}]) - elif test -r /usr/include/gsl/gsl_sf_hyperg.h; then - GSL_PREFIX="/usr" - AC_MSG_RESULT([${GSL_PREFIX}]) - elif test -r /sw/include/gsl/gsl_sf_hyperg.h; then - GSL_PREFIX="/sw" - AC_MSG_RESULT([${GSL_PREFIX}]) - elif test -r /opt/local/include/gsl/gsl_sf_hyperg.h; then - GSL_PREFIX="/opt/local" - AC_MSG_RESULT([${GSL_PREFIX}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [GSL not found. Please call configure with the --with-gsl option. - This tells configure where to find the GSL C libraries and headers, - e.g. --with-gsl=/usr/local or --with-gsl=/usr] - ) - fi - ] - ) - ] -) -AC_SUBST(GSL_PREFIX) -if test "${GSL_FOUND}" != "1"; then - GSL_LIBS="-L${GSL_PREFIX}/lib -lgsl -lgslcblas -lm" - GSL_CFLAGS="-I${GSL_PREFIX}/include/gsl" -fi -AC_SUBST(GSL_LIBS) -AC_SUBST(GSL_CFLAGS) - -dnl ----------------------------------------------- -dnl Ask user for path to boost -dnl ----------------------------------------------- - -BOOST_FOUND=0 -AC_ARG_WITH([boostinc], - [AS_HELP_STRING([--with-boostinc],[path to the header files of the BOOST installation, e.g. /usr/local/include or /usr/include])], - [BOOST_INCLUDE=$with_boostinc - AC_MSG_CHECKING([whether BOOST can be found at the specified location]) - if !(test -r ${BOOST_INCLUDE}/boost/spirit.hpp) && !(test -r ${BOOST_INCLUDE}/boost/spirit/include/classic_spirit.hpp); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([BOOST cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${BOOST_INCLUDE}])], - [PKG_CHECK_MODULES(BOOST, boost >= 1.30, [BOOST_FOUND=1], - [AC_MSG_CHECKING([whether BOOST is installed in a standard location]) - if test -r /usr/local/include/boost/spirit.hpp || test -r /usr/local/include/boost/spirit/include/classic_spirit.hpp; then - BOOST_INCLUDE="/usr/local/include" - AC_MSG_RESULT([${BOOST_INCLUDE}]) - elif test -r /usr/include/boost/spirit.hpp || test -r /usr/include/boost/spirit/include/classic_spirit.hpp; then - BOOST_INCLUDE="/usr/include" - AC_MSG_RESULT([${BOOST_INCLUDE}]) - elif test -r /sw/include/boost/spirit.hpp || test -r /sw/include/boost/spirit/include/classic_spirit.hpp; then - BOOST_INCLUDE="/sw/include" - AC_MSG_RESULT([${BOOST_INCLUDE}]) - elif test -r /opt/local/include/boost/spirit.hpp || test -r /opt/local/include/boost/spirit/include/classic_spirit.hpp; then - BOOST_INCLUDE="/opt/local/include" - AC_MSG_RESULT([${BOOST_INCLUDE}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [BOOST not found. Please call configure with the --with-boostinc option. - This tells configure where to find the BOOST C++ headers, - e.g. --with-boostinc=/usr/local/include or --with-boostinc=/usr/include or --with-boostinc=/usr/include/boost-1_33_0] - ) - fi - ] - ) - ] -) -AC_SUBST(BOOST_INCLUDE) -if test "${BOOST_FOUND}" != "1"; then - BOOST_LIBS="" - BOOST_CFLAGS="-I${BOOST_INCLUDE}" -fi -AC_SUBST(BOOST_LIBS) -AC_SUBST(BOOST_CFLAGS) - - -dnl ----------------------------------------------- -dnl Ask user for path to libxml2 -dnl ----------------------------------------------- -LIBXML2_FOUND=0 -AC_ARG_WITH([libxml2], - [AS_HELP_STRING([--with-libxml2],[prefix of the libxml2 installation, e.g. /usr/local/include])], - [LIBXML2_PREFIX=$with_libxml2 - AC_MSG_CHECKING([whether libxml2 can be found at the specified location]) - if !(test -r ${LIBXML2_PREFIX}/libxml2/libxml/xmlreader.h) && !(test -r ${LIBXML2_PREFIX}/libxml2/libxml/parser.h) && !(test -r ${LIBXML2_PREFIX}/libxml2/libxml/xmlschemas.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([libxml2 cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${LIBXML2_PREFIX}])], - [PKG_CHECK_MODULES(LIBXML2, libxml2 >= 2.6.26, [LIBXML2_FOUND=1], - [AC_MSG_CHECKING([whether libxml2 is installed in a standard location]) - if test -r /usr/local/include/libxml2/libxml/xmlreader.h || test -r /usr/local/include/libxml2/libxml/parser.h || \ - test -r /usr/local/include/libxml2/libxml/xmlschemas.h; then - LIBXML2_PREFIX="/usr/local/include" - AC_MSG_RESULT([${LIBXML2_PREFIX}]) - elif test -r /usr/include/libxml2/libxml/xmlreader.h || test -r /usr/include/libxml2/libxml/parser.h || \ - test -r /usr/include/libxml2/libxml/xmlschemas.h; then - LIBXML2_PREFIX="/usr/include" - AC_MSG_RESULT([${LIBXML2_PREFIX}]) - elif test -r /sw/include/libxml2/libxml/xmlreader.h || test -r /sw/include/libxml2/libxml/parser.h || \ - test -r /sw/include/libxml2/libxml/xmlschemas.h; then - LIBXML2_PREFIX="/sw/include" - AC_MSG_RESULT([${LIBXML2_PREFIX}]) - elif test -r /opt/local/include/libxml2/libxml/xmlreader.h || test -r /opt/local/include/libxml2/libxml/parser.h || \ - test -r /opt/local/include/libxml2/libxml/xmlschemas.h; then - LIBXML2_PREFIX="/opt/local/include" - AC_MSG_RESULT([${LIBXML2_PREFIX}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [libxml2 not found. Please call configure with the --with-libxml2 option. - This tells configure where to find the libxml2 headers, - e.g. --with-libxml2=/usr/local/include or --with-libxml2=/usr/include/libxml2] - ) - fi - ] - ) - ] -) -AC_SUBST(LIBXML2_PREFIX) -if test "${LIBXML2_FOUND}" != "1"; then - LIBXML2_LIBS="-L${LIBXML2_PREFIX}/lib -lxml2" - LIBXML2_CFLAGS="-I${LIBXML2_PREFIX}/libxml2" -fi -AC_SUBST(LIBXML2_LIBS) -AC_SUBST(LIBXML2_CFLAGS) - -dnl ----------------------------------------------- -dnl Check for ROOT -dnl ----------------------------------------------- - -ROOT_PATH([6.06/00], [], AC_MSG_ERROR([Either ROOT is not installed correctly or the version is too old... please check!])) - -ROOT_LIBS="-L${ROOTLIBDIR} ${ROOTGLIBS} ${ROOTAUXLIBS} -lMinuit2 -lMathMore -lXMLParser" -ROOT_CFLAGS="-I${ROOTINCDIR} ${ROOTCFLAGS} ${ROOTAUXCFLAGS}" - -# Check if Minuit2 has been enabled during the ROOT configuration - -AC_MSG_CHECKING([for Minuit2 in ROOT]) -if test "x$(${ROOTCONF} --has-minuit2)" = "xyes"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([Minuit2 is not included in the ROOT installation... Please configure ROOT with the --enable-minuit2 option!]) -fi - -AC_MSG_CHECKING([for MathMore in ROOT]) -if test "x$(${ROOTCONF} --has-mathmore)" = "xyes"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([MathMore is not included in the ROOT installation... Please configure ROOT with the --enable-mathmore option and check that the feature is actually built!]) -fi - -AC_MSG_CHECKING([for XML support in ROOT]) -if test "x$(${ROOTCONF} --has-xml)" = "xyes"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([XML support is not included in the ROOT installation... Please configure ROOT with the --enable-xml option and check that the feature is actually built!]) -fi - -AC_MSG_CHECKING([for image processing support in ROOT]) -if test "x$(${ROOTCONF} --has-asimage)" = "xyes"; then - AC_MSG_RESULT([yes]) -else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([image processing support is not included in the ROOT installation... Please configure ROOT with the --enable-asimage option and check that the feature is actually built!]) -fi - -AC_SUBST(ROOT_LIBS) -AC_SUBST(ROOT_CFLAGS) - -dnl ----------------------------------------------- -dnl Check for NeXus, HDF5, etc. -dnl ----------------------------------------------- -AC_ARG_ENABLE([NeXus], [AS_HELP_STRING([--enable-NeXus],[build optional NeXus support [default=no]])], - [ - # checking for hdf4 - AC_ARG_WITH([hdf4], - [AS_HELP_STRING([--with-hdf4],[prefix of the HDF4 installation (needed for NeXus), e.g. /usr/local/hdf4 or /opt/hdf4])], - [HDF4_PREFIX=$with_hdf4 - AC_MSG_CHECKING([whether HDF4 can be found at the specified location]) - if !(test -r ${HDF4_PREFIX}/include/hdf.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([HDF4 cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${HDF4_PREFIX}])], - [AC_MSG_CHECKING([whether HDF4 is installed in a standard location]) - if test -r /usr/local/include/hdf.h; then - HDF4_PREFIX="/usr/local" - AC_MSG_RESULT([${HDF4_PREFIX}]) - elif test -r /usr/local/hdf/include/hdf.h; then - HDF4_PREFIX="/usr/local/hdf" - AC_MSG_RESULT([${HDF4_PREFIX}]) - elif test -r /usr/include/hdf.h; then - HDF4_PREFIX="/usr" - AC_MSG_RESULT([${HDF4_PREFIX}]) - elif test -r /usr/include/hdf/hdf.h; then - HDF4_PREFIX="/usr/include/" - AC_MSG_RESULT([${HDF4_PREFIX}]) - elif test -r /sw/include/hdf.h; then - HDF4_PREFIX="/sw" - AC_MSG_RESULT([${HDF4_PREFIX}]) - elif test -r /opt/local/include/hdf.h; then - HDF4_PREFIX="/opt/local" - AC_MSG_RESULT([${HDF4_PREFIX}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [HDF4 not found (needed for NeXus). Please call configure with the --with-hdf4 option. - This tells configure where to find the HDF4 C++ headers, - e.g. --with-hdf4=/usr/local/hdf] - ) - fi - ] - ) - - # checking for hdf5 - AC_ARG_WITH([hdf5], - [AS_HELP_STRING([--with-hdf5],[prefix of the HDF5 installation (needed for NeXus), e.g. /usr/local/hdf5 or /opt/hdf5])], - [HDF5_PREFIX=$with_hdf5 - AC_MSG_CHECKING([whether HDF5 can be found at the specified location]) - if !(test -r ${HDF5_PREFIX}/include/hdf5.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([HDF5 cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${HDF5_PREFIX}])], - [AC_MSG_CHECKING([whether HDF5 is installed in a standard location]) - if test -r /usr/local/include/hdf5.h; then - HDF5_PREFIX="/usr/local" - AC_MSG_RESULT([${HDF5_PREFIX}]) - elif test -r /usr/local/hdf5/include/hdf5.h; then - HDF5_PREFIX="/usr/local/hdf5" - AC_MSG_RESULT([${HDF5_PREFIX}]) - elif test -r /usr/include/hdf5/serial/hdf5.h; then - HDF5_PREFIX="/usr/include/hdf5/serial" - AC_MSG_RESULT([${HDF5_PREFIX}]) - elif test -r /usr/include/hdf5.h; then - HDF5_PREFIX="/usr" - AC_MSG_RESULT([${HDF5_PREFIX}]) - elif test -r /sw/include/hdf5.h; then - HDF5_PREFIX="/sw" - AC_MSG_RESULT([${HDF5_PREFIX}]) - elif test -r /opt/local/include/hdf5.h; then - HDF5_PREFIX="/opt/local" - AC_MSG_RESULT([${HDF5_PREFIX}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [HDF5 not found (needed for NeXus). Please call configure with the --with-hdf5 option. - This tells configure where to find the HDF5 C++ headers, - e.g. --with-hdf5=/usr/local/hdf5] - ) - fi - ] - ) - - # checking for NeXus - NEXUS_FOUND=0 - AC_ARG_WITH([nexus], - [AS_HELP_STRING([--with-nexus],[prefix of the NeXus installation, e.g. /usr/local])], - [NEXUS_PREFIX=$with_nexus - AC_MSG_CHECKING([whether NeXus can be found at the specified location]) - if !(test -r ${NEXUS_PREFIX}/include/nexus/napi.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([NeXus cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${NEXUS_PREFIX}])], - [PKG_CHECK_MODULES(NEXUS, nexus >= 4.4, [NEXUS_FOUND=1], - [AC_MSG_CHECKING([whether NeXus is installed in a standard location]) - if test -r /usr/local/include/nexus/napi.h; then - NEXUS_PREFIX="/usr/local" - AC_MSG_RESULT([${NEXUS_PREFIX}]) - elif test -r /sw/include/nexus/napi.h; then - NEXUS_PREFIX="/sw" - AC_MSG_RESULT([${NEXUS_PREFIX}]) - elif test -r /opt/local/include/nexus/napi.h; then - NEXUS_PREFIX="/opt/local" - AC_MSG_RESULT([${NEXUS_PREFIX}]) - elif test -r /opt/nexus/include/nexus/napi.h; then - NEXUS_PREFIX="/opt/nexus" - AC_MSG_RESULT([${NEXUS_PREFIX}]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR( - [NeXus Version >= 4.4 not found. Please call configure with the --with-nexus option. - This tells configure where to find the NeXus headers, - e.g. --with-nexus=/opt/nexus] - ) - fi - ] - )] - ) - AC_SUBST(NEXUS_PREFIX) - if test "${NEXUS_FOUND}" != "1"; then - dnl get suffix for the NeXus library depending on the OS - AC_REQUIRE([AC_CANONICAL_HOST]) - AS_CASE([$host_os], - [linux*], [NEXUS_SUFFIX="so"], - [darwin*], [NEXUS_SUFFIX="dylib"], - [*cygwin*], [NEXUS_SUFFIX="dll"], - [AC_MSG_ERROR([NeXus check: Your platform is not currently supported])] - ) - AC_MSG_NOTICE([NeXus Suffix Result: "${NEXUS_SUFFIX}"]) - if test -r ${NEXUS_PREFIX}/lib/libNeXus.${NEXUS_SUFFIX}; then - NEXUS_LIB_DIR="lib" - elif test -r ${NEXUS_PREFIX}/lib64/libNeXus.${NEXUS_SUFFIX}; then - NEXUS_LIB_DIR="lib64" - else - AC_MSG_ERROR( - [Couldn't find the NeXus library.] - ) - fi - - NEXUS_LIBS="-L${NEXUS_PREFIX}/${NEXUS_LIB_DIR} -lNeXus" - NEXUS_CFLAGS="-I${NEXUS_PREFIX}/include/nexus" - fi - AC_SUBST(NEXUS_LIBS) - AC_SUBST(NEXUS_CFLAGS) - - PNEXUS_ENABLED=1 - ], - [PNEXUS_ENABLED=0] -) - -dnl ----------------------------------------------- -dnl Ask user if BMWlibs should be built and where to find the CUBA installation -dnl ----------------------------------------------- - -AC_ARG_ENABLE([BMWlibs], [AS_HELP_STRING([--enable-BMWlibs],[build optional BMW plug-ins [default=no]])], - [CUBA_FOUND=0 - BUILD_CUBA=0 - AC_ARG_WITH([cuba], - [AS_HELP_STRING([--with-cuba],[prefix of CUBA installation, e.g. /usr/local or /usr])], - [CUBA_PREFIX=$with_cuba - AC_MSG_CHECKING([whether CUBA can be found at the specified location]) - if !(test -r ${CUBA_PREFIX}/include/cuba.h); then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([CUBA cannot be found at the specified path!]) - fi - AC_MSG_RESULT([${CUBA_PREFIX}])], - [PKG_CHECK_MODULES(CUBA, cuba >= 1.6, [CUBA_FOUND=1], - [AC_MSG_CHECKING([whether CUBA is installed in a standard location]) - if test -r /usr/local/include/cuba.h; then - CUBA_PREFIX="/usr/local" - AC_MSG_RESULT([${CUBA_PREFIX}]) - elif test -r /usr/include/cuba.h; then - CUBA_PREFIX="/usr" - AC_MSG_RESULT([${CUBA_PREFIX}]) - elif test -r /sw/include/cuba.h; then - CUBA_PREFIX="/sw" - AC_MSG_RESULT([${CUBA_PREFIX}]) - elif test -r /opt/local/include/cuba.h; then - CUBA_PREFIX="/opt/local" - AC_MSG_RESULT([${CUBA_PREFIX}]) - else - BUILD_CUBA=1 - AC_MSG_RESULT([builtin-cuba]) - fi - ] - ) - ] - ) - - if test "${BUILD_CUBA}" = "1"; then - AS_IF([test "x$GCC" = "xyes"], - [case "$($CC --version 2>&1 < /dev/null)" in - *gcc*4.2* | *gcc*4.4.3*) - opt=-O0 - ;; - *) - opt=-O3 - ;; - esac - CUBA_BUILD_CFLAGS="$opt -fomit-frame-pointer -ffast-math"], - [CUBA_BUILD_CFLAGS="-O"]) - - AC_LANG_PUSH([C]) - - AC_C_CONST - AC_C_INLINE - AC_DIAGNOSE([obsolete],[The macro `AC_C_LONG_DOUBLE' is obsolete. -You should use `AC_TYPE_LONG_DOUBLE' or `AC_TYPE_LONG_DOUBLE_WIDER' instead. -])dnl - - AC_TYPE_LONG_DOUBLE_WIDER - ac_cv_c_long_double=$ac_cv_type_long_double_wider - if test $ac_cv_c_long_double = yes; then - AC_DEFINE([HAVE_LONG_DOUBLE],[1],[Define to 1 if the type `long double' works and has more range or - precision than `double'.]) - fi - - - AC_CHECK_FUNCS([powl]) - AC_CHECK_FUNCS([erf]) -# AC_FUNC_FORK - AC_FUNC_ALLOCA - - AC_DEFUN([chk_shmget], [dnl - AC_REQUIRE([AC_CANONICAL_HOST]) - AS_CASE([$host_os], - [*cygwin*], [], - [AC_CHECK_FUNCS([shmget])]) - ]) - chk_shmget - AC_CHECK_FUNCS([getloadavg]) - - MAXDIM=${MAXDIM:-16} - AC_ARG_WITH(maxdim, - [AS_HELP_STRING([--with-maxdim=N], - [[Cuba option] the maximum dimension for integration, - if variable-size array are not supported])], - [MAXDIM=$withval]) - - MAXCOMP=${MAXCOMP:-4} - AC_ARG_WITH(maxcomp, - [AS_HELP_STRING([--with-maxcomp=N], - [[Cuba option] the maximum number of components of the integrand, - if variable-size array are not supported])], - [MAXCOMP=$withval]) - - AC_MSG_CHECKING([for variable-size arrays]) - AC_COMPILE_IFELSE([AC_LANG_SOURCE(,[[ - void test(int n) - { - char s[n]; - } - ]])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no, using MAXDIM=$MAXDIM and MAXCOMP=$MAXCOMP]) - AC_DEFINE_UNQUOTED([NDIM], [$MAXDIM], [Maximum number of components]) - AC_DEFINE_UNQUOTED([NCOMP], [$MAXCOMP], [Maximum number of dimensions])] - ) - - AC_LANG_POP([C]) - - CUBA_SRCDIR="$(pwd)/src/external/libCuba/src" - CUBA_LIBS="${CUBA_SRCDIR}/libcuba.la" - CUBA_CFLAGS="-I${CUBA_SRCDIR}" - else - if test "${CUBA_FOUND}" != "1"; then - CUBA_LIBS="-L${CUBA_PREFIX}/lib -lcuba -lm" - CUBA_CFLAGS="-I${CUBA_PREFIX}/include" - fi - fi - - AC_SUBST(CUBA_PREFIX) - AC_SUBST(CUBA_LIBS) - AC_SUBST(CUBA_CFLAGS) - - BUILD_BMW_LIBS=1 - ], - [BUILD_BMW_LIBS=0] -) - -dnl ----------------------------------------------- -dnl Ask user if ASlibs should be built -dnl ----------------------------------------------- - -AC_ARG_ENABLE([ASlibs], [AS_HELP_STRING([--enable-ASlibs],[build optional AS plug-ins [default=no]])],[BUILD_AS_LIBS=1], [BUILD_AS_LIBS=0]) - -dnl ----------------------------------------------- -dnl Ask user if BNMRlibs should be built -dnl ----------------------------------------------- - -AC_ARG_ENABLE([BNMRlibs], [AS_HELP_STRING([--enable-BNMRlibs],[build optional BNMR plug-ins [default=no]])],[BUILD_BNMR_LIBS=1], [BUILD_BNMR_LIBS=0]) - -dnl ----------------------------------------------- -dnl Set some paths and flags for PMusr, MusrRoot, TLemRunHeader, Class_MuSR_PSI, mud, NeXus (if enabled), etc. -dnl ----------------------------------------------- - -SRCDIR="$(pwd)/src" - -PSIBIN_SRCDIR="${SRCDIR}/external/MuSR_software/Class_MuSR_PSI" -PSIBIN_LIBS="${PSIBIN_SRCDIR}/lib${PSIBIN_LIBRARY_NAME}.la" -PSIBIN_CFLAGS="-I${PSIBIN_SRCDIR}" -AC_SUBST(PSIBIN_LIBS) -AC_SUBST(PSIBIN_CFLAGS) - -MUD_SRCDIR="${SRCDIR}/external/mud/src" -MUD_LIBS="${MUD_SRCDIR}/lib${MUD_LIBRARY_NAME}.la" -MUD_CFLAGS="-I${MUD_SRCDIR}" -AC_SUBST(MUD_LIBS) -AC_SUBST(MUD_CFLAGS) - -LEM_SRCDIR="${SRCDIR}/external/TLemRunHeader" -LEM_LIBS="${LEM_SRCDIR}/lib${LEM_LIBRARY_NAME}.la" -LEM_CFLAGS="-I${LEM_SRCDIR}" -AC_SUBST(LEM_LIBS) -AC_SUBST(LEM_CFLAGS) - -MUSR_ROOT_SRCDIR="${SRCDIR}/external/MusrRoot" -MUSR_ROOT_LIBS="${MUSR_ROOT_SRCDIR}/lib${MUSR_ROOT_LIBRARY_NAME}.la" -MUSR_ROOT_CFLAGS="-I${MUSR_ROOT_SRCDIR}" -AC_SUBST(MUSR_ROOT_LIBS) -AC_SUBST(MUSR_ROOT_CFLAGS) - -PMUSR_LIBS="${SRCDIR}/classes/lib${MUSR_LIBRARY_NAME}.la" -PMUSR_CFLAGS="-I${SRCDIR}/include" -AC_SUBST(PMUSR_LIBS) -AC_SUBST(PMUSR_CFLAGS) - -USERFCN_LIBS="${SRCDIR}/classes/lib${USERFCN_LIBRARY_NAME}.la" -AC_SUBST(USERFCN_LIBS) - -if test "${PNEXUS_ENABLED}" = "1"; then - AC_DEFINE([PNEXUS_ENABLED], [1], [Define to 1 if NeXus is enabled]) - PNEXUS_SRCDIR="${SRCDIR}/external/nexus" - PNEXUS_LIBS="${PNEXUS_SRCDIR}/lib${PNEXUS_LIBRARY_NAME}.la" - PNEXUS_CXXFLAGS="-I${PNEXUS_SRCDIR}" - AC_SUBST(PNEXUS_LIBS) - AC_SUBST(PNEXUS_CXXFLAGS) -fi - -if test "${BUILD_BNMR_LIBS}" = "1"; then - BNMRLIBS_SRCDIR="${SRCDIR}/external/libBNMR" - BNMRLIBS_LIBS="${BNMRLIBS_SRCDIR}/libBNMR.la" - BNMRLIBS_CFLAGS="-I${BNMRLIBS_SRCDIR}" - AC_SUBST(BNMRLIBS_LIBS) - AC_SUBST(BNMRLIBS_CFLAGS) -fi - -if test "${BUILD_BMW_LIBS}" = "1"; then - BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools" - BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la" - BMWTOOLS_CFLAGS="-I${BMWTOOLS_SRCDIR}" - AC_SUBST(BMWTOOLS_LIBS) - AC_SUBST(BMWTOOLS_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 libFitPofB). - SAVED_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $FFTW3_CFLAGS" - SAVED_LIBSS="$LIBS" - LIBS="$LIBS $FFTW3_LIBS" - AC_SEARCH_LIBS([fftw_init_threads], [fftw3_threads], [FFTW3_LIBS="$FFTW3_LIBS -lfftw3_threads -lpthread" - AC_DEFINE([HAVE_LIBFFTW3_THREADS], [1], [Define to 1 if fftw3_threads are available])], [], [-lpthread]) - # Check for fftw3f library. If it is not available the BMWlibs will not be built! - AC_SEARCH_LIBS([fftwf_malloc], [fftw3f], [FFTW3_LIBS="$FFTW3_LIBS -lfftw3f"], [BUILD_BMW_LIBS=0 - AC_MSG_ERROR([The float version of FFTW3 is not available. When building FFTW3 from source it should be configured with the options - --enable-shared --enable-float. Without this library the BMWlibs cannot be built!])], []) - if test "${BUILD_BMW_LIBS}" = "1"; then - AC_SEARCH_LIBS([fftwf_init_threads], [fftw3f_threads], [FFTW3_LIBS="$FFTW3_LIBS -lfftw3f_threads -lpthread" - AC_DEFINE([HAVE_LIBFFTW3F_THREADS], [1], [Define to 1 if fftw3f_threads are available])], [], [-lpthread]) - fi - - CFLAGS="$SAVED_CFLAGS" - LIBS="$SAVED_LIBS" -fi - -AC_SUBST(FFTW3_LIBS) -AC_SUBST(FFTW3_CFLAGS) - -dnl ----------------------------------------------- -dnl Ask user if OpenMP support should be disabled (used for parallel chisq calculation and in libFitPofB) -dnl ----------------------------------------------- - -AC_ARG_ENABLE([omp], [AS_HELP_STRING([--enable-omp],[build musrfit with OpenMP support [default=yes]])]) - -if test "x$enable_omp" != "xno"; then - SAVED_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="$CXXFLAGS -fopenmp" - SAVED_LIBSS="$LIBS" - LIBS="$LIBS -fopenmp -lgomp" - AC_SEARCH_LIBS([omp_get_num_procs], [gomp], [AC_DEFINE([HAVE_GOMP], [1], [Define to 1 if gomp is available])], - [CXXFLAGS="$SAVED_CXXFLAGS" LIBS="$SAVED_LIBS"], []) -fi - -dnl ----------------------------------------------- -dnl Ask user if the building of musredit/musrgui should be disabled -dnl ----------------------------------------------- - -AC_ARG_ENABLE([editor], [AS_HELP_STRING([--enable-editor],[check for Qt and build musredit or musrgui [default=yes]])]) - -if test "x$enable_editor" != "xno"; then - - echo "Additional checks for musredit/musrgui ..." - - QT5MINVER=5.4 - - case "$host" in - *-*-cygwin) - QT4MINVER=4.5 - ;; - *) - QT4MINVER=4.6 - ;; - esac - - QT3_FOUND=no - QT3MT_FOUND=no - QT4_FOUND=no - QT5_FOUND=no - QMAKEBIN="" - QTEDITOR=none - - AC_ARG_WITH([qt3], - [AS_HELP_STRING([--with-qt3],[prefix of the Qt3 installation, e.g. /usr/lib/qt-3.3])], - [QT3_PREFIX=$with_qt3 - AC_MSG_CHECKING([whether qmake for Qt3 can be found at the specified location]) - for QMAKE in qmake qmake-qt3 - do - if test -x "${QT3_PREFIX}/bin/${QMAKE}"; then - QMAKEVERSIONSTRING="$(${QT3_PREFIX}/bin/${QMAKE} -v 2>&1)" - for a in $QMAKEVERSIONSTRING - do - if test "$(expr "$a" : '\(..\)')" = "3."; then - QMAKEBIN="${QT3_PREFIX}/bin/${QMAKE}" - QTEDITOR=musrgui - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - if test "x${QMAKEBIN}" != "x"; then - break - fi - fi - done - - if test "x${QMAKEBIN}" = "x"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([qmake for Qt3 cannot be found in ${QT3_PREFIX}/bin!]) - fi] - ) - - AC_ARG_WITH([qt4], - [AS_HELP_STRING([--with-qt4],[prefix of the Qt4 installation, e.g. /opt/qt-4.7])], - [QT4_PREFIX=$with_qt4 - AC_MSG_CHECKING([whether qmake for Qt4 can be found at the specified location]) - for QMAKE in qmake qmake-qt4 - do - if test -x "${QT4_PREFIX}/bin/${QMAKE}"; then - QMAKEVERSIONSTRING="$(${QT4_PREFIX}/bin/${QMAKE} -v 2>&1)" - for a in $QMAKEVERSIONSTRING - do - if test "$(expr "$a" : '\(..\)')" = "4."; then - QMAKEBIN="${QT4_PREFIX}/bin/${QMAKE}" - QTEDITOR=musredit - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - if test "x${QMAKEBIN}" != "x"; then - break - fi - fi - done - - if test "x${QMAKEBIN}" = "x"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([qmake for Qt4 cannot be found in ${QT4_PREFIX}/bin!]) - fi - - if test "x${QT3PRESENT}" = "xyes"; then - AC_MSG_WARN([Qt3 and Qt4 directories have been given -- only the Qt4 information will be used and only musredit will be built!]) - fi], - [if test "x${QMAKEBIN}" = "x"; then - PKG_CHECK_MODULES(QT4, QtWebKit >= $QT4MINVER QtXml >= $QT4MINVER, [QT4_FOUND=yes], - [AC_MSG_NOTICE([Qt4 (including QtWebKit and QtXml) not found!]) - PKG_CHECK_MODULES(QT3, qt >= 3.3.0 qt < 4.0, [QT3_FOUND=yes], - [PKG_CHECK_MODULES(QT3MT, qt-mt >= 3.3.0 qt-mt < 4.0, [QT3MT_FOUND=yes], [QT3MT_FOUND=no])] - )] - ) - fi] - ) - - AC_ARG_WITH([qt5], - [AS_HELP_STRING([--with-qt5],[prefix of the Qt5 installation, e.g. /usr/lib64/qt5/])], - [QT5_PREFIX=$with_qt5 - AC_MSG_CHECKING([whether qmake for Qt5 can be found at the specified location]) - for QMAKE in qmake qmake-qt5 - do - if test -x "${QT5_PREFIX}/bin/${QMAKE}"; then - QMAKEVERSIONSTRING="$(${QT5_PREFIX}/bin/${QMAKE} -v 2>&1)" - for a in $QMAKEVERSIONSTRING - do - if test "$(expr "$a" : '\(..\)')" = "5."; then - QMAKEBIN="${QT5_PREFIX}/bin/${QMAKE}" - QTEDITOR=musredit_qt5 - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - if test "x${QMAKEBIN}" != "x"; then - break - fi - fi - done - - if test "x${QMAKEBIN}" = "x"; then - AC_MSG_RESULT([no]) - AC_MSG_ERROR([qmake for Qt5 cannot be found in ${QT5_PREFIX}/bin!]) - fi - - if test "x${QT4PRESENT}" = "xyes"; then - AC_MSG_WARN([Qt4 and Qt5 directories have been given -- only the Qt5 information will be used and only musredit will be built!]) - fi], - [if test "x${QMAKEBIN}" = "x"; then - PKG_CHECK_MODULES(QT5, Qt5WebKit >= $QT5MINVER Qt5Xml >= $QT5MINVER, [QT5_FOUND=yes], - [AC_MSG_NOTICE([Qt5 (including Qt5WebKit and Qt5Xml) not found!]) - PKG_CHECK_MODULES(QT3, qt >= 3.3.0 qt < 4.0, [QT3_FOUND=yes], - [PKG_CHECK_MODULES(QT3MT, qt-mt >= 3.3.0 qt-mt < 4.0, [QT3MT_FOUND=yes], [QT3MT_FOUND=no])] - )] - ) - fi - if test "x${QT5_FOUND}" != "xyes"; then - PKG_CHECK_MODULES(QT5, Qt5WebEngine >= $QT5MINVER Qt5Xml >= $QT5MINVER, [QT5_FOUND=yes], - [AC_MSG_NOTICE([Qt5 (including Qt5WebEngine and Qt5Xml) not found!]) - PKG_CHECK_MODULES(QT3, qt >= 3.3.0 qt < 4.0, [QT3_FOUND=yes], - [PKG_CHECK_MODULES(QT3MT, qt-mt >= 3.3.0 qt-mt < 4.0, [QT3MT_FOUND=yes], [QT3MT_FOUND=no])] - )] - ) - fi] - ) - - if test "x${QMAKEBIN}" = "x"; then - if test "x${QT3_FOUND}" = "xno" && test "x${QT3MT_FOUND}" = "xno" && test "x${QT4_FOUND}" = "xno" && test "x${Qt5_FOUND}" = "xno"; then - AC_MSG_WARN([No suitable version of either Qt5, Qt4 or Qt3 has been found! musredit/musrgui will not be built in this stage!]) - else - # Check for qmake on the basis of the pkg-config information - QTPATH=none - - if test "x$QT5_FOUND" = "xyes"; then - QTPATH=$(pkg-config --variable=prefix Qt5WebKit) - QTEDITOR=musredit_qt5 - elif test "x$QT4_FOUND" = "xyes"; then - QTPATH=$(pkg-config --variable=prefix QtWebKit) - QTEDITOR=musredit - elif test "x$QT3_FOUND" = "xyes"; then - QTPATH=$(pkg-config --variable=prefix qt) - QTEDITOR=musrgui - elif test "x$QT3MT_FOUND" = "xyes"; then - QTPATH=$(pkg-config --variable=prefix qt-mt) - QTEDITOR=musrgui - fi - - dnl if Qt5 but Qt5WebEngine instead of Qt5WebKit - if test "x$QTPATH" = "x"; then - QTPATH=$(pkg-config --variable=prefix Qt5WebEngine) - QTEDITOR=musredit_qt5 - fi - - AC_MSG_CHECKING([for qmake]) - if test "x${QTPATH}" != "xnone"; then - if test "x$QTEDITOR" = "xmusredit_qt5"; then - for QMAKE in qmake-qt5 qmake-qt54 qmake-qt55 - do - if test -x "${QTPATH}/bin/${QMAKE}"; then - QMAKEBIN="${QTPATH}/bin/${QMAKE}" - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - if test "x${QMAKEBIN}" = "x"; then - if test -x "${QTPATH}/bin/qmake"; then - QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)" - for a in $QMAKEVERSIONSTRING - do - if test "$(expr "$a" : '\(..\)')" = "5."; then - QMAKEBIN="${QTPATH}/bin/qmake" - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - fi - fi - elif test "x$QTEDITOR" = "xmusredit"; then - for QMAKE in qmake-qt4 qmake-qt46 qmake-qt47 qmake-qt48 - do - if test -x "${QTPATH}/bin/${QMAKE}"; then - QMAKEBIN="${QTPATH}/bin/${QMAKE}" - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - if test "x${QMAKEBIN}" = "x"; then - if test -x "${QTPATH}/bin/qmake"; then - QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)" - for a in $QMAKEVERSIONSTRING - do - if test "$(expr "$a" : '\(..\)')" = "4."; then - QMAKEBIN="${QTPATH}/bin/qmake" - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - fi - fi - elif test "x$QTEDITOR" = "xmusrgui"; then - for QMAKE in qmake-qt3 qmake-qt33 - do - if test -x "${QTPATH}/bin/${QMAKE}"; then - QMAKEBIN="${QTPATH}/bin/${QMAKE}" - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - if test "x${QMAKEBIN}" = "x"; then - if test -x "${QTPATH}/bin/qmake"; then - QMAKEVERSIONSTRING="$(${QTPATH}/bin/qmake -v 2>&1)" - for a in $QMAKEVERSIONSTRING - do - if test "$(expr "$a" : '\(..\)')" = "3."; then - QMAKEBIN="${QTPATH}/bin/qmake" - AC_MSG_RESULT([${QMAKEBIN}]) - break - fi - done - fi - fi - fi - if test "x${QMAKEBIN}" = "x"; then - AC_MSG_RESULT([no]) - AC_MSG_WARN([If Qt5, Qt4 or Qt3 are present but have not been detected, try using the --with-qt5, --with-qt4 or --with-qt3 options!]) - fi - fi - fi - fi -fi - -AM_CONDITIONAL([BUILD_MUSREDIT_QT5], [test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit_qt5"]) -AM_CONDITIONAL([BUILD_MUSREDIT], [test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit"]) -AM_CONDITIONAL([BUILD_MUSRGUI], [test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusrgui"]) - -dnl ----------------------------------------------- -dnl Set host specific compiler and linker flags -dnl ----------------------------------------------- - -case "${host_cpu}" in - x86_64) - CPUFLAGS="-m64 -fPIC -DPIC" - ;; - *) - CPUFLAGS= - ;; -esac - -CXXFLAGS="-std=c++11 ${CXXFLAGS}" -AC_SUBST(CXXFLAGS) - -LOCAL_BIN_CXXFLAGS="${CPUFLAGS} -Wall -Wno-trigraphs" -LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}" -LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS}" -LOCAL_MUD_LIB_CFLAGS="${LOCAL_LIB_CXXFLAGS} ${USER_CFLAGS}" -LOCAL_PNEXUS_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS}" -LOCAL_CUBA_LIB_CFLAGS="${LOCAL_LIB_CXXFLAGS} ${CUBA_BUILD_CFLAGS}" -LOCAL_BIN_LDFLAGS= -LOCAL_LIB_LDFLAGS= - -case "$host" in - *-*-cygwin) - ARCH=CYGWIN - AC_DEFINE([_WIN32GCC], [1], [Define to 1 if host system is Cygwin]) - LOCAL_BIN_CXXFLAGS="${LOCAL_BIN_CXXFLAGS}" - LOCAL_LIB_CXXFLAGS="${LOCAL_BIN_CXXFLAGS} -D_DLL" - LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_WIN32GCC" - LOCAL_MUD_LIB_CFLAGS="${LOCAL_LIB_CXXFLAGS} ${USER_CFLAGS}" - LOCAL_PNEXUS_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS}" - LOCAL_CUBA_LIB_CFLAGS="${LOCAL_LIB_CXXFLAGS} ${CUBA_BUILD_CFLAGS}" - LOCAL_BIN_LDFLAGS="${LOCAL_BIN_LDFLAGS} -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc" - LOCAL_LIB_LDFLAGS="-no-undefined ${LOCAL_BIN_LDFLAGS} -Wl,--export-all-symbols" - ;; - *-*-darwin*) - ARCH=DARWIN - LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D_Darwin_" - LOCAL_BIN_LDFLAGS="${LOCAL_BIN_LDFLAGS} -Wl,-rpath ${ROOTLIBDIR}" - ;; - *) - ARCH=OTHERUNIX - LOCAL_PSIBIN_LIB_CXXFLAGS="${LOCAL_LIB_CXXFLAGS} -D__linux__" - ;; -esac - - -AC_SUBST(LOCAL_BIN_CXXFLAGS) -AC_SUBST(LOCAL_LIB_CXXFLAGS) -AC_SUBST(LOCAL_PSIBIN_LIB_CXXFLAGS) -AC_SUBST(LOCAL_MUD_LIB_CFLAGS) -AC_SUBST(LOCAL_PNEXUS_LIB_CXXFLAGS) -AC_SUBST(LOCAL_CUBA_LIB_CFLAGS) -AC_SUBST(LOCAL_BIN_LDFLAGS) -AC_SUBST(LOCAL_LIB_LDFLAGS) - - -dnl ----------------------------------------------- -dnl Some standard checks for header files and libraries -dnl Since these checks are not further used at the moment, they are commented -dnl ----------------------------------------------- - -# Checks for header files. -#AC_HEADER_STDC -#AC_CHECK_HEADERS([stddef.h stdlib.h string.h sys/time.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -#AC_HEADER_STDBOOL -#AC_C_CONST -#AC_C_INLINE -#AC_TYPE_SIZE_T -#AC_HEADER_TIME - -# Checks for library functions. -#AC_FUNC_MALLOC -#AC_FUNC_STAT -#AC_CHECK_FUNCS([floor gettimeofday memset pow sqrt strstr]) - -dnl ----------------------------------------------- -dnl Determine the installation directory for the documentation -dnl ----------------------------------------------- - -if test "x${prefix}" = "xNONE" -then - INSTALLDIR="/usr/local" -else - INSTALLDIR="${prefix}" -fi - -dnl only define DOCDIR if not already present. This allows -dnl to feed DOCDIR on the configure level which is useful when -dnl for instance building a rpm. DOCDIR2 is needed for rpmbuild only -if test "x${DOCDIR}" = "x" -then - if test -d "${INSTALLDIR}/doc" - then - DOCDIR="${INSTALLDIR}/doc/musrfit" - else - DOCDIR="${INSTALLDIR}/share/doc/musrfit" - fi -else - if test -d "${INSTALLDIR}/doc" - then - DOCDIR2="${INSTALLDIR}/doc/musrfit" - else - DOCDIR2="${INSTALLDIR}/share/doc/musrfit" - fi -fi - -AC_SUBST(DOCDIR) - -dnl ----------------------------------------------- -dnl Specify the files that are going to be created by configure -dnl ----------------------------------------------- - -AM_CONDITIONAL([IS_DARWIN], [test "${ARCH}" = "DARWIN"]) -AM_CONDITIONAL([IS_CYGWIN], [test "${ARCH}" = "CYGWIN"]) - -AM_CONDITIONAL([PNEXUS_ENABLED], [test "${PNEXUS_ENABLED}" = "1"]) -AM_CONDITIONAL([BUILD_CUBALIB], [test "${BUILD_CUBA}" = "1"]) -AM_CONDITIONAL([BUILD_BMWLIBS], [test "${BUILD_BMW_LIBS}" = "1"]) -AM_CONDITIONAL([BUILD_ASLIBS], [test "${BUILD_AS_LIBS}" = "1"]) -AM_CONDITIONAL([BUILD_BNMRLIBS], [test "${BUILD_BNMR_LIBS}" = "1"]) - -AC_CONFIG_FILES([Makefile \ - src/Makefile \ - src/classes/Makefile \ - src/classes/PMusr.pc \ - src/classes/PUserFcnBase.pc \ - src/external/Makefile \ - src/external/MusrRoot/Makefile \ - src/external/MusrRoot/TMusrRunHeader.pc \ - src/external/TLemRunHeader/Makefile \ - src/external/TLemRunHeader/TLemRunHeader.pc \ - src/external/MuSR_software/Makefile \ - src/external/MuSR_software/Class_MuSR_PSI/Makefile \ - src/external/MuSR_software/Class_MuSR_PSI/Class_MuSR_PSI.pc \ - src/external/mud/Makefile \ - src/external/mud/src/Makefile \ - src/external/mud/src/mud.pc \ - src/external/nexus/Makefile \ - src/external/nexus/PNeXus.pc \ - src/external/libCuba/Makefile \ - src/external/libCuba/src/Makefile \ - src/external/libCuba/src/cuba.pc \ - src/external/libCuba/src/cuhre/Makefile \ - src/external/libCuba/src/divonne/Makefile \ - src/external/libCuba/src/suave/Makefile \ - src/external/libCuba/src/vegas/Makefile \ - src/external/libCuba/src/common/Makefile \ - src/external/BMWtools/Makefile \ - src/external/libFitPofB/Makefile \ - src/external/libFitPofB/classes/Makefile \ - src/external/libLFRelaxation/Makefile \ - src/external/libZFRelaxation/Makefile \ - src/external/libGapIntegrals/Makefile \ - src/external/libCalcMeanFieldsLEM/Makefile \ - src/external/Nonlocal/Makefile \ - src/external/MagProximity/Makefile \ - src/external/libSpinValve/Makefile \ - src/external/libSpinValve/classes/Makefile \ - src/external/libPhotoMeissner/Makefile \ - src/external/libPhotoMeissner/classes/Makefile \ - src/external/libGbGLF/Makefile \ - src/external/libBNMR/Makefile \ - src/external/libBNMR/libLineProfile/Makefile \ - src/musredit_qt5/Makefile \ - src/musredit/Makefile \ - src/musrgui/Makefile \ - src/musrgui/musrgui_startup.xml]) - -AC_OUTPUT - -if test "x$enable_editor" != "xno" && test "x$QMAKEBIN" != "x"; then - - echo "Configuring ${QTEDITOR} ..." - - if test "x${QTEDITOR}" = "xmusredit_qt5"; then - QTEDITOR_PRO="musredit" - else - QTEDITOR_PRO=${QTEDITOR} - fi - - echo "Changing directory to src/${QTEDITOR} and calling" - echo "${QMAKEBIN} CC=${CC} CXX=${CXX} PREFIX=${INSTALLDIR} ${QTEDITOR_PRO}.pro" - cd src/${QTEDITOR} - ${QMAKEBIN} CC=${CC} CXX=${CXX} PREFIX=${INSTALLDIR} ${QTEDITOR_PRO}.pro - cd ../.. - -fi - -echo "" -echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" -echo "+ +" -echo "+ Summary +" -echo "+ +" -echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" -echo "" - -echo " System:" -echo " -------" -echo "" -echo " $host" -echo "" -echo "" -echo " Requirements:" -echo " -------------" -echo "" -if test "${FFTW3_FOUND}" = "1"; then - echo " FFTW3 found in $(pkg-config --variable=prefix fftw3)" -else - echo " FFTW3 found in ${FFTW3_PREFIX}" -fi -if test "${GSL_FOUND}" = "1"; then - echo " GSL found in $(pkg-config --variable=prefix gsl)" -else - echo " GSL found in ${GSL_PREFIX}" -fi -if test "${BOOST_FOUND}" = "1"; then - echo " BOOST header files found in $(pkg-config --variable=prefix boost)" -else - echo " BOOST header files found in ${BOOST_INCLUDE}" -fi -if test "${LIBXML2_FOUND}" = "1"; then - echo " LIBXML2 found in $(pkg-config --variable=prefix libxml2)" -else - echo " LIBXML2 found in ${LIBXML2_PREFIX}" -fi -echo " ROOT found in ${ROOTLIBDIR%/lib}" -echo "" -if test "${PNEXUS_ENABLED}" -eq 1; then - echo " HDF4 found in ${HDF4_PREFIX}" - echo " HDF5 found in ${HDF5_PREFIX}" - if test "${NEXUS_FOUND}" = "1"; then - echo " NeXus found in $(pkg-config --variable=prefix nexus)" - else - echo " NeXus found in ${NEXUS_PREFIX}" - fi -else - echo " HDF4 not needed (NeXus support disabled)" - echo " HDF5 not needed (NeXus support disabled)" - echo " NeXus not needed (NeXus support disabled)" -fi -echo "" -if test "${BUILD_CUBA}" = "1"; then - echo " CUBA will be built" -elif test "${BUILD_CUBA}" != "1" && test "${BUILD_BMW_LIBS}" -eq 1; then - if test "${CUBA_FOUND}" = "1"; then - echo " CUBA found in $(pkg-config --variable=prefix cuba)" - else - echo " CUBA found in ${CUBA_PREFIX}" - fi -else - echo " CUBA not needed (BMWlibs disabled)" -fi -echo "" -if test "${enable_editor}" != "xno"; then - if test "x${QMAKEBIN}" != "x"; then - echo " Qt qmake found at ${QMAKEBIN}" - else - echo " Qt qmake not found" - fi -else - echo " Qt not needed (Qt editors disabled)" -fi -echo "" -echo "" -echo " Features:" -echo " ---------" -echo "" -echo " musrfit (including musrfit, musrview, musrt0," -echo " msr2msr, msr2data, any2many, dump_header," -echo " musrRootValidation, write_musrRoot_runHeader): yes" -echo "" -echo " Supported muSR file formats:" -echo " MusrRoot: yes" -echo " ROOT (LEM): yes" -echo " MUD: yes" -echo " PSI-BIN: yes" -echo " PSI-MDU: yes" -echo " WKM: yes" -if test "${PNEXUS_ENABLED}" -eq 1; then - echo " NeXus: yes" -else - echo " NeXus: no" -fi -echo "" -echo " External user-function libraries:" -if test "${BUILD_AS_LIBS}" -eq 1; then - echo " ASlibs: yes" -else - echo " ASlibs: no" -fi -if test "${BUILD_BNMR_LIBS}" -eq 1; then - echo " BNMRlibs: yes" -else - echo " BNMRlibs: no" -fi -if test "${BUILD_BMW_LIBS}" -eq 1; then - echo " BMWlibs: yes" -else - echo " BMWlibs: no" -fi -echo "" -echo " Qt musrfit editors:" -if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit_qt5"; then - echo " musredit (Qt5): yes" -else - echo " musredit (Qt5): no" -fi -if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit"; then - echo " musredit (Qt4): yes" -else - echo " musredit (Qt4): no" -fi -if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusrgui"; then - echo " musrgui (Qt3): yes" -else - echo " musrgui (Qt3): no" -fi -echo "" -echo "" -echo " Installation directories:" -echo " -------------------------" -echo "" -echo " Programs: ${INSTALLDIR}/bin" -echo " XML configuration files: ${HOME}/.musrfit" -echo " Documentation: ${DOCDIR}" -echo "" - -dnl -------------- -dnl create header file that musredit knows at runtime where to find the documentation -dnl the DOCDIR2 tag is used for rpmbuild only -dnl -------------- -if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit_qt5"; then - echo \#define MUSRFIT_PREFIX \"${INSTALLDIR}\" > src/musredit_qt5/musrfit-info.h - if test "x$DOCDIR2" = "x"; then - echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit_qt5/musrfit-info.h - else - echo \#define MUSRFIT_DOC_DIR \"${DOCDIR2}\" >> src/musredit_qt5/musrfit-info.h - fi -fi -if test "x$enable_editor" != "xno" && test "x${QMAKEBIN}" != "x" && test "x${QTEDITOR}" = "xmusredit"; then - echo \#define MUSRFIT_PREFIX \"${INSTALLDIR}\" > src/musredit/musrfit-info.h - if test "x$DOCDIR2" = "x"; then - echo \#define MUSRFIT_DOC_DIR \"${DOCDIR}\" >> src/musredit/musrfit-info.h - else - echo \#define MUSRFIT_DOC_DIR \"${DOCDIR2}\" >> src/musredit/musrfit-info.h - fi -fi diff --git a/doc/html/.buildinfo b/doc/html/.buildinfo index a4002c7c..a71db440 100644 --- a/doc/html/.buildinfo +++ b/doc/html/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 5c197f7d1a99bc4d9f1831306e12cc04 +config: 39df8dc76b5eba2fef9a1560a07e9143 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/doc/html/_sources/setup-dks.txt b/doc/html/_sources/setup-dks.txt index 70d9effd..0ea9328b 100644 --- a/doc/html/_sources/setup-dks.txt +++ b/doc/html/_sources/setup-dks.txt @@ -149,46 +149,6 @@ switch the working branch which is done by $ cd $HOME/Apps/musrfit $ git checkout dks6 -Install via automake -^^^^^^^^^^^^^^^^^^^^ - -.. note:: - - Currently ``automake`` is still supported but soon will be replaced by ``cmake``. Only follow - the ``automake`` procedure if you have good reasons. - -The configure script for musrfit has now a couple of more tags/options, which are: - -**- -enable-dks** - by default this is set to no, hence if you want to have GPU support you need to enable it. -**- -with-cuda** - with this tag you tell the configure script where it can find ``CUDA`` -**- -with-opencl** - with this tag you tell the configure script where it can find ``OpenCL`` -**- -with-dks** - with this tag you tell the configure script where it can find ``DKS`` - -For a typical setup on a RHEL system it could look like this - -.. code-block:: bash - - $ ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks=$HOME/Apps/DKS/exec --enable-dks --prefix=$ROOTSYS - -After - -.. code-block:: bash - - $ make - $ make install - -and updating the shared library lookup table (*only* needed for Linux) - -.. code-block:: bash - - $ /sbin/ldconfig # as superuser / root - -you are done with the setup. - Install via cmake ^^^^^^^^^^^^^^^^^ @@ -201,7 +161,7 @@ For a typical setup on a RHEL or macOS system it could look like this .. code-block:: bash - $ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -DASlibs=1 -DBMWlibs=1 -Dnexus=1 + $ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -DASlibs=1 -DBMWlibs=1 -Dnexus=1 -Ddks=1 After diff --git a/doc/html/_sources/setup-standard.txt b/doc/html/_sources/setup-standard.txt index c2592605..a8dfab99 100644 --- a/doc/html/_sources/setup-standard.txt +++ b/doc/html/_sources/setup-standard.txt @@ -23,11 +23,9 @@ it can also be set up under **MS Windows** (cygwin, only for the *very brave*, p In case musrfit should be installed according to the description found on this page, the user is strongly encouraged to *read completely* each section dealing with the present installation step *before* starting the installation process! -Apart from `GCC, the GNU Compiler Collection `_ (``gcc``, ``g++``), the GNU build tools `autoconf `_, -`automake `_, and `libtool `_ are needed, if you want to build musrfit via the automake toolchain. -The ``automake`` toolchain will eventually be droped in upcoming releases. -If you plan to use the cmake toolchain (preferred way), `cmake `_. Furthermore the helper tool `pkg-config `_ is -needed and musrfit requires the installation of a few open-source libraries and programs including their header packages: +Apart from `GCC, the GNU Compiler Collection `_ (``gcc``, ``g++``), the build tool `cmake `_ is needed. Furthermore the helper +tool `pkg-config `_ needs to be in place, and musrfit requires the installation of a few open-source libraries and programs including +their header packages: .. index:: boost-c++ @@ -94,14 +92,15 @@ Before the installation procedure will be described, please note the following r **GNU/Linux** No serious problems are currently known. Tested distributions: `RHEL `_, `Fedora `_, - `Debian `_, `Ubuntu `_, `Mint `_, `openSUSE `_. + `Debian `_, `Ubuntu `_, `Mint `_, `openSUSE `_, + `manjaro `_, and `antergos `_. **Mac OS X/macOS** No serious problems are currently known for macOS ≥ 10.6. **MS Windows** Native *MS Windows* support is currently not available. Potential ways to get ``musrfit`` running are: * via installation of Linux via the Microsoft App store for Windows 10. - * via installation of the virtual machine on which you install Linux. + * via installation of the virtual machine on which you install Linux (probably the easiest for most Windows users). * via `cygwin`_. .. _cygwin: https://www.cygwin.com/ @@ -173,9 +172,18 @@ Installation of NeXus requirements (optional) *Only* if ``musrfit`` should support reading/writing data files in the ``NeXus`` format the further required software has to be set up. The required libraries and header files could either be available through the user's -GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. *E.g.* on -Red Hat-like systems binary packages for ``MXML``, ``HDF4``, and ``HDF5`` might be called ``mxml``, ``mxml-devel``, -``hdf``, ``hdf-devel``, ``hdf5``, ``hdf5-devel``, on Debian-like systems ``libmxml1``, ``libmxml-dev``, ``libhdf4-dev``, ``libhdf5-dev``. +GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. The necessary +packages to build ``NeXus`` are ``MXML``, (``HDF4``), and ``HDF5``. This means, for a rpm-package based distro try something like: + + .. code-block:: bash + + $ yum install mxml-devel hdf-devel hdf5-devel + +and on a deb-package based distro try something like: + + .. code-block:: bash + + $ apt-get install libmxml-dev libhdf4-dev libhdf5-dev .. note:: @@ -213,10 +221,8 @@ A brief instruction how to get ``NeXus`` compiled from source (lines starting wi ROOT ^^^^ -ROOT 5.34/xx is supported as legacy version *only*! **The default now will be ROOT 6.xx/yy!** - The ROOT framework may or may not be part of the GNU/Linux distribution. Some distributions are packing ROOT in a -manner incompatible with the way it is needed for ``musrfit``, though the situation is improving. If you are +manner incompatible with the way it is needed by ``musrfit``, though the situation is improving. If you are experienced enough you can try the packed ROOT version. Often ROOT is split in many sub-packages. Install the necessary ones (guess from the description below). **One Warning:** if the ROOT packages are upgraded after a yum update (apt-get update; apt-get upgrade) you might need to recompile ``musrfit``. *If you are not sure about @@ -247,12 +253,12 @@ be added starting with a '#' which can be omitted. They are only there to explai $ # creat the Apps directory if not already present $ mkdir Apps $ cd Apps - $ git clone http://root.cern.ch/git/root.git + $ git clone http://github.com/root-project/root.git $ cd root $ git tag -l - $ # git tag -l will list all available tags. In the next command choose the tag v6-14-00 + $ # git tag -l will list all available tags. In the next command choose the tag v6-16-00 $ # or the latest official release number - $ git checkout -b v6-14-00 v6-14-00 + $ git checkout -b v6-16-00 v6-16-00 $ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed. $ # since we are using cmake build now, first we will need to create the build directory. $ mkdir root_build @@ -299,7 +305,7 @@ If an update of ROOT is needed, simple do the following: musrfit +++++++ -When all required software has been set up with the ``musrfit`` installation can be proceeded. First, the most +When all required software has been set up you can proceed with the ``musrfit`` installatio. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the ``musrfit`` repository via git. Assuming the code should be located in ``$HOME/Apps`` this is achieved most easily calling from the terminal @@ -307,8 +313,7 @@ Assuming the code should be located in ``$HOME/Apps`` this is achieved most easi $ cd $HOME/Apps $ git clone https://bitbucket.org/muonspin/musrfit.git - $ # Only if legacy ROOT 5.xx.yy is used include the next line - $ cd musrfit; git checkout root5 + $ cd musrfit or @@ -316,8 +321,7 @@ or $ cd $HOME/Apps $ git clone git://gitlab.psi.ch/nemu/musrfit.git - $ # Only if legacy ROOT 5.xx.yy is used include the next line - $ cd musrfit; git checkout root5 + $ cd musrfit .. note:: @@ -331,24 +335,6 @@ or $ cd $HOME/Apps/musrfit $ git pull - -Now, depending whether you follow the ``automake`` or ``cmake`` tool chain you do - -**automake toolchain:** - -.. code-block:: bash - - $ make uninstall - $ make clean - $ make - $ make install - -or - -**cmake toolchain:** - -.. code-block:: bash - $ cd build $ xargs rm < install_manifest.txt $ cmake --build ./ --clean-first @@ -358,61 +344,6 @@ or As an alternative (if git is not available), the source code can also be downloaded from the following web-page: `musrfit at bitbucket`_ -.. index:: musrfit-build-automake-linux - -musrfit build with automake -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -After the source-code extraction the ``autogen.sh`` script is called to prepare the build environment. -If it has been executed successfully the ``configure`` script should be ready to collect all the information needed -to create the Makefiles. If ``musrfit`` should support ``NeXus`` data files this has to be enabled by specifying the -``--enable-NeXus`` switch when calling configure. For an overview of all available options just call ``./configure --help``. -Besides the standard options there are a few special options which should be mentioned here: - -**- -prefix** - Specify the installation prefix, *e.g.* ``$ROOTSYS`` if already defined (by default: ``/usr/local``). -**- -with-rootsys** - Specify the top of the ``ROOT`` installation directory, *e.g.* ``$ROOTSYS`` if already defined. -**- -with-fftw3** - Specify the prefix of the ``FFTW3`` installation. *e.g.* ``/usr/local`` or ``/usr``. -**- -with-gsl** - Set the prefix of the ``GSL`` installation, *e.g.* ``/usr/local`` or ``/usr``. -**- -with-boostinc** - Set the path to the header files of the ``Boost`` installation, *e.g.* ``/usr/local/include`` or ``/usr/include``. -**- -with-hdf4** - Set the prefix of the ``HDF4`` installation, *e.g.* ``/usr/local`` (only useful in conjunction with the ``NeXus`` support). -**- -with-hdf5** - Set the prefix of the ``HDF5`` installation, *e.g.* ``/usr`` (only useful in conjunction with the ``NeXus`` support). -**- -with-nexus** - Set the prefix of the ``NeXus`` installation, *e.g.* ``/usr/local`` (only useful in conjunction with the ``NeXus`` support). -**- -with-qt3** - Set the prefix of the ``Qt3`` installation, *e.g.* ``/usr/lib/qt-3.3`` (only useful in conjunction with building ``musrgui``). -**- -with-qt4** - Set the prefix of the ``Qt4`` installation, *e.g.* ``/usr/lib/qt47`` (only useful in conjunction with building ``musredit``). -**- -with-qt5** - Set the prefix of the ``Qt5`` installation, *e.g.* ``/usr/lib64`` (only useful in conjunction with building ``musredit``). -**- -enable-NeXus** - Enable the support of ``NeXus`` data files (requires the ``HDF4``, ``HDF5`` and ``NeXus`` libraries to be installed). -**- -disable-editor** - Disable the integrated building of ``musredit``/``musrgui``. -**- -disable-omp** - Switches off the `OpenMP `_ features of ``musrfit`` (parallelization of the :math:`\chi^2` calculation when compiled with GCC ≥ 4.2). - -Normally it should not be necessary to make use of any of the options except for specifying the installation path with ``--prefix``. The -other paths should be detected automatically. If this does not work for some reason the configure script will terminate and ask for the -information. When the configure script has been called successfully everything is ready for building the ``musrfit`` libraries and executables. -A standard installation sequence (without ``NeXus`` support) might then look like (In case the normal user has no write permissions to the -``$ROOTSYS`` and the installation path the "make install" commands have to be executed as superuser.): - -.. code-block:: bash - - $ cd $HOME/Apps/musrfit - $ sh autogen.sh - $ ./configure --prefix=$ROOTSYS - $ make - $ make install - $ /sbin/ldconfig # (as superuser) - .. index:: musrfit-build-cmake-linux musrfit build with cmake @@ -484,8 +415,7 @@ musredit ++++++++ In the latest version of ``musrfit`` the configure script tries to determine automatically the highest available ``Qt`` version. -In case this is found, the editor ``musredit`` is built already together with ``musrfit``. If not, one can try to call -the configure script with the **- -with-qt5** option (``automake``). ``cmake`` will determine everthing automatically. +In case this is found, the editor ``musredit`` is built already together with ``musrfit``. To install this editor separately, *i.e.* by "hand" do .. code-block:: bash @@ -739,61 +669,7 @@ If the repository had been checked out already before, one can update the local As an alternative (if git is not available), the source code can also be downloaded from the following web-page: `musrfit at bitbucket`_. - -.. index:: musrfit-build-automake-windows - -musrfit build with automake -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -After the source-code extraction the ``autogen.sh`` script is called to prepare the build environment. -If it has been executed successfully the ``configure`` script should be ready to collect all the information -needed to create the Makefiles. If ``musrfit`` should support ``NeXus`` data files this has to be enabled by -specifying the ``--enable-static --enable-NeXus`` switches when calling configure. For an overview of all -available options just call ``./configure --help``. Besides the standard options there are a few special -options which should be mentioned here: - -**- -prefix** - Specify the installation prefix, *e.g.* ``/opt/root-system`` (by default: ``/usr/local``) -**- -with-rootsys** - Specify the top of the ``ROOT`` installation directory, *e.g.* ``/opt/root-system`` -**- -with-fftw3** - Specify the prefix of the ``FFTW3`` installation. *e.g.* ``/usr/local`` or ``/usr`` -**- -with-gsl** - Set the prefix of the ``GSL`` installation, *e.g.* ``/usr/local`` or ``/usr`` -**- -with-boostinc** - Set the path to the header files of the ``Boost`` installation, *e.g.* ``/usr/local/include`` or ``/usr/include`` -**- -with-hdf4** - Set the prefix of the ``HDF4`` installation, *e.g.* ``/usr/local`` (only useful in conjunction with the ``NeXus`` support) -**- -with-hdf5** - Set the prefix of the ``HDF5`` installation, *e.g.* ``/usr`` (only useful in conjunction with the ``NeXus`` support) -**- -with-nexus** - Set the prefix of the ``NeXus`` installation, *e.g.* ``/usr/local`` (only useful in conjunction with the ``NeXus`` support) -**- -with-qt3** - Set the prefix of the ``Qt3`` installation, *e.g.* ``/usr/lib/qt-3.3`` (only useful in conjunction with building ``musrgui``) -**- -with-qt4** - Set the prefix of the ``Qt4`` installation, *e.g.* ``/usr/lib/qt47`` (only useful in conjunction with building ``musredit``) -**- -with-qt5** - Set the prefix of the ``Qt5`` installation, *e.g.* ``/usr/lib/qt56`` (only useful in conjunction with building ``musredit``) -**- -enable-NeXus** - Enable the support of ``NeXus`` data files (requires the ``HDF4``, ``HDF5`` and ``NeXus`` libraries to be installed). -**- -disable-editor** - Disable the integrated building of ``musredit``/``musrgui``. -**- -disable-omp** - Switches off the ``OpenMP`` features of ``musrfit`` (parallelization of the :math:`\chi^2` calculation when compiled with ``GCC`` ≥ 4.2) - -Normally it should not be necessary to make use of any of the options except for specifying the installation path with ``--prefix``. -The other paths should be detected automatically. If this does not work for some reason the ``configure`` script will terminate and -ask for the information. When the ``configure`` script has been called successfully everything is ready for building the ``musrfit`` -libraries and executables. A standard installation sequence (without ``NeXus`` support) might then look like: - -.. code-block:: bash - - $ cd musrfit - $ sh autogen.sh - $ ./configure --prefix=$ROOTSYS - $ make - $ make install - + .. index:: musrfit-build-cmake-windows musrfit build with cmake @@ -847,8 +723,7 @@ musredit In the latest version of ``musrfit`` the configure script tries to determine automatically if Qt4.5 or higher is set up on the machine. In case this is found, the editor ``musredit`` is built -readily with ``musrfit``. If not, one can either try to call the ``configure`` script with the -``--with-qt4`` option or install this editor separately, *.e.g.*: +readily with ``musrfit``. If not, try the following: .. code-block:: bash @@ -945,7 +820,7 @@ with OS X (on the installation DVD/CDs) should be installed: **X11** The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also - will need to install `XQuartz `. If ``ROOT`` runs without ``XQuartz`` *do not* + will need to install `XQuartz `_. If ``ROOT`` runs without ``XQuartz`` *do not* install it. After installing the ``Xcode`` tools go to the `MacPorts install page `_, download @@ -1034,7 +909,7 @@ Only ``NeXus`` Version ≥ 4.4 is support!) this can be achieved for example by: ROOT ^^^^ -ROOT 5.34/xx is supported as legacy version only! **The default now will be ROOT 6.xx/yy!** +**The default ROOT version is based on ROOT 6.xx/yy!** ROOT installed via package installer """""""""""""""""""""""""""""""""""" @@ -1042,16 +917,16 @@ ROOT installed via package installer The lazy way to get ``ROOT`` installed is via package installer. If your macOS is directly supported by the ``ROOT`` people you can download the package installer from the ``ROOT`` `download page `_. Choose the latest ``ROOT`` release and download you macOS version dmg-file, *e.g.* for macOS 10.13 (High Sierra) -it is at the time of writting ``root_v6.14.00.macosx64-10.13-clang91.dmg``. After the installation +it is at the time of writting ``root_v6.16.00.macosx64-10.13-clang91.dmg``. After the installation ``ROOT`` will be installed under ``/Application`` as owner root. In order to ease your life for the steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the ``ROOT`` directory: .. code-block:: bash $ cd /Applications - $ sudo chown -R root_v6.14.00 - $ sudo chgrp -R staff root_v6.14.00 - $ sudo ln -s root_v6.14.00 root + $ sudo chown -R root_v6.16.00 + $ sudo chgrp -R staff root_v6.16.00 + $ sudo ln -s root_v6.16.00 root ROOT installed from source """""""""""""""""""""""""" @@ -1068,12 +943,12 @@ comments will be added starting with a '#' which can be omitted. They are only t .. code-block:: bash $ cd $HOME/Applications - $ git clone http://root.cern.ch/git/root.git + $ git clone http://github.com/root-project/root.git $ cd root $ git tag -l $ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx - $ # where xx is the highest listed number, e.g. v6-14-00 - $ git checkout -b v6-14-00 v6-14-00 + $ # where xx is the highest listed number, e.g. v6-16-00 + $ git checkout -b v6-16-00 v6-16-00 $ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed. $ # We will use the cmake out-of-source approach here. $ mkdir root_build @@ -1158,7 +1033,7 @@ Before proceeding with the usage of the `Fink`_ system first a few useful tools **X11** The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also - will need to install `XQuartz `. If ``ROOT`` runs without ``XQuartz`` *do not* + will need to install `XQuartz `_. If ``ROOT`` runs without ``XQuartz`` *do not* install it. After installing the ``Xcode`` tools go to the `Fink download page `_, @@ -1256,7 +1131,7 @@ this can be achieved for example by: ROOT ^^^^ -ROOT 5.34/xx is supported as legacy version only and will likely to be dropped in 2018. **The default now is ROOT 6.xx/yy!** +**The default ROOT version is based on ROOT 6.xx/yy!** ROOT installed via package installer """""""""""""""""""""""""""""""""""" @@ -1264,16 +1139,16 @@ ROOT installed via package installer The lazy way to get ``ROOT`` installed is via package installer. If your macOS is directly supported by the ``ROOT`` people you can download the package installer from the ``ROOT`` `download page `_. Choose the latest ``ROOT`` release and download you macOS version dmg-file, *e.g.* for macOS 10.13 (High Sierra) -it is at the time of writting ``root_v6.14.00.macosx64-10.13-clang91.dmg``. After the installation +it is at the time of writting ``root_v6.16.00.macosx64-10.13-clang91.dmg``. After the installation ``ROOT`` will be installed under ``/Application`` as owner root. In order to ease your life for the steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the ``ROOT`` directory: .. code-block:: bash $ cd /Applications - $ sudo chown -R root_v6.14.00 - $ sudo chgrp -R staff root_v6.14.00 - $ sudo ln -s root_v6.14.00 root + $ sudo chown -R root_v6.16.00 + $ sudo chgrp -R staff root_v6.16.00 + $ sudo ln -s root_v6.16.00 root ROOT installed from source """""""""""""""""""""""""" @@ -1290,12 +1165,12 @@ comments will be added starting with a '#' which can be omitted. They are only t .. code-block:: bash $ cd $HOME/Applications - $ git clone http://root.cern.ch/git/root.git + $ git clone http://github.com/root-project/root.git $ cd root $ git tag -l $ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx - $ # where xx is the highest listed number, e.g. v6-14-00 - $ git checkout -b v6-14-00 v6-14-00 + $ # where xx is the highest listed number, e.g. v6-16-00 + $ git checkout -b v6-16-00 v6-16-00 $ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed. $ # We will use the cmake out-of-source approach here. $ mkdir root_build @@ -1374,8 +1249,7 @@ in ``~/Applications/musrfit`` this is achieved most easily calling from the term $ cd ~/Applications $ git clone https://bitbucket.org/muonspin/musrfit.git - $ # Only if legacy ROOT 5.xx.yy is used include the next line - $ cd musrfit; git checkout root5 + $ cd musrfit or @@ -1383,8 +1257,7 @@ or $ cd ~/Applications $ git clone git://gitlab.psi.ch/nemu/musrfit.git - $ # Only if legacy ROOT 5.xx.yy is used include the next line - $ cd musrfit; git checkout root5 + $ cd musrfit If a local repository clone is already present, one can update it using: @@ -1395,63 +1268,7 @@ If a local repository clone is already present, one can update it using: As an alternative (*if git is not available*), the source code can also be downloaded from the following web-page: `musrfit at bitbucket`_. - -.. index:: musrfit-build-automake-macos - -musrfit build with automake -^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -After the source-code extraction the ``autogen.sh`` script is called to prepare the build environment. -If it has been executed successfully the ``configure`` script should be ready to collect all the information needed -to create the Makefiles. If ``musrfit`` should support ``NeXus`` data files this has to be enabled by specifying the -``--enable-NeXus`` switch when calling configure. For an overview of all available options just call ``./configure --help``. -Besides the standard options there are a few special options which should be mentioned here: - -**- -prefix** - Specify the installation prefix, *e.g.* ``$ROOTSYS`` if already defined (by default: ``/usr/local``). -**- -with-rootsys** - Specify the top of the ``ROOT`` installation directory, *e.g.* ``$ROOTSYS`` if already defined. -**- -with-fftw3** - Specify the prefix of the ``FFTW3`` installation. *e.g.* ``/usr/local`` or ``/usr``. -**- -with-gsl** - Set the prefix of the ``GSL`` installation, *e.g.* ``/usr/local`` or ``/usr``. -**- -with-boostinc** - Set the path to the header files of the ``Boost`` installation, *e.g.* ``/usr/local/include`` or ``/usr/include``. -**- -with-hdf4** - Set the prefix of the ``HDF4`` installation, *e.g.* ``/usr/local`` (only useful in conjunction with the ``NeXus`` support). -**- -with-hdf5** - Set the prefix of the ``HDF5`` installation, *e.g.* ``/usr`` (only useful in conjunction with the ``NeXus`` support). -**- -with-nexus** - Set the prefix of the ``NeXus`` installation, *e.g.* ``/usr/local`` (only useful in conjunction with the ``NeXus`` support). -**- -with-qt3** - Set the prefix of the ``Qt3`` installation, *e.g.* ``/usr/lib/qt-3.3`` (only useful in conjunction with building ``musrgui``). -**- -with-qt4** - Set the prefix of the ``Qt4`` installation, *e.g.* ``/usr/lib/qt47`` (only useful in conjunction with building ``musredit``). -**- -with-qt5** - Set the prefix of the ``Qt5`` installation, *e.g.* ``/usr/lib64`` (only useful in conjunction with building ``musredit``). -**- -enable-NeXus** - Enable the support of ``NeXus`` data files (requires the ``HDF4``, ``HDF5`` and ``NeXus`` libraries to be installed). -**- -disable-editor** - Disable the integrated building of ``musredit``/``musrgui``. -**- -disable-omp** - Switches off the `OpenMP `_ features of ``musrfit`` (parallelization of the :math:`\chi^2` calculation when compiled with GCC ≥ 4.2). - -Normally it should not be necessary to make use of any of the options except for specifying the installation path with ``--prefix``. The -other paths should be detected automatically. If this does not work for some reason the configure script will terminate and ask for the -information. When the configure script has been called successfully everything is ready for building the ``musrfit`` libraries and executables. -A standard installation sequence (without ``NeXus`` support) might then look like (In case the normal user has no write permissions to the -``$ROOTSYS`` and the installation path the "make install" commands have to be executed as superuser.): - -.. code-block:: bash - - $ cd $HOME/Apps/musrfit - $ sh autogen.sh - $ ./configure --prefix=$ROOTSYS - $ make - $ make install - $ /sbin/ldconfig # (as superuser) - - + .. index:: musrfit-build-cmake-macos musrfit build with cmake @@ -1521,8 +1338,7 @@ musredit In the latest version of ``musrfit`` the configure script tries to determine automatically the highest available Qt version. In case this is found, the editor ``musredit`` is built already together with ``musrfit``. -If not, one can try to call the configure script with the **--with-qt5** option (``automake``). ``cmake`` will -determine everthing automatically. To install this editor separately, *i.e.* by “hand” do +If not, try the following: .. code-block:: bash diff --git a/doc/html/acknowledgement.html b/doc/html/acknowledgement.html index 7ec06c40..d9bc68bb 100644 --- a/doc/html/acknowledgement.html +++ b/doc/html/acknowledgement.html @@ -6,7 +6,7 @@ - Acknowledgements — musrfit 1.4.1 documentation + Acknowledgements — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -108,12 +108,12 @@ extremely competent way to deal with his projects as well as to deal with the ch
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/any2many.html b/doc/html/any2many.html index 06d11a23..52765d73 100644 --- a/doc/html/any2many.html +++ b/doc/html/any2many.html @@ -6,7 +6,7 @@ - any2many - a Universal μSR-file-format converter — musrfit 1.4.1 documentation + any2many - a Universal μSR-file-format converter — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -102,12 +102,12 @@ For a detailed description see previous | -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/bugtracking.html b/doc/html/bugtracking.html index 82e9d3e8..8b71f07b 100644 --- a/doc/html/bugtracking.html +++ b/doc/html/bugtracking.html @@ -6,7 +6,7 @@ - Bugtracking — musrfit 1.4.1 documentation + Bugtracking — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -93,12 +93,12 @@ or send an e-mail to A. Suter at PSI.

  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/cite.html b/doc/html/cite.html index b07149b4..a49452a7 100644 --- a/doc/html/cite.html +++ b/doc/html/cite.html @@ -6,7 +6,7 @@ - How to Cite musrfit? — musrfit 1.4.1 documentation + How to Cite musrfit? — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -114,12 +114,12 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/genindex.html b/doc/html/genindex.html index 64483ab4..852f51ca 100644 --- a/doc/html/genindex.html +++ b/doc/html/genindex.html @@ -7,7 +7,7 @@ - Index — musrfit 1.4.1 documentation + Index — musrfit 1.4.2 documentation @@ -15,7 +15,7 @@ - +
    @@ -34,7 +34,7 @@
  • index
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -179,7 +179,7 @@
    -
    cygwin +
    cygwin
    @@ -243,7 +243,7 @@ -
    fink +
    fink
    @@ -407,7 +407,7 @@ + -
    -
    macports +
    macports
    @@ -542,6 +542,8 @@
    mupp-scripting
    +
    mupp-usage
    @@ -550,10 +552,8 @@
    musredit
    -
    -
    musredit-build-macos +
    musredit-build-macos
    @@ -561,11 +561,11 @@ -
    musredit-install-linux +
    musredit-install-linux
    -
    musredit-install-windows +
    musredit-install-windows
    @@ -577,27 +577,15 @@ -
    musrfit-build-automake-linux +
    musrfit-build-cmake-linux
    -
    musrfit-build-automake-macos +
    musrfit-build-cmake-macos
    -
    musrfit-build-automake-windows -
    - - -
    musrfit-build-cmake-linux -
    - - -
    musrfit-build-cmake-macos -
    - - -
    musrfit-build-cmake-windows +
    musrfit-build-cmake-windows
    @@ -605,15 +593,15 @@ -
    musrfit-build-macos +
    musrfit-build-macos
    -
    musrfit-build-windows +
    musrfit-build-windows
    -
    musrfit-post-install-linux +
    musrfit-post-install-linux
    @@ -707,7 +695,7 @@ -
    nexus-build-fink +
    nexus-build-fink
    @@ -717,11 +705,11 @@
    -
    nexus-build-macports +
    nexus-build-macports
    -
    nexus-build-windows +
    nexus-build-windows
    @@ -787,7 +775,7 @@
    -
    root-build-fink +
    root-build-fink
    @@ -795,13 +783,13 @@ -
    root-build-macports +
    root-build-macports
    -
    root-build-windows +
    root-build-windows
    @@ -982,12 +970,12 @@
  • index
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/index.html b/doc/html/index.html index c0b77df7..f7876be4 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -6,7 +6,7 @@ - Welcome to the musrfit documentation! — musrfit 1.4.1 documentation + Welcome to the musrfit documentation! — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -37,7 +37,7 @@
  • next |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -180,12 +180,12 @@
  • next |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/msr2data.html b/doc/html/msr2data.html index 41aa65a2..80c65ebe 100644 --- a/doc/html/msr2data.html +++ b/doc/html/msr2data.html @@ -6,7 +6,7 @@ - msr2data - A Program for Automatically Processing Multiple musrfit msr Files — musrfit 1.4.1 documentation + msr2data - A Program for Automatically Processing Multiple musrfit msr Files — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -434,12 +434,12 @@ fit serves as template for the second and so on. The template field stays empty
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/mupp.html b/doc/html/mupp.html index a7cc9003..6dd42422 100644 --- a/doc/html/mupp.html +++ b/doc/html/mupp.html @@ -6,7 +6,7 @@ - mupp - μSR Parameter Plotter — musrfit 1.4.1 documentation + mupp - μSR Parameter Plotter — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -252,12 +252,12 @@ SCRIPT COMMANDS:
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/musr-root.html b/doc/html/musr-root.html index 4dde6afb..46516485 100644 --- a/doc/html/musr-root.html +++ b/doc/html/musr-root.html @@ -6,7 +6,7 @@ - MusrRoot - an Extensible Open File Format for μSR — musrfit 1.4.1 documentation + MusrRoot - an Extensible Open File Format for μSR — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -923,12 +923,12 @@ the entry has been added. The last token, previous | -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/musredit.html b/doc/html/musredit.html index a0dd9c47..0ace91e9 100644 --- a/doc/html/musredit.html +++ b/doc/html/musredit.html @@ -6,7 +6,7 @@ - musredit: the GUI Based Interface to musrfit — musrfit 1.4.1 documentation + musredit: the GUI Based Interface to musrfit — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -550,12 +550,12 @@ the corresponding fit parameter value, except the phases where the step will be
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/objects.inv b/doc/html/objects.inv index 155ccf92..445706eb 100644 Binary files a/doc/html/objects.inv and b/doc/html/objects.inv differ diff --git a/doc/html/search.html b/doc/html/search.html index 27da148d..67522441 100644 --- a/doc/html/search.html +++ b/doc/html/search.html @@ -6,7 +6,7 @@ - Search — musrfit 1.4.1 documentation + Search — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • index
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -89,12 +89,12 @@
  • index
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/searchindex.js b/doc/html/searchindex.js index 058381e2..b403ced5 100644 --- a/doc/html/searchindex.js +++ b/doc/html/searchindex.js @@ -1 +1 @@ -Search.setIndex({filenames:["acknowledgement","any2many","bugtracking","cite","index","msr2data","mupp","musr-root","musredit","setup-dks","setup-standard","tutorial","user-libs","user-manual"],titles:["Acknowledgements","any2many - a Universal \u03bcSR-file-format converter","Bugtracking","How to Cite musrfit?","Welcome to the musrfit documentation!","msr2data - A Program for Automatically Processing Multiple musrfit msr Files","mupp - \u03bcSR Parameter Plotter","MusrRoot - an Extensible Open File Format for \u03bcSR","musredit: the GUI Based Interface to musrfit","Setting up musrfit / DKS: High Speed Fitting with GPU’s","Setting up musrfit on Different Platforms","Tutorial for musrfit","Documentation of user libs (user functions)","User manual"],terms:{"\u03b1":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b2":[],"\u03b4":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b7":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b5":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b3":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b9":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03ba":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c7":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03bb":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03bc":[8,5,12,10,1,11,13,0,9,3,7,6,4],"\u03bd":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03bf":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c9":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c0":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c6":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c8":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c1":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c2":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c3":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c4":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b8":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03c5":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03be":[8,5,12,10,1,11,13,0,9,3,7,6],"\u03b6":[8,5,12,10,1,11,13,0,9,3,7,6],bastian:0,wojek:[5,3,0],veri:[8,11,0,13,10,7],much:[8,13,0,6,7],indebt:0,bmw:[],rigor:0,test:[8,10,0],musrfit:[],mani:[8,5,12,0,13,10,7],suggest:[5,10,0],contribut:[11,12,13,0],largest:0,part:[8,12,0,11,13,10,3,7],user:[],manual:[],which:[8,5,12,10,11,13,0,6,9,7],make:[8,0,13,10,9,7],access:[],broader:0,audienc:0,thank:0,uldi:0,locan:[9,3,0],work:[8,5,12,10,13,0,9,7],enabl:[],gpu:[],support:[],kind:[12,7,0],calm:0,extrem:0,compet:0,wai:[8,5,12,10,11,13,0,6,9,7],deal:[12,11,0,13,10,9,7],project:0,well:[5,12,11,13,0,9],chao:0,physicist:0,think:0,admir:0,allow:[8,5,12,1,13,10,6,9,7],most:[5,12,1,13,10,9,7],from:[],other:[1,11,13,10,6,9,7],detail:[8,12,1,11,13,10,9,7],descript:[],see:[8,5,12,1,11,13,10,6,9,7],here:[8,5,1,11,13,10,6,9,7],report:2,bug:[8,2],request:[11,13,2,10,6],"new":[8,5,11,13,2,10,7],featur:[],improv:[12,2,10],pleas:[5,12,11,13,2,10,3,7],bitbucket:[13,2,10],repo:[9,2,10],prefer:[8,13,2,10],send:[13,2],mail:2,suter:[9,3,2],psi:[8,12,11,13,2,10,9,7],sinc:[5,11,13,10,9,3,7],quit:[8,13,10,3,7],some:[],effort:3,develop:[],mainten:[3,7],packag:[],you:[8,13,10,6,9,3,7],should:[8,5,12,11,13,10,6,9,3,7],least:[5,11,13,10,3],your:[8,5,13,10,9,3],"public":[12,3,13,10],have:[8,5,12,11,13,10,9,3,7],analyz:[],data:[],even:[5,13,10,3,7],better:[5,3,13],cours:[5,3,13,10],properli:[5,9,3,13],refer:[8,12,11,13,10,9,3,7],given:[8,5,12,11,13,10,6,9,3,7],beneath:[8,3],free:[8,12,13,10,3,7],platform:[],independ:[12,3,13],framework:[],analysi:[5,12,11,13,10,9,3,7],physic:[9,3,13,7],procedia:3,http:[8,12,13,10,9,3,7],doi:3,org:[3,10],phpro:3,high:[],speed:[],version:[8,12,13,10,6,9,3,7],util:[13,10,9,3,7],"case":[8,5,12,11,13,10,6,9,3,7],thi:[8,5,12,11,13,10,6,9,3,7],also:[8,5,12,11,13,10,6,9,3,7],add:[8,5,11,13,10,6,9,3,7],follow:[8,5,12,11,13,10,6,9,3,7],citat:3,adelmann:3,dynam:[9,3],kernel:[9,3],schedul:[9,3],comput:[9,3,10],commun:3,cpc:3,real:[11,13,10,9,3],time:[8,12,11,13,10,6,9,3,7],paramet:[],fit:[],imag:[3,13,11],reconstruct:3,graphic:[],process:[],unit:[3,13,7,11],conf:[9,3,10],proc:3,jpscp:3,tutori:[],singl:[],histogram:[],asymmteri:[],introduct:[],avail:[],execut:[],configur:[],basic:[],usag:[],msr:[],type:[],"function":[],technic:[],lib:[],meissner:[],profil:[],vortex:[],lattic:[],relat:[],nonloc:[],superconduct:[],screen:[],nmr:[],bnmr:[],set:[],differ:[],oper:[],system:[],softwar:[],requir:[],restrict:[],gnu:[],linux:[],window:[],mac:[],maco:[],tesla:[],k40c:[],nvidia:[],amd:[],card:[],radeon:[],"390x":[],opencl:[],musredit:[],gui:[],base:[],interfac:[],musrwiz:[],musrstep:[],mupp:[],plotter:[],script:[],summari:[],msr2data:[],program:[],automat:[],multipl:[],option:[],global:[],mode:[],known:[],limit:[],provid:[],musrroot:[],extens:[],open:[],concern:[],root:[],tmusrrunhead:[],concept:[],runinfo:[],detectorinfo:[],sampleenvironmentinfo:[],magneticfieldenvironmentinfo:[],beamlineinfo:[],exhaust:[],tree:[],includ:[],everyth:[],tmusrrunphysicalquant:[],possibl:[],represent:[],index:[5,13,4],search:[13,10,4],page:[8,11,10,9,7,4],origin:[5,8,13,12],written:[8,5,12,11,13,7],implement:[8,5,12,13,10,9,7],purpos:[5,13,11,10],input:[5,8,13,11],same:[5,12,11,13,10,6,9,7],summar:[5,11],result:[8,5,12,11,13,7],either:[8,5,12,11,13,10,6],triumf:[5,8,13,11],column:[8,5,11,13,7],ascii:[8,5,12,11,13],essenti:[5,8,13,7],collect:[8,5,12,11,13,10,6,7],old:[5,13,10],abridg:5,produc:[5,13,11,10],can:[8,5,12,11,13,10,6,9,7],view:[],instanc:[5,13,10,6,7],howev:[5,11,13,10,9],thei:[5,11,13,10,9,7],complet:[5,12,11,10,9],backward:[5,13,7],compat:[5,9,13,10],languag:5,name:[8,5,12,11,13,10,6,9,7],longer:5,than:[8,5,11,13,10,7],five:[5,11],six:5,charact:[5,13],order:[5,12,13,10,9,7],establish:5,need:[8,5,12,11,13,10,9,7],ensur:[5,13],correct:[8,5,11,13,10],length:[5,12,7],apart:[5,12,10],numer:[5,12,10],might:[8,5,12,13,10,6,7],principl:[5,12,10],four:5,call:[8,5,12,11,13,10,6,7],suppli:[5,12,9,13],number:[8,5,12,11,13,10,6,9,7],firstrunno:5,lastrunno:5,interv:[5,13],specifi:[8,5,12,11,13,10,7],through:[5,12,11,13,10,7],first:[8,5,12,11,13,10,6,9,7],last:[],condit:[5,12],necessari:[8,5,11,13,10,7],runlist:[5,13],where:[8,5,12,11,13,10,6,9,7],combin:[8,5,11,13,7],run0:5,run1:[5,13],run2:[5,13],runn:5,rang:[],step:[],sequenc:[5,13,11,10],posit:[5,13,7,11],integ:[5,13,7],etc:[8,5,13,10,9,7],runlistfilenam:5,contain:[],extern:[5,12,13,10,7],pass:[5,8,13],below:[5,12,11,13,10,7],all:[8,5,11,13,10,6,9,7],mandatori:[5,12,13,7],right:[5,12,11,13,10,7],after:[8,5,11,13,10,9,7],mean:[8,5,12,11,13,10,6,9,7],becom:[5,10],clear:[5,8,13,7],give:[5,11,13,10,7],exampl:[8,5,12,11,13,10,6,7],"_tf_h13":5,out:[8,5,11,13,10,6,9,7],chang:[8,5,13,10,9],"8472_tf_h13":5,"8473_tf_h13":5,"8474_tf_h13":5,"8470_tf_h13":5,directori:[8,5,12,11,13,10,9,7],put:[5,8,13,10],var1:5,var2:5,var3:5,comment:[8,5,13,10,6,9,7],empti:[5,8,13,6],line:[8,5,12,11,13,10,6,7],determin:[],label:[8,5,12,13,6,7],present:[8,5,12,11,13,10,6,9,7],preced:5,mention:[5,12,13,10,7],togeth:[8,5,11,13,10,7],abov:[8,5,12,11,13,10,6,9,7],output:[8,5,12,11,13,6],onli:[8,5,12,11,13,10,6,9,7],newli:[5,8,11],creat:[],did:[5,10],exist:[5,13,10],befor:[8,5,12,11,13,10,9,7],invok:[5,8,13,6],were:[5,8,13,7],alreadi:[8,5,13,10,9],would:[8,5,12,11,13,10,6,9,7],append:[5,13,10],been:[8,5,12,11,13,10,7],header:[],block:[],forc:[5,13],suppress:5,nohead:[5,8],shall:[8,5,12,11,13,10,7],seen:[5,7,11],later:[5,13,11,10],like:[8,5,12,13,10,6,9,7],behavior:[5,13],ani:[8,5,11,13,10,9,7],simpl:[5,12,11,13,10],"default":[8,5,13,10,9],dat:[8,5,12,11,13,6],delet:[5,7],inform:[],both:[5,12,13,10],none:[5,8,13,11],write:[],sole:[5,13],assum:[8,5,12,11,13,10,9,7],nosummari:[5,8],attempt:5,read:[],addit:[8,5,12,11,13,10,9,7],temperatur:[5,11,13,6,7],appli:[5,12,11,13,10,7],magnet:[5,8,7,12],field:[],paramlist:5,param:[5,8,13,6],select:[8,5,11,13,10,6,9,7],"export":[5,11,13,10,9],startno:5,endno:5,space:[5,12,13,10],separ:[8,5,11,13,10],outputfilenam:[5,13],instead:[5,12,13,10,9,6],equal:[5,13,11],insensit:5,addition:[8,5,11,13,10],"final":[5,12,11,13,10],templat:[5,8,13,11],perform:[8,5,11,13,10,6,7],mlog:[5,8,13],subsequ:[5,13],chain:[5,8,10],exclam:5,mark:[5,13],without:[],keep:[5,8,13,7],mn2:[5,13],done:[5,12,11,13,10,6,9,7],ignor:[5,13,6],titl:[],illustr:[5,13],few:[8,5,13,10,7],explan:[5,13],oabc:5,"8400_tf_h13":5,"8460_tf_h13":5,abc:5,about:[5,11,13,10,7],"_zf":5,def:5,"8472_zf":[5,8],"8500_zf":5,"8502_zf":5,"8503_zf":5,"8504_zf":5,"8507_zf":5,oghi:5,ouput:5,ghi:5,take:[5,12,11,13,10],"8471_tf_h13":5,"8475_tf_h13":5,bestdata:5,"8476_tf_h13":5,"8477_tf_h13":5,"8478_tf_h13":5,"8479_tf_h13":5,describ:[8,5,12,11,13,10,9,7],anoth:[8,5,13,6,7],each:[5,12,11,13,10,6,7],defin:[8,5,12,11,13,10,6,7],common:[5,13,10],specif:[8,5,12,11,13,10,7],when:[8,5,12,11,13,10,7],obtain:[5,12,7],valid:[],conjunct:[5,12,13,10],invoc:[5,13],state:[],idea:[5,13,7,11],basi:5,identifi:[5,13],tag:[8,5,12,11,13,10,9,6],current:[8,5,12,13,10,6,9,7],"0xu":5,digit:[5,13],lead:[8,5,12,13,7],zero:[8,5,11,13,7],end:[8,5,11,13,10,6,7],alpha0123:5,alpha00123456:5,fitparamet:[],exemplari:[5,13],"8472_exampl":5,could:[8,5,12,13,10,9,6],therefor:[5,12,11,13,10],look:[8,5,12,13,10,6,9,7],valu:[8,5,11,13,10,9,7],pos_error:[5,13,11],boundari:[8,5,12,11,13],phase:[8,5,12,11,13],asy8472:5,rate8472:5,treat:[5,10],wherea:[5,8,13],normal:[5,13,11,10],within:[8,5,12,11,13,10,6,7],appear:[5,13],explicitli:[5,8,13],theori:[],those:5,met:5,"try":[5,13,10],substitut:[5,13,11,10],them:[8,5,12,11,13,7],map:[],accordingli:[5,11,6,10],"_exampl":5,global_exampl:5,alwai:[5,12,13,7],start:[8,5,11,13,10,6,9,7],asy8471:5,rate8471:5,asy8470:5,rate8470:5,show:[8,5,11,13,6,7],reorgan:5,begin:[5,13,7,10],copi:[5,8,13,10],found:[8,5,12,11,13,10,9,7],dure:[5,12,13,10,6],affect:5,occurr:[5,10],awar:[5,13,10],fact:[5,10],propag:5,model:[],usual:[5,12],store:[8,5,12,10,7],reach:[5,13],goal:[5,13],obei:[5,13],certain:[5,12],rule:[5,8,13,7],match:[5,13],accord:[8,5,11,13,10],achiev:[5,11,10],easili:[5,8,9,10],shown:[8,5,11,13,6,7],globalfit:5,relev:[8,5,11,13,7],pre:[5,8],afterward:[5,12,13,10,6,9,7],special:[5,13,7,10],replac:[5,9,13,10],review:5,activ:[5,8,12,10],choos:[8,5,12,11,13,10],keyword:[5,13],onerunfit_exampl:5,onerunfit:5,everi:[5,13,6,10],similar:[5,10],explain:[8,5,12,11,13,10,9,7],moment:[5,12,7,10],peopl:[5,7,10],cannot:[5,12,13],behav:[5,12],integr:[5,12,10],filenam:[5,13,7],rightmost:5,highest:[5,10],treatabl:5,statist:[],itself:[5,11],more:[8,5,11,13,10,6,9,7],creativ:5,care:[5,13,10],addrun:[5,13],statement:[5,13],simpli:[5,13,10],probabl:[5,7,10],what:[5,12,11,13,10,9],two:[8,5,12,11,13,10,7],success:[5,13,7,11],encount:5,actual:[5,12,13,10],measur:[8,5,12,11,13,6,7],introduc:[5,13,7,11],reason:[5,11,13,10,9],shape:[5,12,13],design:[5,10],especi:[5,12,13,10,9,7],manipul:[5,8,13],front:[5,8,7,11],offer:[5,13,11],almost:[5,8,13],self:[5,8],explanatori:[5,8],depict:[5,13],under:[8,5,13,10,6,9,7],stai:5,enter:[5,8,9,10],otherwis:[5,9,13,10],serv:[5,13,11],second:[8,5,12,11,13,10],noth:[5,8,13,7],correspond:[8,5,11,13,10,6,7],littl:[8,13,6],helper:[8,7,6,10],quickli:[9,6],plot:[],handl:[8,12,13,10,6,7],heavili:[12,6],inspir:6,via:[],command:[],directli:[8,13,10,6,7],typic:[8,13,10,9,6],load:[12,6],dialog:[8,6],tri:[13,6,10],fly:[6,11],drag:[6,11],over:[13,6,10],axi:[12,11,13,6,7],wish:[13,6],click:[8,13,6],analog:6,remov:[13,6],often:[8,13,6,10],compar:[9,13,6,10],trend:6,hold:[13,7,6],energi:[12,7,6],scan:[13,6],now:[11,13,10,9,6],interest:[13,6,10],ditto:6,less:[13,6,10],error:[8,12,11,13,10,6,9,7],prone:[8,9,6],quicker:[13,6],button:[8,13,6,11],mupp_plot:6,applic:[8,12,13,10,9,6],refresh:6,reload:[8,6],beamtim:6,grow:6,task:6,mous:[13,6],gambl:6,futur:[8,6,10],plane:6,help:[8,13,10,9,6],cmd:[6,10],manner:[6,10],updat:[11,13,10,9,6],web:[8,13,10,6,7],interact:[12,13,6,11],figur:[13,7,6],loadpath:6,dir:6,path:[8,11,13,10,6,9,7],bash:[6,10],variabl:[],home:[8,12,13,10,6,9,7],accept:[8,13,6],coll:6,selectal:6,carri:[13,6,10],ybco:6,"40nm":6,t5k:6,fc150mt:6,escan:6,addx:6,addi:6,savepath:6,save:[8,12,11,13,10,6,7],place:[11,13,6,10],macro:6,fln:[13,6],txt:[6,10],t30k:6,t60k:6,t120k:6,fieldvsenergi:6,pdf:[13,6],"true":[12,13,7,6],best:[12,13,10,6,7],ever:[7,6],thie:6,labl:6,until:[13,7,11],bulk:[],instrument:[8,13,7],bin:[8,11,13,10,7],fix:[8,13,7,11],binari:[7,10],rather:[8,13,7,10],stringent:7,lem:[12,13,7],cern:[13,7,10],tightli:7,tailor:7,situat:[13,7,10],unsatisfactorili:7,henc:[11,13,10,9,7],decid:[13,7,10],move:[13,7,11],forward:[9,13,7,11],acquisit:7,mida:7,respons:[9,13,7],build:[],decai:[13,7,11],easi:[8,7],object:[],th1f:7,orient:[12,7],mine:7,frame:[9,13,7],tfile:7,eas:[13,7,10],understand:[13,7],upcom:[7,10],definit:[13,7,11],thing:[8,13,10,9,7],check:[],guid:[9,13,7],organ:[8,13,7],similarli:[13,7],browser:7,inspect:7,tbrowser:7,deriv:[13,7],tobject:7,small:[8,12,13,10,9,7],subset:[13,7],tfolder:7,top:[7,10],level:[13,7],tobjarrai:7,tobjstr:7,content:[13,7,10],form:[12,11,13,10,9,7],box:[8,9,7],entri:[13,7],sketch:[13,7],histo:[8,11,13,10,7],decayanamodul:7,hdecay001:7,hdecay002:7,scanamodul:7,hsampletemperatur:7,hsamplemagneticfield:7,detector001:7,detector002:7,hdecayxxx:7,xxx:7,"int":7,"03d":7,notat:[13,7],"class":[12,13,7],folder:[7,10],next:[8,12,13,10,9,7],section:[13,7,10],slow:7,control:[9,13,7],sampl:[12,9,7,11],versu:7,again:[8,13,10,9,7],meta:7,minim:[12,11,13,10,7],bracket:7,item:[13,7],detector:[8,12,11,13,7],environ:[],beamlin:[8,13,7,11],elabor:[9,7],word:7,sub:[11,13,7,10],intern:[8,13,7],tstring:7,git:[9,13,7,10],url:7,xsd:7,wrote:7,nemu_analyz:7,deltat_tdc_gps_4295:7,int_t:[13,7],iso:7,date:[13,7,11],stop:7,durat:7,sec:[13,7],laboratori:7,muon:[],beam:7,momentum:[12,7,11],mev:7,speci:7,neg:[],sourc:[],target:7,low:[12,13,7],setup:[9,13,7,10],cf1:7,wxy:7,resolut:[12,7],redgreen:[13,7],offset:[13,7],tintvector:7,except:[8,13,7,10],shortli:[13,7],discuss:[8,9,13,7],experi:[13,7],stimuli:7,electr:7,off:[13,7,10],doubl:[13,7],distinguish:7,easier:[7,10],let:7,sai:7,red:[11,13,10,9,7],green:[13,7,11],browsabl:7,string:[8,13,7,10],tobjstringv:7,quantiti:7,repres:[13,7,11],properti:[13,7],estim:[8,12,13,7],demand:[13,7],depend:[8,12,11,13,10,9,7],musrrootv:7,mock:7,print:[8,13,7],notic:[8,13,7],find:[8,13,10,9,7],encod:[8,12,13,10,7],price:7,pai:7,shade:7,"import":[13,7],approach:[13,7,10],standard:[9,13,7,10],"abstract":[13,7],text:[8,13,7,11],though:[8,7,10],clean:[9,7,10],lot:[13,7],"2nd":7,slightli:[8,9,13,7],advantag:[8,13,7,10],maintain:7,expand:7,classifi:7,group:[8,13,7,10],previou:[13,7],"float":7,point:[8,12,11,13,10,7],double_t:[13,7],tstringvector:7,tdoublevector:7,themselv:[12,7],vector:[12,13,7],code:[12,11,13,10,9,7],snippet:[13,7],reader:7,routin:[12,13,7,10],convers:[13,7],write_musrroot_runhead:7,full:[11,13,7,10],concentr:7,just:[12,13,10,9,7],prop:7,further:[],down:[8,13,7,11],deltat_tdc_gps_2871:7,come:[8,7,10],overload:7,pathnam:7,method:[13,7],tdc:[13,7],cf3:7,mrh_undefin:7,strang:7,fed:[13,7],whole:7,someth:[9,13,7,10],recreat:[8,7],iszombi:7,"return":[13,7],info:[],fillfold:7,close:[8,13,7,10],read_musrroot_runhead:7,getobject:7,cerr:[13,7],endl:[13,7],couldn:[13,7],get:[8,13,10,9,7],closefil:7,extractal:7,decod:7,fill:[13,7,11],getter:7,bool_t:[13,7],ival:7,cout:7,els:[8,13,7,10],getvalu:7,geterror:7,getunit:7,getdemand:7,getdescript:7,mechan:[13,7],inde:7,minimum:7,scheme:7,musrrootvalid:7,recurs:7,pars:7,temporari:7,xml:[],ampl:[13,7],parser:[7,10],hand:[13,7,10],decent:7,book:7,libxml2:[7,10],becaus:[8,7],suppos:[13,7,10],against:7,schema:7,lmu:[8,7],semant:7,preform:7,cross:[13,7,10],facil:[8,13,7],musrrootlem:7,poitiv:7,wew:7,hdecay023:7,detector023:7,potenti:[],discontinu:7,"break":7,element:7,left:[8,12,7],npp:[8,11,13,10,7],spectromet:[9,13,7,11],good:[8,13,10,9,7],enough:[13,7,10],cryo:7,cryostat:7,oven:7,konti:7,pim3:[13,7,11],hypothet:7,light:7,per:[8,13,7],bottom:7,split:[13,7,10],mind:7,symbol:[7,10],hdecay003:7,hdecay004:7,hdecay007:7,hdecay008:7,hdecay011:7,hdecay012:7,hdecay013:7,hdecay014:7,hdecay017:7,hdecay018:7,hdecay021:7,hdecay022:7,hdecay024:7,hdecay027:7,hdecay028:7,hdecay031:7,hdecay032:7,hdecay033:7,hdecay034:7,hdecay037:7,hdecay038:7,continu:7,"switch":[8,13,10,9,7],jump:[13,7],cpp:[13,7],"00z":7,nemu:[13,7,10],lem12_his_0234:7,said:7,detector038:7,insert:7,x123:7,perp:7,spin:[12,13,7,11],mue4:[8,13,7],scalerinfo:7,runsummari:7,wed:7,oct:7,lco:7,wtf:7,kev:[12,7],ledb:7,buc:7,edit:[8,11,7,10],euc:7,event:[7,11],event_0:7,mcp1:7,event_1:7,mcp2:7,event_2:7,lemusr:7,problem:[],deviat:[13,7],hereaft:7,snip:7,somewher:[8,7,10],token:[13,7],val:[13,7],err:7,cf4:7,cf5:7,editor:[8,11,10],suit:[8,12,13,11],intend:[8,13,10],eventu:[8,11,10],drop:[8,10],outdat:[8,13,10],earli:[8,13],anymor:[8,10],still:[8,12,13,10,9],urg:8,strongli:[8,13,10],recommend:[8,12,10],shell:[8,13,10],tab:[8,13],startup:[],displai:[8,12,13,10],locat:[8,12,11,13,10],proof:8,exec_path:8,path_to_exec:8,musrview:[],musrt0:[],insid:[8,12,13,10],default_save_path:8,save_path:8,msr_default_file_path:8,msr_def_path:8,timeout:[8,13],canva:[8,13,11],keep_minuit2_output:8,flag:[8,13],minuit2:[8,13,10],kept:[8,13],dump_ascii:8,dump:[8,13],dump_root:8,title_from_data_fil:8,chisq_pre_run_block:8,chisq:[8,13,11],estimate_n0:8,procedur:[8,12,11,13,10,9],musrview_show_fouri:8,fourier:[],transform:[8,12,11,13,10],domain:[8,13,11],musrview_show_avg:8,averag:[8,12,13],power:[8,11,13,10,9],spectra:[8,13],enable_musrt0:8,font_set:8,font:[8,10],font_nam:8,font_siz:8,size:[8,13],msr_file_default:8,institut:[8,13,11],inst:8,ral:8,jparc:8,file_format:[8,13],nexu:[],musr:[8,13],ppc:[8,13,11],mdu:[8,13,11],wkm:[8,13,11],mud:[8,13,11],lifetime_correct:8,lifetimecorrect:[8,13],msr2data_default:8,tick:8,chain_fit:8,write_data_head:8,ignore_data_header_info:8,write_column_data:8,create_msr_file_onli:8,fit_onli:8,global_plu:8,recreate_data_fil:8,open_file_after_fit:8,experienc:[8,10],who:8,help_sect:8,variou:[8,13,10],messag:[8,13],musr_web_x:8,link:[8,13,10],main:[8,11,10],musrft:[],func_pixmap_path:8,pix_path:8,latex:8,pixmap:8,visual:[8,11],theory_funct:8,syntax:[8,13],func:8,menu:[8,13,11,10],pictur:8,utf:[8,12,13,10],xmln:[8,13],html:8,usr:[8,10],local:[8,12,9,10],share:[8,9,13,10],doc:[8,13,11,10],chisq_per_run_block:8,recent_fil:8,path_file_nam:8,musr_web_main:8,musr_web_titl:8,thetitl:8,musr_web_paramet:8,thefitparameterblock:8,musr_web_theori:8,thetheoryblock:8,musr_web_funct:8,thefunctionsblock:8,musr_web_run:8,therunblock:8,musr_web_command:8,thecommandsblock:8,musr_web_fouri:8,thefourierblock:8,musr_web_plot:8,theplotblock:8,musr_web_statist:8,thestatisticblock:8,musr_web_msr2data:8,musr_web_musrft:8,a_2:8,"3_musrft":8,monospac:8,latex_imag:8,asymmetri:[],png:[8,13],statgsskt:[8,13],rate:[8,12,13,11],"static":[8,12,10],gauss:[8,12,13,11],respect:[8,12,11,13,10],bar:[8,13],keyboard:[8,11],shortcut:[],scratch:8,too:[8,10],priori:8,knowledg:8,calcul:[8,12,11,13,10],log:[8,12,13],max:[8,13],likelihood:[8,12,13],kei:[],alt:8,equival:[8,13,10],mai:[8,13,10],chosen:[8,13,10],swap:[8,13],vice:[8,13],versa:[8,13],adjust:[8,13,11,10],initi:[8,12,11,13,10],fitter:8,own:[8,13],docu:[8,9,13],raw:[8,13],dump_head:[],stage:[8,13],wand:8,coupl:[8,9,13],dialogu:8,briefli:8,explicit:[8,13],year:[8,9,13],pull:[8,10],choosen:8,rrf:[],minu:8,transvers:[8,13,11],longitudin:8,choic:[8,13,10],question:[8,13],ask:[8,10],correctli:[8,13,11,10],proper:[8,9,13],prompt:[8,9,13,10],peak:[8,12,13],pop:8,disadvantag:8,freeli:8,custom:[8,13],cost:8,yourself:8,stand:[8,9],whatev:[8,9],press:[8,13,11],syntact:8,appropri:[8,9],previous:8,handi:8,furthermor:[8,13,10],pack:[8,13,11,10],minuit:[8,12,13],reset:[8,13],sometim:[8,13],went:[8,10],wrong:8,leav:8,far:[8,13],iter:[8,12,13],individu:[8,13],tediou:[8,12],popup:8,asym:8,uncheck:8,unselect:8,modifi:[8,12],degre:[8,13,11],cancel:8,anyth:[8,13],scale:[8,13],factor:[8,13],absolut:[8,13,11,10],explor:[9,10],hal:[9,13],memo:[9,13],rotat:[9,13,11],tremend:[9,10],muonium:[9,13],appl:[9,10],cpu:[9,13,10],straight:9,multi:[9,13,10],thread:[9,13,10],doesn:9,openmp:[9,13,10],shop:9,bui:9,gamer:9,sure:[9,13,10],server:[9,10],suffici:[12,9],strong:[9,13,11],yet:[12,9,13,11],fall:[9,13],back:[9,13],conceptu:9,latest:[9,10],hardwar:9,crunch:9,readi:[9,13,10],acceler:[9,13],termin:[11,9,13,10],lspci:9,grep:[9,10],corpor:9,gk110bgl:9,rev:[12,9,13],recogn:9,download:[9,10],center:[12,9],hat:[9,10],enterpris:9,rhel:[9,10],rpm:[9,10],diag:9,rhel7:9,x86_64:9,conflict:9,nouveau:9,reboot:9,machin:[12,9,10],omit:[9,13,10],thin:[12,9],host:9,incorpor:9,paper:9,wiki:9,brief:[9,10],clone:[9,10],got:9,consist:[12,9,13],gitlab:[9,13,10],uldis_l:9,mkdir:[9,10],denable_musr:9,dcmake_install_prefix:[9,10],exec:9,non:[],librari:[12,9,13,10],"super":9,sbin:[9,10],ldconfig:[9,10],ld_library_path:[9,10],launchctl:[9,10],setenv:[9,10],checkout:[9,10],branch:[9,10],dks6:9,soon:[9,10],want:[9,13,10],tell:[9,13],aslib:[9,10],bmwlib:[9,10],prefix:[9,10],rootsi:[9,10],lookup:9,superus:[9,10],ddk:9,disabl:[9,13,10],daslib:[9,10],dbmwlib:[9,10],dnexu:[9,10],vga:9,advanc:9,micro:[9,13],devic:9,inc:9,ati:9,hawaii:9,grenada:9,"290x":9,amdgpu:9,pro:[9,10],unpack:[9,10],tar:[9,13,10],jxvf:9,blabla:9,usermod:9,video:9,technolog:9,materi:9,leverag:9,amp:9,xvjf:9,sdkinstal:9,linux64:9,bz2:[9,13],opt:[9,13,10],amdappsdk:9,note:[12,9,13,10],instruct:[9,13,10],compil:[9,13,10],xcode:[9,10],deliv:9,easiest:9,involv:[12,9],demonstr:10,"while":10,brave:10,virtual:10,encourag:10,gcc:[13,10],tool:[13,10],autoconf:10,libtool:10,toolchain:10,drope:10,releas:[13,10],plan:10,pkg:10,config:10,boost:10,spirit:10,scientif:[12,13,10],effici:[12,13,10],mathemat:[13,10],fftw:10,fast:10,discret:[11,10],toolkit:10,gnome:10,hdf4:[13,10],manag:10,hdf5:[13,10],minixml:10,neutron:10,rai:10,scienc:10,focus:10,seriou:10,distribut:[],fedora:10,debian:10,ubuntu:10,mint:10,opensus:10,nativ:10,microsoft:10,distributor:10,taken:[13,10],dev:10,devel:10,trick:10,never:10,qt4:10,yum:10,gsl:10,qtwebkit:10,qt5:10,epel:10,qtbase:10,qtsvg:10,dpkg:10,apt:10,libboost:10,libgsl:10,libfftw3:10,libqt4:10,libqtwebkit:10,qtbase5:10,libqt5svg5:10,libqt5webkit5:10,everyon:10,know:10,himself:10,doe:[13,10],websit:10,engin:10,mxml:10,hdf:10,libmxml1:10,libmxml:10,libhdf4:10,libhdf5:10,urgent:[13,10],isi:[13,10],safe:[13,10],master:10,repositori:10,github:10,com:10,nexusformat:10,denable_hdf5:10,denable_hdf4:10,denable_mxml:10,sudo:10,flavour:10,legaci:10,incompat:10,guess:[13,10],warn:[13,10],upgrad:10,recompil:10,redhat:10,libx11:10,libxft:10,libxpm:10,libxext:10,systemat:10,term:10,offici:10,root_build:10,dgminim:10,dasimag:10,dmathmor:10,dminuit2:10,dxml:10,root_exec:10,multicor:10,miss:[13,10],told:10,luke_skywalk:10,echo:10,bashrc:10,bash_profil:10,restart:10,onc:[11,12,13,10],proceed:10,recent:[13,10],muonspin:10,root5:10,root6:10,newer:10,dec:10,whether:[13,10],uninstal:10,xarg:10,install_manifest:10,altern:[13,10],autogen:10,prepar:10,successfulli:[13,10],makefil:[13,10],besid:10,fftw3:[12,10],boostinc:10,qt3:10,qt47:10,lib64:10,omp:[13,10],parallel:[11,12,13,10],detect:[11,10],permiss:10,dbnmrlib:10,bnmrlib:10,dqt_based_tool:10,dqt_version:10,auto:10,dtry_openmp:10,core:10,finish:[11,10],musrfitpath:10,musrfit_startup:[],built:[13,10],everth:10,src:10,musredit_qt5:10,qmake:10,fine:10,skip:10,higher:10,uic:10,quick:[13,10],hasn:10,adventur:10,advic:10,wonder:10,occur:10,great:10,gain:10,nice:[12,10],unix:10,revis:[13,10],fulfil:10,abl:10,a2p:10,passwd:10,binutil:10,bison:10,bzip2:10,colorgcc:10,coreutil:10,curl:10,cygutil:10,editright:10,findutil:10,flex:10,adob:10,dpi100:10,dpi75:10,alia:10,bitstream:10,ibm:10,type1:10,sun:10,misc:10,xfree86:10,fontconfig:10,freeglut:10,gawk:10,gcc4:10,fortran:10,gccmakedep:10,gettext:10,ghostscript:10,std:[13,10],giflib:10,gmp:10,groff:10,gzip:10,inputproto:10,jasper:10,jpeg:10,lapack:10,libbz2_1:10,libcharset1:10,libcurl4:10,libfftw3_3:10,libgcc1:10,libgd:10,libgif:10,libgl:10,libgl1:10,libglu:10,libglu1:10,libglut:10,libglut3:10,libgmp:10,libgmp3:10,libgomp1:10,libic:10,libice6:10,libjpeg:10,libjpeg62:10,liblapack:10,libmpfr:10,libmpfr1:10,libncurs:10,libncurses9:10,libosmesa:10,libosmesa7:10,libpng:10,libpng14:10,libreadline6:10,libsm:10,libsm6:10,libssh2_1:10,libstdc:10,libtiff:10,libtiff5:10,libx11_6:10,libxau:10,libxau6:10,libxaw7:10,libxcb:10,xlib:10,libxcursor:10,libxcursor1:10,libxdmcp:10,libxdmcp6:10,libxext6:10,libxfix:10,libxfixes3:10,libxfont:10,libxfont1:10,libxft2:10,libxi:10,libxi6:10,libxkbfile1:10,libxmu:10,libxmu6:10,libxpm4:10,libxrend:10,libxrender1:10,libxt:10,libxt6:10,login:10,makedepend:10,man:10,mpfr:10,nano:10,opengl:10,openssh:10,openssl:10,pdftk:10,perl:10,ping:10,psutil:10,python:10,readlin:10,rebas:10,rgb:[13,10],rsync:10,sed:10,subvers:10,tcltk:10,terminfo:10,unzip:10,vim:10,w32api:10,icon:[11,13,10],xauth:10,xextproto:10,xfontsel:10,xinit:10,xkbcomp:10,xkeyboard:10,xkill:10,xlogo:10,xlsfont:10,xorg:10,xproto:10,xrdb:10,xrefresh:10,xset:10,xterm:10,zip:10,zlib:10,zlib0:10,libqt3support4:10,libqtassistantclient4:10,libqtcore4:10,libqtdbus4:10,libqtdesigner4:10,libqtgui4:10,libqthelp4:10,libqtnetwork4:10,libqtopengl4:10,libqtscript4:10,libqtscripttools4:10,libqtsql4:10,libqtsvg4:10,libqttest4:10,libqtwebkit4:10,libqtxml4:10,libqtxmlpatterns4:10,posix:10,convent:[12,10],hard:10,drive:10,network:10,cygdriv:10,stick:10,had:10,x_yy_z:10,"1_33_1":10,librpc:10,sunrpc:10,track:10,patch1:10,www:[12,10],hdfgroup:10,ftp:10,jpegsrc:10,v6b:10,msweet:10,project3:10,hdf_current:10,precompil:10,xzf:10,root_v5:10,win32gcc:10,due:[12,13,10],visit:10,gminim:10,asimag:10,mathmor:10,accomplish:10,usernam:10,qtdir:10,i686:10,reopen:10,qt56:10,readili:10,startxwinrc:10,status_access_viol:10,ash:10,rebaseal:10,resolv:10,administr:10,privileg:10,extent:10,emploi:10,emphas:10,rout:10,dvd:10,xcodebuild:10,licens:[13,10],x11:10,leopard:10,snow:10,xquartz:10,macosforg:10,trac:10,newest:10,port:10,selfupd:10,remark:[13,10],synchron:10,frequent:10,happen:10,servic:10,firewal:10,svn:10,trunk:10,dport:10,sync:10,pkgconfig:10,qtwebengin:10,past:10,unfortun:10,subject:10,mini:10,michaelrsweet:10,lazi:10,dmg:10,sierra:10,writ:10,root_v6:10,macosx64:10,clang91:10,owner:10,life:[11,13,10],chown:10,chgrp:10,staff:10,exactli:[13,10],wisdom:[12,10],harder:10,adopt:[13,10],parenthes:[13,10],macosx:10,plist:10,doctyp:10,dtd:10,propertylist:10,dict:10,qt3mac:10,stabl:10,crypto:10,unstabl:10,finkcommand:10,boost1:10,nopython:10,shlib:10,libtool2:10,qtwebenginecor:10,qtwebenginewidget:10,bit:10,earlier:10,"1_63_0":10,cpp11:10,circumst:10,finder:10,workaround:10,dyld_library_path:10,mgui:10,differenti:[13,11],diamagnet:[12,11],approxim:11,geometri:11,positron:[12,11],counter:[13,11],precess:11,"3110_tutori":11,conveni:11,underli:11,divid:[12,11],xyz:11,normup:11,bgup:11,phaseup:11,normdown:11,bgdown:11,phasedown:11,normright:11,bgright:11,phaseright:11,asymsig1:11,ratesig1:11,fieldsig1:11,asymsig2:11,ratesig2:11,fieldsig2:11,uncertainti:[12,11],asymmetr:11,lower:[13,11],upper:[13,11],constant:[13,11],background:[13,11],uncorrel:11,three:[12,13,11],remain:11,signal:[12,13,11],holder:11,amplitud:11,depolar:[12,13,11],simplexpo:[13,11],tfieldco:[13,11],map1:[13,11],fun1:[13,11],frequenc:[12,13,11],simplegss:[13,11],fun2:[13,11],predefin:[13,11],multipli:[13,11],sign:11,fun:11,interrel:11,gamma_mu:[13,11],par12:[13,11],par15:11,altogeth:[13,11],deltat_pta_gps_3110:11,fittyp:[13,11],norm:[13,11],backgr:[13,11],map2:[13,11],map3:11,undefin:11,implant:[12,11],exce:11,mino:[12,13,11],mhz:[12,13,11],fourier_pow:[13,11],apod:[13,11],weak:[13,11],medium:[13,11],real_and_imag:[13,11],par3:[13,11],imaginari:[13,11],drawn:[13,11],abscissa:[13,11],ordin:[13,11],use_fit_rang:[13,11],third:[12,13,11],ndf:11,freedom:[13,11],converg:[12,13,11],blue:[13,11],maximum:[13,11],count:[13,11],zoom:[13,11],graph:[13,11],around:[13,11],cursor:[13,11],suitabl:11,repeat:[13,11],proce:11,comma:[13,11],between:[12,13,11],"short":[13,11],conclud:11,attent:[12,13,11],"3111_tutori":11,"3114_tutori":11,"_tutori":11,snapshot:11,dark:11,theme:11,facilit:12,gyromagnet:12,ratio:12,smu:12,outlin:12,literatur:12,reli:12,repeatedli:12,sizabl:12,worth:12,maxim:[12,13],trial:12,deserv:12,effect:[12,13],shift:[12,13],advis:12,prove:12,appreci:12,induct:12,vari:[12,13],dimens:12,incid:12,simul:12,trim:12,arrai:12,total:[12,13],thick:12,solv:12,equat:[12,13],layer:12,account:[12,13],superfluid:12,macroscop:12,dover:12,adjac:12,penetr:12,depth:12,constitu:12,half:12,film:12,userfcn:[12,13],tlondon1dh:12,deg:12,dead:12,tlondon1d1l:12,fraction:[12,13],substrat:12,bilay:12,heterostructur:12,tlondon1d2l:12,trilay:12,tlondon1d3l:12,investig:12,flux:12,probe:12,randomli:12,spatial:12,seri:12,reciproc:12,coeffici:[12,13],coher:[12,13],gaussian:12,cutoff:12,brandt:12,temp:12,phy:[12,13],riseman:[12,13],analyt:12,ginzburg:12,landau:12,yaouanc:[12,13],dalma:[12,13],réotier:[12,13],bessel:[12,13],region:[12,13],triangular:12,grid:12,inter:12,distanc:12,tbulktrivortexlondon:12,tbulktrivortexml:12,tbulktrivortexagl:12,tbulktrivortexngl:12,migrad:[12,13],proven:12,larg:[12,13],futil:12,strategi:[12,13],max_likelihood:[12,13],hess:[12,13],bmw_startup:12,debug:[12,13],one_or_zero:12,deactiv:12,path_to_fil:12,invalid:12,delta_t:12,rest:12,microsecond:12,delta_b:12,resb:12,vortexlattic:12,n_vortexgrid:12,data_path:[12,13],data_path_prefix:12,n_theori:12,invers:12,energy_list:12,energy_label:12,rge:12,expect:[12,13],belong:12,wordsofwisdom:12,trimsp:12,"02_0":12,"03_0":12,"03_6":12,"05_0":12,"05_3":12,relax:[12,13],slr:12,reson:[12,13],lineshap:12,puls:12,evolut:12,salman:12,prl:12,lifetim:[12,13],exponenti:[12,13],exprlx:12,stretch:12,sexprlx:12,expon:[12,13],chemic:12,anisotropi:12,powder:12,mehr:12,solid:[12,13],springer:12,axial:12,symmetr:12,observ:12,paralel:12,perpendicular:12,symmetri:12,anisotrop:12,along:[12,13],loss:12,ellipt:12,linegauss:12,fwhm:12,height:12,lorentzian:12,linelorentzian:12,laplacian:12,linelaplac:12,skew:12,lineskewlorentzian:12,width:[12,13],lineskewlorentzian2:12,convolut:12,powderlineaxiallor:12,powderlineaxialgss:12,powderlineasymlor:12,princip:12,powderlineasymgss:12,gpl:13,philosophi:13,abil:13,fcn:13,sever:13,correl:13,renam:13,msr_file_without_extens:13,msr_file:13,maxlh:13,estimaten0:13,timeout_tag:13,overwrit:13,prevent:13,orphan:13,jam:13,"8472_tf_histo":13,avg:13,graphic_format_extens:13,session:13,"8472_0":13,gif:13,jpg:13,svg:13,xpm:13,"8472_x":13,experiment:13,action:13,canvas:13,toggl:13,spectrum:13,area:13,hair:13,consid:13,beta:13,feed:13,exit:13,"3310_0":13,subtract:13,fopt:13,neither:13,nor:13,pad:13,angular:13,interpret:13,lem15_his_01234:13,rebin:13,fudg:13,elimin:13,sens:13,tweak:13,tdc_hifi_2014_00153:13,mnsi:13,"50k":13,unzoom:13,crosshair:13,gett0frompromptpeak:13,firstgoodbinoffset:13,argument:13,color:13,channel:13,interrupt:13,msr_file_in:13,msr_file_out:13,parc:13,wors:13,aim:13,idf1:13,idf2:13,nexus1:13,nexus2:13,flexibl:13,filenamelist:13,lem10_his_0111:13,lem10_his_0113:13,run3:13,runstart:13,runend:13,rrrr:13,rrrrrr:13,yyyi:13,unless:13,sent:13,stdout:13,compress:13,absent:13,lem10_his_0123:13,lem10_his_0123_v2:13,idf:13,deltat_tdc_gps_:13,d2001:13,deltat_tdc_gps_0123:13,deltat_tdc_gps_0137:13,deltat_tdc_alc_:13,rrr:13,spit:13,psi_gps_:13,psi_:13,"_gps_":13,psi_gps_run_100to117:13,archiv:13,lem10_his_0012:13,rebin25:13,lem10_his_0123_rebin25:13,runno:13,fileformat:13,pta:13,ltf:13,dolli:13,gpd:13,hifi:13,tdc_hifi_2015_00123:13,construct:13,path_to_data:13,write_per_run_block_chisq:13,pearson:13,fourier_set:13,phase_incr:13,phincr:13,increment:13,optim:13,root_set:13,marker_list:13,marker:13,color_list:13,intranet:13,mnt:13,unlik:13,headlin:13,style:13,lower_boundari:13,upper_boundari:13,init:13,alpha:13,asi:13,freq:13,constrain:13,semi:13,par:13,asy1:13,rate1:13,asy2:13,field2:13,rate2:13,whitespac:13,avoid:13,whenev:13,abbr:13,express:13,"const":13,generexpo:13,stg:13,statgssktlf:13,sgktlf:13,dyngssktlf:13,dgktlf:13,statexpkt:13,sekt:13,statexpktlf:13,sektlf:13,dynexpktlf:13,dektlf:13,combilgkt:13,lgkt:13,strkt:13,skt:13,spinglass:13,spg:13,rdanisohf:13,rahf:13,internfld:13,internbsl:13,abragam:13,skewedgss:13,skg:13,staticnkzf:13,snkzf:13,staticnktf:13,snktf:13,dynamicnkzf:13,dnkzf:13,dynamicnktf:13,dnktf:13,muminusexptf:13,mmsetf:13,polynom:13,hayano:13,conden:13,matter:13,keren:13,uemura:13,crook:13,cywinski:13,turner:13,harshman:13,noak:13,kalviu:13,oxford:13,simplifi:13,formula:13,ident:13,compact:13,difficulti:13,simultan:13,address:13,funx:13,complic:13,dictionari:13,libmylibrari:13,tmyfunct:13,auxiliari:13,arithmet:13,divis:13,sin:13,tan:13,aco:13,asin:13,atan:13,cosh:13,sinh:13,tanh:13,acosh:13,asinh:13,atanh:13,exp:13,sqrt:13,pow:13,parx:13,par5:13,mapi:13,denot:13,frac1:13,shorten:13,logic:13,fire:13,addt0:13,rrf_freq:13,rrf_pack:13,rrf_phase:13,exact:13,pie3:13,particular:13,run_file_nam:13,record:13,digress:13,musrfulldatapath:13,colon:13,smith:13,lem07_his_2018:13,musrfulldatapathtoken:13,runnam:13,ext:13,lem07_2018_rb1_npp:13,d2007:13,deltat_pta_gps_2650:13,d2010:13,deltat_tdc_gpd_8472:13,mue1:13,beauti:13,muminu:13,t0addrun1:13,t0addrun2:13,t0addrun1forward:13,t0addrun1backward:13,t0addrun2forward:13,t0addrun2backward:13,sum:13,onlin:13,angl:13,nanosecond:13,fun3:13,transfer:13,ten:13,fgb:13,lgb:13,larger:13,direct:13,span:13,meaningless:13,simplex:13,batch:13,anywher:13,contour:13,mnplot:13,optimum:13,list_of_param_to_be_fix:13,restor:13,freq1:13,freq2:13,complex:13,fit_rang:13,flavor:13,n00:13,n01:13,n10:13,n11:13,nn0:13,nn1:13,inlin:13,scale_n0_bkg:13,fals:13,print_level:13,footnot:13,bigger:13,phd:13,thesi:13,ubc:13,range_for_phase_correct:13,nsec:13,min:13,sub_rang:13,view_pack:13,logx:13,logarithm:13,logi:13,khz:13,par4:13,downward:13,upward:13,unwant:13,rid:13,filter:13,kaiser:13,fail:13,tricki:13,compon:13,ideal:13,uncontrol:13,ghost:13,imperfect:13,distort:13,dispers:13,fold:13,substanti:13,infer:13,math:13,mathrm:13,theoret:13,rearrang:13,unbin:13,histogramm:13,reserv:13,plug:13,simpler:13,why:13,although:13,declar:13,puserfcnbas:13,evalu:13,cassert:13,cmath:13,namespac:13,constructor:13,destructor:13,needglobalpart:13,"void":13,setglobalpart:13,globalpart:13,uint_t:13,idx:13,globalpartisvalid:13,classdef:13,destroi:13,peculiar:13,ness:13,introductori:13,topic:13,const_correct:13,herein:13,classimp:13,assert:13,arg:13,linkdef:13,tmylibrarylinkdef:13,ifdef:13,"__cint__":13,pragma:13,endif:13,wise:13,attach:13,tmylibrari:13,libtmylibrari:13,sensibl:13,bluish:13,node:13,uf1:13,uf2:13,entiti:13,ineffici:13,associ:13,ufx:13,g_ufx:13,consum:13,abrikosov:13,cycl:13,thu:13,overhead:13,tmyglobalfunct:13,isvalid:13,fvalid:13,fprevparam:13,calcsomethingcpuexpens:13,liklei:13,getwhatisneed:13,privat:13,finvokedglob:13,fidxglob:13,fglobaluserfcn:13,static_cast:13,sorri:13,resiz:13,pointer:13,dynamic_cast:13,retriev:13,pseudo:13,increas:13,safeti:13,val0:13,sep:13,val1:13,valn:13,parx0:13,parx1:13,parxn:13,par7:13,par17:13,par22:13,par27:13,par32:13,par37:13,par42:13,par47:13,par52:13,par57:13,par62:13,par67:13,par72:13,par77:13,par82:13,par8:13,fcp:13,bcp:13,relative_bcp:13,parrx0:13,rel:13,summ:13,parxj:13,parr:13,obvious:13,offest:13,internfldgk:13,ifgk:13,internfldl:13,ifll:13,kornilov:13,pomjakushin:13,letter:13,larkin:13,physica:13,condens:13},objects:{},objtypes:{},objnames:{},titleterms:{acknowledg:0,any2mani:[13,1],univers:1,"\u03bcsr":[12,1,13,6,7],file:[8,5,12,1,11,13,7],format:[13,1,7],convert:1,bugtrack:2,how:3,cite:3,musrfit:[8,5,11,13,10,9,3,4],welcom:4,document:[12,4],indic:4,tabl:4,msr2data:[5,13,11],program:5,automat:5,process:[5,11],multipl:[5,11],msr:[5,13,11],basic:[5,8,13,7],type:[5,13],usag:[5,8,13,6],run:[5,13,7],list:5,structur:5,option:[5,10],paramet:[5,8,6],global:[5,13],mode:5,gener:[5,13],extract:5,extend:5,known:5,limit:5,graphic:[5,9,6],user:[5,12,13,6,7],interfac:[5,8,7,6],provid:5,musredit:[5,8,10],mupp:6,plotter:6,script:6,summari:6,musrroot:7,extens:[13,7],open:7,some:7,concern:7,root:[7,10],inform:7,contain:7,runhead:7,runinfo:7,overview:7,tmusrrunhead:7,concept:7,header:7,write:7,read:[7,11],valid:7,requir:[7,10],detectorinfo:7,sampleenvironmentinfo:7,magneticfieldenvironmentinfo:7,beamlineinfo:7,exhaust:7,tree:7,includ:7,everyth:[7,10],tmusrrunphysicalquant:7,possibl:7,represent:7,gui:8,base:8,introduct:[8,12,13],avail:[8,13],execut:[8,13],configur:[8,13],musrgui:[8,10],musredit_startup:8,xml:[8,12,13],featur:8,musrwiz:8,theori:[8,13],"function":[8,12,13],map:[8,13],fit:[8,9,13,11],info:8,creat:8,musrstep:8,set:[9,10],high:9,speed:9,gpu:[9,13],tesla:9,k40c:9,nvidia:9,driver:9,instal:[9,10],cuda:9,via:[9,10],automak:[9,10],cmake:[9,10],amd:9,card:9,radeon:9,"390x":9,app:9,softwar:[9,10],develop:9,kit:9,sdk:9,enabl:[9,13],opencl:[9,13],support:[9,13,10],maco:[9,10],differ:10,platform:10,oper:10,system:10,restrict:10,gnu:10,linux:10,nexu:10,build:10,last:10,step:10,obsol:10,check:10,window:10,cygwin:10,potenti:10,problem:10,mac:10,macport:10,packag:10,from:10,sourc:10,environ:10,variabl:10,fink:10,obsolet:10,tutori:11,singl:[13,11],histogram:[13,11],determin:11,data:[12,11],rang:11,musrt0:[13,11],model:[12,11],view:11,musrview:[13,11],further:11,asymmteri:11,lib:12,meissner:12,profil:12,vortex:12,lattic:12,relat:12,bmw:12,libfitpofb:12,dimension:12,london:12,state:12,isotrop:12,superconductor:12,bulk:12,field:12,distribut:12,mix:12,startup:12,nonloc:12,superconduct:12,screen:12,analyz:12,"\u03b2":12,nmr:12,bnmr:12,libbnmr:12,liblineprofil:12,manual:13,kei:13,shortcut:13,musrft:13,msr2msr:13,dump_head:13,musrfit_startup:13,descript:13,titl:13,fitparamet:13,block:13,command:13,fourier:13,plot:13,statist:13,rrf:13,asymmetri:13,neg:13,muon:13,non:13,without:13,object:13,access:13,technic:13,framework:13},envversion:43}) \ No newline at end of file +Search.setIndex({filenames:["acknowledgement","any2many","bugtracking","cite","index","msr2data","mupp","musr-root","musredit","tutorial","user-libs","user-manual","setup-standard","setup-dks"],titles:["Acknowledgements","any2many - a Universal \u03bcSR-file-format converter","Bugtracking","How to Cite musrfit?","Welcome to the musrfit documentation!","msr2data - A Program for Automatically Processing Multiple musrfit msr Files","mupp - \u03bcSR Parameter Plotter","MusrRoot - an Extensible Open File Format for \u03bcSR","musredit: the GUI Based Interface to musrfit","Tutorial for musrfit","Documentation of user libs (user functions)","User manual","Setting up musrfit on Different Platforms","Setting up musrfit / DKS: High Speed Fitting with GPU’s"],terms:{"\u03b1":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b2":[],"\u03b4":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b7":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b5":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b3":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b9":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03ba":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c7":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03bb":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03bc":[4,1,10,5,13,0,3,11,9,6,12,7,8],"\u03bd":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03bf":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c9":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c0":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c6":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c8":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c1":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c2":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c3":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c4":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b8":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03c5":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03be":[1,10,13,5,0,3,11,9,6,12,7,8],"\u03b6":[1,10,13,5,0,3,11,9,6,12,7,8],bastian:0,wojek:[0,5,3],veri:[0,11,9,12,7,8],much:[0,11,6,7,8],indebt:0,bmw:[],rigor:0,test:[12,0,8],musrfit:[],mani:[10,5,0,11,12,7,8],suggest:[12,0,5],contribut:[9,10,0,11],largest:0,part:[10,0,3,11,9,12,7,8],user:[],manual:[],which:[10,13,5,0,11,9,6,12,7,8],make:[13,0,11,12,7,8],access:[],broader:0,audienc:0,thank:0,uldi:0,locan:[13,0,3],work:[10,13,5,0,11,12,7,8],enabl:[],gpu:[],support:[],kind:[7,10,0],calm:0,extrem:0,compet:0,wai:[10,13,5,0,11,9,6,12,7,8],deal:[10,13,0,11,9,12,7],project:[12,0],well:[10,13,5,0,11,9],chao:0,physicist:0,think:0,admir:0,allow:[1,10,13,5,11,6,12,7,8],most:[1,10,13,5,11,12,7],from:[],other:[1,13,11,9,6,12,7],detail:[1,10,13,11,9,12,7,8],descript:[],see:[1,10,13,5,11,9,6,12,7,8],here:[1,13,5,11,9,6,12,7,8],report:2,bug:[2,8],request:[11,9,6,2,12],"new":[5,11,9,2,12,7,8],featur:[],improv:[2,12,10],pleas:[10,5,3,11,9,2,12,7],bitbucket:[2,12,11],repo:[13,2,12],prefer:[2,12,11,8],send:[2,11],mail:2,suter:[2,13,3],psi:[10,13,11,9,2,12,7,8],sinc:[13,5,11,3,9,12,7],quit:[11,3,12,7,8],some:[],effort:3,develop:[],mainten:[7,3],packag:[],you:[13,11,3,6,12,7,8],should:[10,13,5,3,11,9,6,12,7,8],least:[5,11,3,9,12],your:[13,5,11,3,12,8],"public":[12,10,11,3],have:[10,13,5,3,11,9,12,7,8],analyz:[],data:[],even:[5,11,3,12,7],better:[11,5,3],cours:[12,11,5,3],properli:[13,11,5,3],refer:[10,13,3,11,9,12,7,8],given:[10,13,5,3,11,9,6,12,7,8],beneath:[8,3],free:[10,11,3,12,7,8],platform:[],independ:[10,11,3],framework:[],analysi:[10,13,5,3,11,9,12,7],physic:[13,11,7,3],procedia:3,http:[10,13,11,3,12,7,8],doi:3,org:[12,3],phpro:3,high:[],speed:[],version:[10,13,3,11,6,12,7,8],util:[13,11,3,12,7],"case":[10,13,5,3,11,9,6,12,7,8],thi:[10,13,5,3,11,9,6,12,7,8],also:[10,13,5,3,11,9,6,12,7,8],add:[13,5,3,11,9,6,12,7,8],follow:[10,13,5,3,11,9,6,12,7,8],citat:3,adelmann:3,dynam:[13,3],kernel:[13,3],schedul:[13,3],comput:[13,12,3],commun:3,cpc:3,real:[13,11,3,9,12],time:[10,13,3,11,9,6,12,7,8],paramet:[],fit:[],imag:[9,11,3],reconstruct:3,graphic:[],process:[],unit:[9,11,7,3],conf:[13,12,3],proc:3,jpscp:3,tutori:[],singl:[],histogram:[],asymmteri:[],introduct:[],avail:[],execut:[],configur:[],basic:[],usag:[],msr:[],type:[],"function":[],technic:[],lib:[],meissner:[],profil:[],vortex:[],lattic:[],relat:[],nonloc:[],superconduct:[],screen:[],nmr:[],bnmr:[],set:[],differ:[],oper:[],system:[],softwar:[],requir:[],restrict:[],gnu:[],linux:[],window:[],mac:[],maco:[],tesla:[],k40c:[],nvidia:[],amd:[],card:[],radeon:[],"390x":[],opencl:[],musredit:[],gui:[],base:[],interfac:[],musrwiz:[],musrstep:[],mupp:[],plotter:[],script:[],summari:[],msr2data:[],program:[],automat:[],multipl:[],option:[],global:[],mode:[],known:[],limit:[],provid:[],musrroot:[],extens:[],open:[],concern:[],root:[],tmusrrunhead:[],concept:[],runinfo:[],detectorinfo:[],sampleenvironmentinfo:[],magneticfieldenvironmentinfo:[],beamlineinfo:[],exhaust:[],tree:[],includ:[],everyth:[],tmusrrunphysicalquant:[],possibl:[],represent:[],index:[4,5,11],search:[12,4,11],page:[4,13,9,12,7,8],origin:[10,11,5,8],written:[10,5,11,9,7,8],implement:[10,13,5,11,12,7,8],purpos:[9,12,5,11],input:[9,11,5,8],same:[10,13,5,11,9,6,12,7],summar:[9,5],result:[10,5,11,9,7,8],either:[10,5,11,9,6,12,8],triumf:[9,11,5,8],column:[5,11,9,7,8],ascii:[10,5,11,9,8],essenti:[11,7,5,8],collect:[10,5,11,9,6,12,7,8],old:[12,5,11],abridg:5,produc:[9,12,5,11],can:[10,13,5,11,9,6,12,7,8],view:[],instanc:[5,11,6,12,7],howev:[13,5,11,9,12],thei:[13,5,11,9,12,7],complet:[13,10,5,9,12],backward:[7,5,11],compat:[13,12,5,11],languag:5,name:[10,13,5,11,9,6,12,7,8],longer:5,than:[5,11,9,12,7,8],five:[9,5],six:5,charact:[5,11],order:[10,13,5,11,12,7],establish:5,need:[10,13,5,11,9,12,7,8],ensur:[5,11],correct:[5,11,9,12,8],length:[10,7,5],apart:[12,10,5],numer:[12,10,5],might:[10,5,11,6,12,7,8],principl:[12,10,5],four:5,call:[10,5,11,9,6,12,7,8],suppli:[13,10,5,11],number:[10,13,5,11,9,6,12,7,8],firstrunno:5,lastrunno:5,interv:[5,11],specifi:[10,5,11,9,12,7,8],through:[10,5,11,9,12,7],first:[10,13,5,11,9,6,12,7,8],last:[],condit:[10,5],necessari:[5,11,9,12,7,8],runlist:[5,11],where:[10,13,5,11,9,6,12,7,8],combin:[5,11,9,7,8],run0:5,run1:[5,11],run2:[5,11],runn:5,rang:[],step:[],sequenc:[9,5,11],posit:[9,7,5,11],integ:[7,5,11],etc:[13,5,11,12,7,8],runlistfilenam:5,contain:[],extern:[10,5,11,12,7],pass:[11,5,8],below:[10,5,11,9,12,7],all:[13,5,11,9,6,12,7,8],mandatori:[10,7,5,11],right:[10,5,11,9,12,7],after:[13,5,11,9,12,7,8],mean:[10,13,5,11,9,6,12,7,8],becom:[12,5],clear:[11,7,5,8],give:[5,11,9,12,7],exampl:[10,5,11,9,6,12,7,8],"_tf_h13":5,out:[13,5,11,9,6,12,7,8],chang:[13,5,11,12,8],"8472_tf_h13":5,"8473_tf_h13":5,"8474_tf_h13":5,"8470_tf_h13":5,directori:[10,13,5,11,9,12,7,8],put:[12,11,5,8],var1:5,var2:5,var3:5,comment:[13,5,11,6,12,7,8],empti:[8,11,5,6],line:[10,5,11,9,6,12,7,8],determin:[],label:[10,5,11,6,7,8],present:[10,13,5,11,9,6,12,7,8],preced:5,mention:[10,5,11,12,7],togeth:[5,11,9,12,7,8],abov:[10,13,5,11,9,6,12,7,8],output:[10,5,11,9,6,8],onli:[10,13,5,11,9,6,12,7,8],newli:[9,5,8],creat:[],did:[12,5],exist:[12,5,11],befor:[10,13,5,11,9,12,7,8],invok:[8,11,5,6],were:[11,7,5,8],alreadi:[13,5,11,12,8],would:[10,13,5,11,9,6,12,7,8],append:[12,5,11],been:[10,5,11,9,12,7,8],header:[],block:[],forc:[5,11],suppress:5,nohead:[5,8],shall:[10,5,11,9,12,7,8],seen:[9,7,5],later:[9,12,5,11],like:[10,13,5,11,6,12,7,8],behavior:[5,11],ani:[13,5,11,9,12,7,8],simpl:[10,5,11,9,12],"default":[13,5,11,12,8],dat:[10,5,11,9,6,8],delet:[7,5],inform:[],both:[12,10,5,11],none:[9,11,5,8],write:[],sole:[5,11],assum:[10,13,5,11,9,12,7,8],nosummari:[5,8],attempt:5,read:[],addit:[10,13,5,11,9,12,7,8],temperatur:[5,11,9,6,7],appli:[10,5,11,9,12,7],magnet:[10,7,5,8],field:[],paramlist:5,param:[8,11,5,6],select:[13,5,11,9,6,12,7,8],"export":[13,5,11,9,12],startno:5,endno:5,space:[12,10,5,11],separ:[5,11,9,12,8],outputfilenam:[5,11],instead:[10,13,5,11,6,12],equal:[9,5,11],insensit:5,addition:[5,11,9,12,8],"final":[10,5,11,9,12],templat:[9,11,5,8],perform:[5,11,9,6,12,7,8],mlog:[11,5,8],subsequ:[5,11],chain:[5,8],exclam:5,mark:[5,11],without:[],keep:[11,7,5,8],mn2:[5,11],done:[10,13,5,11,9,6,12,7],ignor:[11,5,6],titl:[],illustr:[5,11],few:[5,11,12,7,8],explan:[5,11],oabc:5,"8400_tf_h13":5,"8460_tf_h13":5,abc:5,about:[5,11,9,12,7],"_zf":5,def:5,"8472_zf":[5,8],"8500_zf":5,"8502_zf":5,"8503_zf":5,"8504_zf":5,"8507_zf":5,oghi:5,ouput:5,ghi:5,take:[10,5,11,9,12],"8471_tf_h13":5,"8475_tf_h13":5,bestdata:5,"8476_tf_h13":5,"8477_tf_h13":5,"8478_tf_h13":5,"8479_tf_h13":5,describ:[10,13,5,11,9,12,7,8],anoth:[5,11,6,7,8],each:[10,5,11,9,6,12,7],defin:[10,5,11,9,6,12,7,8],common:[12,5,11],specif:[10,5,11,9,12,7,8],when:[10,5,11,9,12,7,8],obtain:[10,7,5],valid:[],conjunct:[10,5,11],invoc:[5,11],state:[],idea:[9,7,5,11],basi:5,identifi:[5,11],tag:[10,5,11,9,6,12,8],current:[10,13,5,11,6,12,7,8],"0xu":5,digit:[5,11],lead:[10,5,11,7,8],zero:[5,11,9,7,8],end:[5,11,9,6,12,7,8],alpha0123:5,alpha00123456:5,fitparamet:[],exemplari:[5,11],"8472_exampl":5,could:[10,13,5,11,6,12,8],therefor:[10,5,11,9,12],look:[10,13,5,11,6,12,7,8],valu:[13,5,11,9,12,7,8],pos_error:[9,5,11],boundari:[10,5,11,9,8],phase:[10,5,11,9,8],asy8472:5,rate8472:5,treat:[12,5],wherea:[11,5,8],normal:[9,12,5,11],within:[10,5,11,9,6,12,7,8],appear:[5,11],explicitli:[11,5,8],theori:[],those:5,met:5,"try":[12,5,11],substitut:[9,12,5,11],them:[10,5,11,9,7,8],map:[],accordingli:[9,12,5,6],"_exampl":5,global_exampl:5,alwai:[10,7,5,11],start:[13,5,11,9,6,12,7,8],asy8471:5,rate8471:5,asy8470:5,rate8470:5,show:[5,11,9,6,7,8],reorgan:5,begin:[12,7,5,11],copi:[12,11,5,8],found:[10,13,5,11,9,12,7,8],dure:[10,5,11,6,12],affect:5,occurr:[12,5],awar:[12,5,11],fact:[12,5],propag:5,model:[],usual:[10,5],store:[10,5,12,7,8],reach:[5,11],goal:[5,11],obei:[5,11],certain:[10,5],rule:[11,7,5,8],match:[5,11],accord:[5,11,9,12,8],achiev:[9,12,5],easili:[13,12,5,8],shown:[5,11,9,6,7,8],globalfit:5,relev:[5,11,9,7,8],pre:[5,8],afterward:[10,13,5,11,6,12,7],special:[7,5,11],replac:[12,5,11],review:5,activ:[12,10,5,8],choos:[10,5,11,9,12,8],keyword:[5,11],onerunfit_exampl:5,onerunfit:5,everi:[12,11,5,6],similar:[12,5],explain:[10,13,5,11,9,12,7,8],moment:[12,10,7,5],peopl:[12,7,5],cannot:[10,5,11],behav:[10,5],integr:[10,5],filenam:[7,5,11],rightmost:5,highest:[12,5],treatabl:5,statist:[],itself:[9,5],more:[13,5,11,9,6,12,7,8],creativ:5,care:[12,5,11],addrun:[5,11],statement:[5,11],simpli:[12,5,11],probabl:[12,7,5],what:[10,13,5,11,9,12],two:[10,5,11,9,12,7,8],success:[9,7,5,11],encount:5,actual:[12,10,5,11],measur:[10,5,11,9,6,7,8],introduc:[9,7,5,11],reason:[9,12,5,11],shape:[10,5,11],design:[12,5],especi:[10,13,5,11,12,7],manipul:[11,5,8],front:[9,7,5,8],offer:[9,5,11],almost:[11,5,8],self:[5,8],explanatori:[5,8],depict:[5,11],under:[13,5,11,6,12,7,8],stai:5,enter:[13,12,5,8],otherwis:[13,12,5,11],serv:[9,5,11],second:[10,5,11,9,12,8],noth:[11,7,5,8],correspond:[5,11,9,6,12,7,8],littl:[8,11,6],helper:[12,8,7,6],quickli:[13,6],plot:[],handl:[10,11,6,12,7,8],heavili:[10,6],inspir:6,via:[],command:[],directli:[11,6,12,7,8],typic:[13,11,6,12,8],load:[10,6],dialog:[8,6],tri:[12,11,6],fly:[9,6],drag:[9,6],over:[12,11,6],axi:[10,11,9,6,7],wish:[11,6],click:[8,11,6],analog:6,remov:[11,6],often:[12,8,11,6],compar:[13,12,11,6],trend:6,hold:[11,7,6],energi:[10,7,6],scan:[11,6],now:[13,11,9,6,12],interest:[12,11,6],ditto:6,less:[12,11,6],error:[10,13,11,9,6,12,7,8],prone:[13,8,6],quicker:[11,6],button:[9,8,11,6],mupp_plot:6,applic:[10,13,11,6,12,8],refresh:6,reload:[8,6],beamtim:6,grow:6,task:6,mous:[11,6],gambl:6,futur:[12,8,6],plane:6,help:[13,11,6,12,8],cmd:[12,6],manner:[12,6],updat:[13,11,9,6,12],web:[11,6,12,7,8],interact:[9,10,11,6],figur:[11,7,6],loadpath:6,dir:6,path:[13,11,9,6,12,7,8],bash:[12,6],variabl:[],home:[10,13,11,6,12,7,8],accept:[8,11,6],coll:6,selectal:6,carri:[12,11,6],ybco:6,"40nm":6,t5k:6,fc150mt:6,escan:6,addx:6,addi:6,savepath:6,save:[10,11,9,6,12,7,8],place:[9,12,11,6],macro:6,fln:[11,6],txt:[12,6],t30k:6,t60k:6,t120k:6,fieldvsenergi:6,pdf:[11,6],"true":[10,11,7,6],best:[10,11,6,12,7],ever:[7,6],thie:6,labl:6,until:[9,7,11],bulk:[],instrument:[11,7,8],bin:[11,9,12,7,8],fix:[9,11,7,8],binari:[12,7],rather:[12,11,7,8],stringent:7,lem:[10,7,11],cern:[12,7,11],tightli:7,tailor:7,situat:[12,7,11],unsatisfactorili:7,henc:[13,11,9,12,7],decid:[12,7,11],move:[9,7,11],forward:[9,13,7,11],acquisit:7,mida:7,respons:[13,7,11],build:[],decai:[9,7,11],easi:[7,8],object:[],th1f:7,orient:[10,7],mine:7,frame:[13,7,11],tfile:7,eas:[12,7,11],understand:[7,11],upcom:7,definit:[9,7,11],thing:[13,11,12,7,8],check:[],guid:[13,7,11],organ:[11,7,8],similarli:[7,11],browser:7,inspect:7,tbrowser:7,deriv:[7,11],tobject:7,small:[10,13,11,12,7,8],subset:[7,11],tfolder:7,top:7,level:[7,11],tobjarrai:7,tobjstr:7,content:[12,7,11],form:[10,13,11,9,12,7],box:[13,7,8],entri:[7,11],sketch:[7,11],histo:[11,9,12,7,8],decayanamodul:7,hdecay001:7,hdecay002:7,scanamodul:7,hsampletemperatur:7,hsamplemagneticfield:7,detector001:7,detector002:7,hdecayxxx:7,xxx:7,"int":7,"03d":7,notat:[7,11],"class":[10,7,11],folder:[12,7],next:[10,13,11,12,7,8],section:[12,7,11],slow:7,control:[13,7,11],sampl:[13,9,10,7],versu:7,again:[13,11,12,7,8],meta:7,minim:[10,11,9,12,7],bracket:7,item:[7,11],detector:[10,11,9,7,8],environ:[],beamlin:[9,11,7,8],elabor:[13,7],word:7,sub:[9,12,7,11],intern:[11,7,8],tstring:7,git:[13,12,7,11],url:7,xsd:7,wrote:7,nemu_analyz:7,deltat_tdc_gps_4295:7,int_t:[7,11],iso:7,date:[9,7,11],stop:7,durat:7,sec:[7,11],laboratori:7,muon:[],beam:7,momentum:[9,10,7],mev:7,speci:7,neg:[],sourc:[],target:7,low:[10,7,11],setup:[13,12,7,11],cf1:7,wxy:7,resolut:[10,7],redgreen:[7,11],offset:[7,11],tintvector:7,except:[12,11,7,8],shortli:[7,11],discuss:[13,11,7,8],experi:[7,11],stimuli:7,electr:7,off:[7,11],doubl:[7,11],distinguish:7,easier:[12,7],let:7,sai:7,red:[13,11,9,12,7],green:[9,7,11],browsabl:7,string:[12,11,7,8],tobjstringv:7,quantiti:7,repres:[9,7,11],properti:[7,11],estim:[10,11,7,8],demand:[7,11],depend:[10,13,11,9,12,7,8],musrrootv:7,mock:7,print:[11,7,8],notic:[11,7,8],find:[13,11,12,7,8],encod:[10,11,12,7,8],price:7,pai:7,shade:7,"import":[7,11],approach:[12,7,11],standard:[13,12,7,11],"abstract":[7,11],text:[9,11,7,8],though:[12,7,8],clean:[13,12,7],lot:[7,11],"2nd":7,slightli:[13,11,7,8],advantag:[12,11,7,8],maintain:7,expand:7,classifi:7,group:[12,11,7,8],previou:[7,11],"float":7,point:[10,11,9,12,7,8],double_t:[7,11],tstringvector:7,tdoublevector:7,themselv:[10,7],vector:[10,7,11],code:[10,13,11,9,12,7],snippet:[7,11],reader:7,routin:[12,10,7,11],convers:[7,11],write_musrroot_runhead:7,full:[9,12,7,11],concentr:7,just:[13,10,11,12,7],prop:7,further:[],down:[9,11,7,8],deltat_tdc_gps_2871:7,come:[12,7,8],overload:7,pathnam:7,method:[7,11],tdc:[7,11],cf3:7,mrh_undefin:7,strang:7,fed:[7,11],whole:7,someth:[13,12,7,11],recreat:[7,8],iszombi:7,"return":[7,11],info:[],fillfold:7,close:[12,11,7,8],read_musrroot_runhead:7,getobject:7,cerr:[7,11],endl:[7,11],couldn:[7,11],get:[13,11,12,7,8],closefil:7,extractal:7,decod:7,fill:[9,7,11],getter:7,bool_t:[7,11],ival:7,cout:7,els:[12,11,7,8],getvalu:7,geterror:7,getunit:7,getdemand:7,getdescript:7,mechan:[7,11],inde:7,minimum:7,scheme:7,musrrootvalid:7,recurs:7,pars:7,temporari:7,xml:[],ampl:[7,11],parser:[12,7],hand:[12,7,11],decent:7,book:7,libxml2:[12,7],becaus:[7,8],suppos:[12,7,11],against:7,schema:7,lmu:[7,8],semant:7,preform:7,cross:[12,7,11],facil:[11,7,8],musrrootlem:7,poitiv:7,wew:7,hdecay023:7,detector023:7,potenti:[],discontinu:7,"break":7,element:7,left:[10,7,8],npp:[11,9,12,7,8],spectromet:[9,13,7,11],good:[12,11,7,8],enough:[12,7,11],cryo:7,cryostat:7,oven:7,konti:7,pim3:[9,7,11],hypothet:7,light:7,per:[11,7,8],bottom:7,split:[12,7,11],mind:7,symbol:[12,7],hdecay003:7,hdecay004:7,hdecay007:7,hdecay008:7,hdecay011:7,hdecay012:7,hdecay013:7,hdecay014:7,hdecay017:7,hdecay018:7,hdecay021:7,hdecay022:7,hdecay024:7,hdecay027:7,hdecay028:7,hdecay031:7,hdecay032:7,hdecay033:7,hdecay034:7,hdecay037:7,hdecay038:7,continu:7,"switch":[13,11,12,7,8],jump:[7,11],cpp:[7,11],"00z":7,nemu:[12,7,11],lem12_his_0234:7,said:7,detector038:7,insert:7,x123:7,perp:7,spin:[9,10,7,11],mue4:[11,7,8],scalerinfo:7,runsummari:7,wed:7,oct:7,lco:7,wtf:7,kev:[10,7],ledb:7,buc:7,edit:[9,12,7,8],euc:7,event:[9,7],event_0:7,mcp1:7,event_1:7,mcp2:7,event_2:7,lemusr:7,problem:[],deviat:[7,11],hereaft:7,snip:7,somewher:[12,7,8],token:[7,11],val:[7,11],err:7,cf4:7,cf5:7,editor:[9,12,8],suit:[9,10,11,8],intend:[12,11,8],eventu:[9,8],drop:[12,8],outdat:[12,11,8],earli:[11,8],anymor:[12,8],still:[12,10,11,8],urg:8,strongli:[12,11,8],recommend:[12,10,8],shell:[12,11,8],tab:[11,8],startup:[],displai:[12,10,11,8],locat:[10,11,9,12,8],proof:8,exec_path:8,path_to_exec:8,musrview:[],musrt0:[],insid:[12,10,11,8],default_save_path:8,save_path:8,msr_default_file_path:8,msr_def_path:8,timeout:[11,8],canva:[9,11,8],keep_minuit2_output:8,flag:[11,8],minuit2:[12,11,8],kept:[11,8],dump_ascii:8,dump:[11,8],dump_root:8,title_from_data_fil:8,chisq_pre_run_block:8,chisq:[9,11,8],estimate_n0:8,procedur:[10,11,9,12,8],musrview_show_fouri:8,fourier:[],transform:[10,11,9,12,8],domain:[9,11,8],musrview_show_avg:8,averag:[10,11,8],power:[13,11,9,12,8],spectra:[11,8],enable_musrt0:8,font_set:8,font:[12,8],font_nam:8,font_siz:8,size:[11,8],msr_file_default:8,institut:[9,11,8],inst:8,ral:8,jparc:8,file_format:[11,8],nexu:[],musr:[11,8],ppc:[9,11,8],mdu:[9,11,8],wkm:[9,11,8],mud:[9,11,8],lifetime_correct:8,lifetimecorrect:[11,8],msr2data_default:8,tick:8,chain_fit:8,write_data_head:8,ignore_data_header_info:8,write_column_data:8,create_msr_file_onli:8,fit_onli:8,global_plu:8,recreate_data_fil:8,open_file_after_fit:8,experienc:[12,8],who:8,help_sect:8,variou:[12,11,8],messag:[11,8],musr_web_x:8,link:[12,11,8],main:[9,12,8],musrft:[],func_pixmap_path:8,pix_path:8,latex:8,pixmap:8,visual:[9,8],theory_funct:8,syntax:[11,8],func:8,menu:[9,12,11,8],pictur:8,utf:[12,10,11,8],xmln:[11,8],html:8,usr:[12,8],local:[13,12,10,8],share:[13,12,11,8],doc:[9,12,11,8],chisq_per_run_block:8,recent_fil:8,path_file_nam:8,musr_web_main:8,musr_web_titl:8,thetitl:8,musr_web_paramet:8,thefitparameterblock:8,musr_web_theori:8,thetheoryblock:8,musr_web_funct:8,thefunctionsblock:8,musr_web_run:8,therunblock:8,musr_web_command:8,thecommandsblock:8,musr_web_fouri:8,thefourierblock:8,musr_web_plot:8,theplotblock:8,musr_web_statist:8,thestatisticblock:8,musr_web_msr2data:8,musr_web_musrft:8,a_2:8,"3_musrft":8,monospac:8,latex_imag:8,asymmetri:[],png:[11,8],statgsskt:[11,8],rate:[9,10,11,8],"static":[12,10,8],gauss:[9,10,11,8],respect:[10,11,9,12,8],bar:[11,8],keyboard:[9,8],shortcut:[],scratch:8,too:[12,8],priori:8,knowledg:8,calcul:[9,10,11,8],log:[10,11,8],max:[11,8],likelihood:[10,11,8],kei:[],alt:8,equival:[12,11,8],mai:[12,11,8],chosen:[12,11,8],swap:[11,8],vice:[11,8],versa:[11,8],adjust:[9,12,11,8],initi:[10,11,9,12,8],fitter:8,own:[11,8],docu:[13,11,8],raw:[11,8],dump_head:[],stage:[11,8],wand:8,coupl:[13,11,8],dialogu:8,briefli:8,explicit:[11,8],year:[13,11,8],pull:[12,8],choosen:8,rrf:[],minu:8,transvers:[9,11,8],longitudin:8,choic:[12,11,8],question:[11,8],ask:[12,8],correctli:[9,12,11,8],proper:[13,11,8],prompt:[13,12,11,8],peak:[10,11,8],pop:8,disadvantag:8,freeli:8,custom:[11,8],cost:8,yourself:8,stand:[13,8],whatev:[13,8],press:[9,11,8],syntact:8,appropri:[13,8],previous:8,handi:8,furthermor:[12,11,8],pack:[9,12,11,8],minuit:[10,11,8],reset:[11,8],sometim:[11,8],went:[12,8],wrong:8,leav:8,far:[11,8],iter:[10,11,8],individu:[11,8],tediou:[10,8],popup:8,asym:8,uncheck:8,unselect:8,modifi:[10,8],degre:[9,11,8],cancel:8,anyth:[11,8],scale:[11,8],factor:[11,8],absolut:[9,12,11,8],explor:[13,12],hal:[13,11],memo:[13,11],rotat:[9,13,11],tremend:[13,12],muonium:[13,11],appl:[13,12],cpu:[13,12,11],straight:13,multi:[13,12,11],thread:[13,12,11],doesn:13,openmp:[13,12,11],shop:13,bui:13,gamer:13,sure:[13,12,11],server:[13,12],suffici:[13,10],strong:[9,13,11],yet:[13,9,10,11],fall:[13,11],back:[13,11],conceptu:13,latest:[13,12],hardwar:13,crunch:13,readi:[13,12,11],acceler:[13,11],termin:[13,9,12,11],lspci:13,grep:[13,12],corpor:13,gk110bgl:13,rev:[13,10,11],recogn:13,download:[13,12],center:[13,10],hat:[13,12],enterpris:13,rhel:[13,12],rpm:[13,12],diag:13,rhel7:13,x86_64:13,conflict:13,nouveau:13,reboot:13,machin:[13,12,10],omit:[13,12,11],thin:[13,10],host:13,incorpor:13,paper:13,wiki:13,brief:[13,12],clone:[13,12],got:13,consist:[13,10,11],gitlab:[13,12,11],uldis_l:13,mkdir:[13,12],denable_musr:13,dcmake_install_prefix:[13,12],exec:13,non:[],librari:[13,12,10,11],"super":13,sbin:[13,12],ldconfig:[13,12],ld_library_path:[13,12],launchctl:[13,12],setenv:[13,12],checkout:[13,12],branch:[13,12],dks6:13,soon:12,want:[12,11],tell:11,aslib:12,bmwlib:12,prefix:12,rootsi:[13,12],lookup:13,superus:[13,12],ddk:13,disabl:[13,12,11],daslib:[13,12],dbmwlib:[13,12],dnexu:[13,12],vga:13,advanc:13,micro:[13,11],devic:13,inc:13,ati:13,hawaii:13,grenada:13,"290x":13,amdgpu:13,pro:[13,12],unpack:[13,12],tar:[13,12,11],jxvf:13,blabla:13,usermod:13,video:13,technolog:13,materi:13,leverag:13,amp:13,xvjf:13,sdkinstal:13,linux64:13,bz2:[13,11],opt:[13,12,11],amdappsdk:13,note:[13,12,10,11],instruct:[13,12,11],compil:[13,12,11],xcode:[13,12],deliv:13,easiest:[13,12],involv:[13,10],demonstr:12,"while":12,brave:12,virtual:12,encourag:12,gcc:[12,11],tool:[12,11],autoconf:12,libtool:12,toolchain:[],drope:[],releas:[12,11],plan:[],pkg:12,config:12,boost:12,spirit:12,scientif:[12,10,11],effici:[12,10,11],mathemat:[12,11],fftw:12,fast:12,discret:[9,12],toolkit:12,gnome:12,hdf4:[12,11],manag:12,hdf5:[12,11],minixml:12,neutron:12,rai:12,scienc:12,focus:12,seriou:12,distribut:[],fedora:12,debian:12,ubuntu:12,mint:12,opensus:12,nativ:12,microsoft:12,distributor:12,taken:[12,11],dev:12,devel:12,trick:12,never:12,qt4:12,yum:12,gsl:12,qtwebkit:12,qt5:12,epel:12,qtbase:12,qtsvg:12,dpkg:12,apt:12,libboost:12,libgsl:12,libfftw3:12,libqt4:12,libqtwebkit:12,qtbase5:12,libqt5svg5:12,libqt5webkit5:12,everyon:12,know:12,himself:12,doe:[12,11],websit:12,engin:12,mxml:12,hdf:12,libmxml1:[],libmxml:12,libhdf4:12,libhdf5:12,urgent:[12,11],isi:[12,11],safe:[12,11],master:12,repositori:12,github:12,com:12,nexusformat:12,denable_hdf5:12,denable_hdf4:12,denable_mxml:12,sudo:12,flavour:12,legaci:12,incompat:12,guess:[12,11],warn:[12,11],upgrad:12,recompil:12,redhat:12,libx11:12,libxft:12,libxpm:12,libxext:12,systemat:12,term:12,offici:12,root_build:12,dgminim:12,dasimag:12,dmathmor:12,dminuit2:12,dxml:12,root_exec:12,multicor:12,miss:[12,11],told:12,luke_skywalk:12,echo:12,bashrc:12,bash_profil:12,restart:12,onc:[9,12,10,11],proceed:12,recent:[12,11],muonspin:12,root5:[],root6:12,newer:12,dec:12,whether:11,uninstal:[],xarg:12,install_manifest:12,altern:[12,11],autogen:[],prepar:12,successfulli:[12,11],makefil:11,besid:[],fftw3:[12,10],boostinc:[],qt3:12,qt47:[],lib64:[],omp:11,parallel:[9,10,11],detect:9,permiss:[],dbnmrlib:12,bnmrlib:12,dqt_based_tool:12,dqt_version:12,auto:12,dtry_openmp:12,core:12,finish:[9,12],musrfitpath:12,musrfit_startup:[],built:[12,11],everth:[],src:12,musredit_qt5:12,qmake:12,fine:12,skip:12,higher:12,uic:12,quick:[12,11],hasn:12,adventur:12,advic:12,wonder:12,occur:12,great:12,gain:12,nice:[12,10],unix:12,revis:[12,11],fulfil:12,abl:12,a2p:12,passwd:12,binutil:12,bison:12,bzip2:12,colorgcc:12,coreutil:12,curl:12,cygutil:12,editright:12,findutil:12,flex:12,adob:12,dpi100:12,dpi75:12,alia:12,bitstream:12,ibm:12,type1:12,sun:12,misc:12,xfree86:12,fontconfig:12,freeglut:12,gawk:12,gcc4:12,fortran:12,gccmakedep:12,gettext:12,ghostscript:12,std:[12,11],giflib:12,gmp:12,groff:12,gzip:12,inputproto:12,jasper:12,jpeg:12,lapack:12,libbz2_1:12,libcharset1:12,libcurl4:12,libfftw3_3:12,libgcc1:12,libgd:12,libgif:12,libgl:12,libgl1:12,libglu:12,libglu1:12,libglut:12,libglut3:12,libgmp:12,libgmp3:12,libgomp1:12,libic:12,libice6:12,libjpeg:12,libjpeg62:12,liblapack:12,libmpfr:12,libmpfr1:12,libncurs:12,libncurses9:12,libosmesa:12,libosmesa7:12,libpng:12,libpng14:12,libreadline6:12,libsm:12,libsm6:12,libssh2_1:12,libstdc:12,libtiff:12,libtiff5:12,libx11_6:12,libxau:12,libxau6:12,libxaw7:12,libxcb:12,xlib:12,libxcursor:12,libxcursor1:12,libxdmcp:12,libxdmcp6:12,libxext6:12,libxfix:12,libxfixes3:12,libxfont:12,libxfont1:12,libxft2:12,libxi:12,libxi6:12,libxkbfile1:12,libxmu:12,libxmu6:12,libxpm4:12,libxrend:12,libxrender1:12,libxt:12,libxt6:12,login:12,makedepend:12,man:12,mpfr:12,nano:12,opengl:12,openssh:12,openssl:12,pdftk:12,perl:12,ping:12,psutil:12,python:12,readlin:12,rebas:12,rgb:[12,11],rsync:12,sed:12,subvers:12,tcltk:12,terminfo:12,unzip:12,vim:12,w32api:12,icon:[9,12,11],xauth:12,xextproto:12,xfontsel:12,xinit:12,xkbcomp:12,xkeyboard:12,xkill:12,xlogo:12,xlsfont:12,xorg:12,xproto:12,xrdb:12,xrefresh:12,xset:12,xterm:12,zip:12,zlib:12,zlib0:12,libqt3support4:12,libqtassistantclient4:12,libqtcore4:12,libqtdbus4:12,libqtdesigner4:12,libqtgui4:12,libqthelp4:12,libqtnetwork4:12,libqtopengl4:12,libqtscript4:12,libqtscripttools4:12,libqtsql4:12,libqtsvg4:12,libqttest4:12,libqtwebkit4:12,libqtxml4:12,libqtxmlpatterns4:12,posix:12,convent:[12,10],hard:12,drive:12,network:12,cygdriv:12,stick:12,had:12,x_yy_z:12,"1_33_1":12,librpc:12,sunrpc:12,track:12,patch1:12,www:[12,10],hdfgroup:12,ftp:12,jpegsrc:12,v6b:12,msweet:12,project3:12,hdf_current:12,precompil:12,xzf:12,root_v5:12,win32gcc:12,due:[12,10,11],visit:12,gminim:12,asimag:12,mathmor:12,accomplish:12,usernam:12,qtdir:12,i686:12,reopen:12,qt56:[],readili:12,startxwinrc:12,status_access_viol:12,ash:12,rebaseal:12,resolv:12,administr:12,privileg:12,extent:12,emploi:12,emphas:12,rout:12,dvd:12,xcodebuild:12,licens:[12,11],x11:12,leopard:12,snow:12,xquartz:12,macosforg:[],trac:[],newest:12,port:12,selfupd:12,remark:[12,11],synchron:12,frequent:12,happen:12,servic:12,firewal:12,svn:12,trunk:12,dport:12,sync:12,pkgconfig:12,qtwebengin:12,past:12,unfortun:12,subject:12,mini:12,michaelrsweet:12,lazi:12,dmg:12,sierra:12,writ:12,root_v6:12,macosx64:12,clang91:12,owner:12,life:[9,12,11],chown:12,chgrp:12,staff:12,exactli:[12,11],wisdom:[12,10],harder:12,adopt:[12,11],parenthes:[12,11],macosx:12,plist:12,doctyp:12,dtd:12,propertylist:12,dict:12,qt3mac:12,stabl:12,crypto:12,unstabl:12,finkcommand:12,boost1:12,nopython:12,shlib:12,libtool2:12,qtwebenginecor:12,qtwebenginewidget:12,bit:12,earlier:12,"1_63_0":12,cpp11:12,circumst:12,finder:12,workaround:12,dyld_library_path:12,mgui:12,differenti:[9,11],diamagnet:[9,10],approxim:9,geometri:9,positron:[9,10],counter:[9,11],precess:9,"3110_tutori":9,conveni:9,underli:9,divid:[9,10],xyz:9,normup:9,bgup:9,phaseup:9,normdown:9,bgdown:9,phasedown:9,normright:9,bgright:9,phaseright:9,asymsig1:9,ratesig1:9,fieldsig1:9,asymsig2:9,ratesig2:9,fieldsig2:9,uncertainti:[9,10],asymmetr:9,lower:[9,11],upper:[9,11],constant:[9,11],background:[9,11],uncorrel:9,three:[9,10,11],remain:9,signal:[9,10,11],holder:9,amplitud:9,depolar:[9,10,11],simplexpo:[9,11],tfieldco:[9,11],map1:[9,11],fun1:[9,11],frequenc:[9,10,11],simplegss:[9,11],fun2:[9,11],predefin:[9,11],multipli:[9,11],sign:9,fun:9,interrel:9,gamma_mu:[9,11],par12:[9,11],par15:9,altogeth:[9,11],deltat_pta_gps_3110:9,fittyp:[9,11],norm:[9,11],backgr:[9,11],map2:[9,11],map3:9,undefin:9,implant:[9,10],exce:9,mino:[9,10,11],mhz:[9,10,11],fourier_pow:[9,11],apod:[9,11],weak:[9,11],medium:[9,11],real_and_imag:[9,11],par3:[9,11],imaginari:[9,11],drawn:[9,11],abscissa:[9,11],ordin:[9,11],use_fit_rang:[9,11],third:[9,10,11],ndf:9,freedom:[9,11],converg:[9,10,11],blue:[9,11],maximum:[9,11],count:[9,11],zoom:[9,11],graph:[9,11],around:[9,11],cursor:[9,11],suitabl:9,repeat:[9,11],proce:[9,12],comma:[9,11],between:[9,10,11],"short":[9,11],conclud:9,attent:[9,10,11],"3111_tutori":9,"3114_tutori":9,"_tutori":9,snapshot:9,dark:9,theme:9,facilit:10,gyromagnet:10,ratio:10,smu:10,outlin:10,literatur:10,reli:10,repeatedli:10,sizabl:10,worth:10,maxim:[10,11],trial:10,deserv:10,effect:[10,11],shift:[10,11],advis:10,prove:10,appreci:10,induct:10,vari:[10,11],dimens:10,incid:10,simul:10,trim:10,arrai:10,total:[10,11],thick:10,solv:10,equat:[10,11],layer:10,account:[10,11],superfluid:10,macroscop:10,dover:10,adjac:10,penetr:10,depth:10,constitu:10,half:10,film:10,userfcn:[10,11],tlondon1dh:10,deg:10,dead:10,tlondon1d1l:10,fraction:[10,11],substrat:10,bilay:10,heterostructur:10,tlondon1d2l:10,trilay:10,tlondon1d3l:10,investig:10,flux:10,probe:10,randomli:10,spatial:10,seri:10,reciproc:10,coeffici:[10,11],coher:[10,11],gaussian:10,cutoff:10,brandt:10,temp:10,phy:[10,11],riseman:[10,11],analyt:10,ginzburg:10,landau:10,yaouanc:[10,11],dalma:[10,11],réotier:[10,11],bessel:[10,11],region:[10,11],triangular:10,grid:10,inter:10,distanc:10,tbulktrivortexlondon:10,tbulktrivortexml:10,tbulktrivortexagl:10,tbulktrivortexngl:10,migrad:[10,11],proven:10,larg:[10,11],futil:10,strategi:[10,11],max_likelihood:[10,11],hess:[10,11],bmw_startup:10,debug:[10,11],one_or_zero:10,deactiv:10,path_to_fil:10,invalid:10,delta_t:10,rest:10,microsecond:10,delta_b:10,resb:10,vortexlattic:10,n_vortexgrid:10,data_path:[10,11],data_path_prefix:10,n_theori:10,invers:10,energy_list:10,energy_label:10,rge:10,expect:[10,11],belong:10,wordsofwisdom:10,trimsp:10,"02_0":10,"03_0":10,"03_6":10,"05_0":10,"05_3":10,relax:[10,11],slr:10,reson:[10,11],lineshap:10,puls:10,evolut:10,salman:10,prl:10,lifetim:[10,11],exponenti:[10,11],exprlx:10,stretch:10,sexprlx:10,expon:[10,11],chemic:10,anisotropi:10,powder:10,mehr:10,solid:[10,11],springer:10,axial:10,symmetr:10,observ:10,paralel:10,perpendicular:10,symmetri:10,anisotrop:10,along:[10,11],loss:10,ellipt:10,linegauss:10,fwhm:10,height:10,lorentzian:10,linelorentzian:10,laplacian:10,linelaplac:10,skew:10,lineskewlorentzian:10,width:[10,11],lineskewlorentzian2:10,convolut:10,powderlineaxiallor:10,powderlineaxialgss:10,powderlineasymlor:10,princip:10,powderlineasymgss:10,gpl:11,philosophi:11,abil:11,fcn:11,sever:11,correl:11,renam:11,msr_file_without_extens:11,msr_file:11,maxlh:11,estimaten0:11,timeout_tag:11,overwrit:11,prevent:11,orphan:11,jam:11,"8472_tf_histo":11,avg:11,graphic_format_extens:11,session:11,"8472_0":11,gif:11,jpg:11,svg:11,xpm:11,"8472_x":11,experiment:11,action:11,canvas:11,toggl:11,spectrum:11,area:11,hair:11,consid:11,beta:11,feed:11,exit:11,"3310_0":11,subtract:11,fopt:11,neither:11,nor:11,pad:11,angular:11,interpret:11,lem15_his_01234:11,rebin:11,fudg:11,elimin:11,sens:11,tweak:11,tdc_hifi_2014_00153:11,mnsi:11,"50k":11,unzoom:11,crosshair:11,gett0frompromptpeak:11,firstgoodbinoffset:11,argument:11,color:11,channel:11,interrupt:11,msr_file_in:11,msr_file_out:11,parc:11,wors:11,aim:11,idf1:11,idf2:11,nexus1:11,nexus2:11,flexibl:11,filenamelist:11,lem10_his_0111:11,lem10_his_0113:11,run3:11,runstart:11,runend:11,rrrr:11,rrrrrr:11,yyyi:11,unless:11,sent:11,stdout:11,compress:11,absent:11,lem10_his_0123:11,lem10_his_0123_v2:11,idf:11,deltat_tdc_gps_:11,d2001:11,deltat_tdc_gps_0123:11,deltat_tdc_gps_0137:11,deltat_tdc_alc_:11,rrr:11,spit:11,psi_gps_:11,psi_:11,"_gps_":11,psi_gps_run_100to117:11,archiv:11,lem10_his_0012:11,rebin25:11,lem10_his_0123_rebin25:11,runno:11,fileformat:11,pta:11,ltf:11,dolli:11,gpd:11,hifi:11,tdc_hifi_2015_00123:11,construct:11,path_to_data:11,write_per_run_block_chisq:11,pearson:11,fourier_set:11,phase_incr:11,phincr:11,increment:11,optim:11,root_set:11,marker_list:11,marker:11,color_list:11,intranet:11,mnt:11,unlik:11,headlin:11,style:11,lower_boundari:11,upper_boundari:11,init:11,alpha:11,asi:11,freq:11,constrain:11,semi:11,par:11,asy1:11,rate1:11,asy2:11,field2:11,rate2:11,whitespac:11,avoid:11,whenev:11,abbr:11,express:11,"const":11,generexpo:11,stg:11,statgssktlf:11,sgktlf:11,dyngssktlf:11,dgktlf:11,statexpkt:11,sekt:11,statexpktlf:11,sektlf:11,dynexpktlf:11,dektlf:11,combilgkt:11,lgkt:11,strkt:11,skt:11,spinglass:11,spg:11,rdanisohf:11,rahf:11,internfld:11,internbsl:11,internfldgk:11,ifgk:11,internfldl:11,ifll:11,abragam:11,skewedgss:11,skg:11,staticnkzf:11,snkzf:11,staticnktf:11,snktf:11,dynamicnkzf:11,dnkzf:11,dynamicnktf:11,dnktf:11,muminusexptf:11,mmsetf:11,polynom:11,hayano:11,conden:11,matter:11,keren:11,uemura:11,crook:11,cywinski:11,turner:11,harshman:11,kornilov:11,pomjakushin:11,letter:11,larkin:11,physica:11,condens:11,noak:11,kalviu:11,oxford:11,simplifi:11,formula:11,ident:11,compact:11,difficulti:11,simultan:11,address:11,funx:11,complic:11,dictionari:11,libmylibrari:11,tmyfunct:11,auxiliari:11,arithmet:11,divis:11,sin:11,tan:11,aco:11,asin:11,atan:11,cosh:11,sinh:11,tanh:11,acosh:11,asinh:11,atanh:11,exp:11,sqrt:11,pow:11,parx:11,par5:11,mapi:11,denot:11,frac1:11,shorten:11,logic:11,fire:11,addt0:11,rrf_freq:11,rrf_pack:11,rrf_phase:11,exact:11,pie3:11,particular:11,run_file_nam:11,record:11,digress:11,musrfulldatapath:11,colon:11,smith:11,lem07_his_2018:11,musrfulldatapathtoken:11,runnam:11,ext:11,lem07_2018_rb1_npp:11,d2007:11,deltat_pta_gps_2650:11,d2010:11,deltat_tdc_gpd_8472:11,mue1:11,beauti:11,muminu:11,t0addrun1:11,t0addrun2:11,t0addrun1forward:11,t0addrun1backward:11,t0addrun2forward:11,t0addrun2backward:11,sum:11,onlin:11,angl:11,nanosecond:11,fun3:11,transfer:11,ten:11,fgb:11,lgb:11,larger:11,direct:11,span:11,meaningless:11,simplex:11,batch:11,anywher:11,contour:11,mnplot:11,optimum:11,list_of_param_to_be_fix:11,restor:11,freq1:11,freq2:11,complex:11,fit_rang:11,flavor:11,n00:11,n01:11,n10:11,n11:11,nn0:11,nn1:11,inlin:11,scale_n0_bkg:11,fals:11,print_level:11,footnot:11,bigger:11,phd:11,thesi:11,ubc:11,val0:11,sep:11,val1:11,valn:11,parx0:11,parx1:11,parxn:11,par7:11,par17:11,par22:11,par27:11,par32:11,par37:11,par42:11,par47:11,par52:11,par57:11,par62:11,par67:11,par72:11,par77:11,par82:11,fcp:11,bcp:11,relative_bcp:11,parrx0:11,rel:11,summ:11,parxj:11,parr:11,obvious:11,offest:11,range_for_phase_correct:11,par8:11,nsec:11,min:11,sub_rang:11,view_pack:11,logx:11,logarithm:11,logi:11,khz:11,par4:11,downward:11,upward:11,unwant:11,rid:11,filter:11,kaiser:11,fail:11,tricki:11,compon:11,ideal:11,uncontrol:11,ghost:11,imperfect:11,distort:11,dispers:11,fold:11,substanti:11,infer:11,math:11,mathrm:11,theoret:11,rearrang:11,unbin:11,histogramm:11,reserv:11,plug:11,simpler:11,why:11,although:11,declar:11,puserfcnbas:11,evalu:11,cassert:11,cmath:11,namespac:11,constructor:11,destructor:11,needglobalpart:11,"void":11,setglobalpart:11,globalpart:11,uint_t:11,idx:11,globalpartisvalid:11,classdef:11,destroi:11,peculiar:11,ness:11,introductori:11,topic:11,const_correct:11,herein:11,classimp:11,assert:11,arg:11,linkdef:11,tmylibrarylinkdef:11,ifdef:11,"__cint__":11,pragma:11,endif:11,wise:11,attach:11,tmylibrari:11,libtmylibrari:11,sensibl:11,bluish:11,node:11,uf1:11,uf2:11,entiti:11,ineffici:11,associ:11,ufx:11,g_ufx:11,consum:11,abrikosov:11,cycl:11,thu:11,overhead:11,tmyglobalfunct:11,isvalid:11,fvalid:11,fprevparam:11,calcsomethingcpuexpens:11,liklei:11,getwhatisneed:11,privat:11,finvokedglob:11,fidxglob:11,fglobaluserfcn:11,static_cast:11,sorri:11,resiz:11,pointer:11,dynamic_cast:11,retriev:11,pseudo:11,increas:11,safeti:11,manjaro:12,antergo:12,distro:12,deb:12,installatio:12},objects:{},objtypes:{},objnames:{},titleterms:{acknowledg:0,any2mani:[1,11],univers:1,"\u03bcsr":[1,10,11,6,7],file:[1,10,5,11,9,7,8],format:[1,7,11],convert:1,bugtrack:2,how:3,cite:3,musrfit:[4,13,5,3,11,9,12,8],welcom:4,document:[4,10],indic:4,tabl:4,msr2data:[9,5,11],program:5,automat:5,process:[9,5],multipl:[9,5],msr:[9,5,11],basic:[11,7,5,8],type:[5,11],usag:[8,11,5,6],run:[7,5,11],list:5,structur:5,option:[12,5],paramet:[8,5,6],global:[5,11],mode:5,gener:[5,11],extract:5,extend:5,known:5,limit:5,graphic:[13,5,6],user:[10,5,11,6,7],interfac:[8,7,5,6],provid:5,musredit:[12,5,8],mupp:6,plotter:6,script:6,summari:6,musrroot:7,extens:[7,11],open:7,some:7,concern:7,root:[12,7],inform:7,contain:7,runhead:7,runinfo:7,overview:7,tmusrrunhead:7,concept:7,header:7,write:7,read:[9,7],valid:7,requir:[12,7],detectorinfo:7,sampleenvironmentinfo:7,magneticfieldenvironmentinfo:7,beamlineinfo:7,exhaust:7,tree:7,includ:7,everyth:[12,7],tmusrrunphysicalquant:7,possibl:7,represent:7,gui:8,base:8,introduct:[10,11,8],avail:[11,8],execut:[11,8],configur:[11,8],musrgui:[12,8],musredit_startup:8,xml:[10,11,8],featur:8,musrwiz:8,theori:[11,8],"function":[10,11,8],map:[11,8],fit:[9,13,11,8],info:8,creat:8,musrstep:8,set:[13,12],high:13,speed:13,gpu:[13,11],tesla:13,k40c:13,nvidia:13,driver:13,instal:[13,12],cuda:13,via:[13,12],automak:[],cmake:[13,12],amd:13,card:13,radeon:13,"390x":13,app:13,softwar:[13,12],develop:13,kit:13,sdk:13,enabl:[13,11],opencl:[13,11],support:[13,12,11],maco:[13,12],differ:12,platform:12,oper:12,system:12,restrict:12,gnu:12,linux:12,nexu:12,build:12,last:12,step:12,obsol:12,check:12,window:12,cygwin:12,potenti:12,problem:12,mac:12,macport:12,packag:12,from:12,sourc:12,environ:12,variabl:12,fink:12,obsolet:12,tutori:9,singl:[9,11],histogram:[9,11],determin:9,data:[9,10],rang:9,musrt0:[9,11],model:[9,10],view:9,musrview:[9,11],further:9,asymmteri:9,lib:10,meissner:10,profil:10,vortex:10,lattic:10,relat:10,bmw:10,libfitpofb:10,dimension:10,london:10,state:10,isotrop:10,superconductor:10,bulk:10,field:10,distribut:10,mix:10,startup:10,nonloc:10,superconduct:10,screen:10,analyz:10,"\u03b2":10,nmr:10,bnmr:10,libbnmr:10,liblineprofil:10,manual:11,kei:11,shortcut:11,musrft:11,msr2msr:11,dump_head:11,musrfit_startup:11,descript:11,titl:11,fitparamet:11,block:11,command:11,fourier:11,plot:11,statist:11,rrf:11,asymmetri:11,neg:11,muon:11,non:11,without:11,object:11,access:11,technic:11,framework:11},envversion:43}) \ No newline at end of file diff --git a/doc/html/setup-dks.html b/doc/html/setup-dks.html index bd141748..5ee2ebcc 100644 --- a/doc/html/setup-dks.html +++ b/doc/html/setup-dks.html @@ -6,7 +6,7 @@ - Setting up musrfit / DKS: High Speed Fitting with GPU’s — musrfit 1.4.1 documentation + Setting up musrfit / DKS: High Speed Fitting with GPU’s — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -160,39 +160,6 @@ switch the working branch which is done by

    $ git checkout dks6 -
    -

    Install via automake

    -
    -

    Note

    -

    Currently automake is still supported but soon will be replaced by cmake. Only follow -the automake procedure if you have good reasons.

    -
    -

    The configure script for musrfit has now a couple of more tags/options, which are:

    -
    -
    - -enable-dks
    -
    by default this is set to no, hence if you want to have GPU support you need to enable it.
    -
    - -with-cuda
    -
    with this tag you tell the configure script where it can find CUDA
    -
    - -with-opencl
    -
    with this tag you tell the configure script where it can find OpenCL
    -
    - -with-dks
    -
    with this tag you tell the configure script where it can find DKS
    -
    -

    For a typical setup on a RHEL system it could look like this

    -
    $ ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks=$HOME/Apps/DKS/exec --enable-dks --prefix=$ROOTSYS
-
    -
    -

    After

    -
    $ make
-$ make install
-
    -
    -

    and updating the shared library lookup table (only needed for Linux)

    -
    $ /sbin/ldconfig # as superuser / root
-
    -
    -

    you are done with the setup.

    -

    Install via cmake

    There is on more configuration switch

    @@ -201,7 +168,7 @@ $ make install
    it allows to enable/disable DKS support. The default is <value>=1, i.e. enabled. To disable use <value>=0.

    For a typical setup on a RHEL or macOS system it could look like this

    -
    $ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -DASlibs=1 -DBMWlibs=1 -Dnexus=1
+
    $ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -DASlibs=1 -DBMWlibs=1 -Dnexus=1 -Ddks=1
 
    
 
    
 
    After
    
@@ -354,12 +321,12 @@ The only thing you need DKS
           previous |
-        
  • musrfit 1.4.1 documentation »
    •  
+        
  • musrfit 1.4.2 documentation »
    •
    © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/setup-standard.html b/doc/html/setup-standard.html index e64c9cb0..c077e111 100644 --- a/doc/html/setup-standard.html +++ b/doc/html/setup-standard.html @@ -6,7 +6,7 @@ - Setting up musrfit on Different Platforms — musrfit 1.4.1 documentation + Setting up musrfit on Different Platforms — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -62,11 +62,9 @@ it can also be set up under MS Windows (cygwin, only for the In case musrfit should be installed according to the description found on this page, the user is strongly encouraged to read completely each section dealing with the present installation step before starting the installation process!

    -

    Apart from GCC, the GNU Compiler Collection (gcc, g++), the GNU build tools autoconf, -automake, and libtool are needed, if you want to build musrfit via the automake toolchain. -The automake toolchain will eventually be droped in upcoming releases. -If you plan to use the cmake toolchain (preferred way), cmake. Furthermore the helper tool pkg-config is -needed and musrfit requires the installation of a few open-source libraries and programs including their header packages:

    +

    Apart from GCC, the GNU Compiler Collection (gcc, g++), the build tool cmake is needed. Furthermore the helper +tool pkg-config needs to be in place, and musrfit requires the installation of a few open-source libraries and programs including +their header packages:

    boost C++ libraries
    The powerful Spirit parser framework used by musrfit is included in that collection of libraries. Required version ≥ 1.33 (see boost C++ libraries).
    @@ -117,14 +115,15 @@ needed and musrfit requires the installation of a few open-source libraries and
    GNU/Linux
    No serious problems are currently known. Tested distributions: RHEL, Fedora, -Debian, Ubuntu, Mint, openSUSE.
    +Debian, Ubuntu, Mint, openSUSE, +manjaro, and antergos.
    Mac OS X/macOS
    No serious problems are currently known for macOS ≥ 10.6.
    MS Windows

    Native MS Windows support is currently not available. Potential ways to get musrfit running are:

    • via installation of Linux via the Microsoft App store for Windows 10.
      • -
    • via installation of the virtual machine on which you install Linux.
      • +
    • via installation of the virtual machine on which you install Linux (probably the easiest for most Windows users).
    • via cygwin.
    @@ -178,9 +177,19 @@ the source code from the corresponding website, or to clone the git repo. If you

    Installation of NeXus requirements (optional)

    Only if musrfit should support reading/writing data files in the NeXus format the further required software has to be set up. The required libraries and header files could either be available through the user’s -GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on -Red Hat-like systems binary packages for MXML, HDF4, and HDF5 might be called mxml, mxml-devel, -hdf, hdf-devel, hdf5, hdf5-devel, on Debian-like systems libmxml1, libmxml-dev, libhdf4-dev, libhdf5-dev.

    +GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. The necessary +packages to build NeXus are MXML, (HDF4), and HDF5. This means, for a rpm-package based distro try something like:

    +
    +
    $ yum install mxml-devel hdf-devel hdf5-devel
+
    +
    +
    +

    and on a deb-package based distro try something like:

    +
    +
    $ apt-get install libmxml-dev libhdf4-dev libhdf5-dev
+
    +
    +

    Note

    HDF4 support within NeXus will be dropped by musrfit in the near future. If you not urgently need @@ -211,9 +220,8 @@ $ sudo make install

    ROOT

    -

    ROOT 5.34/xx is supported as legacy version only! The default now will be ROOT 6.xx/yy!

    The ROOT framework may or may not be part of the GNU/Linux distribution. Some distributions are packing ROOT in a -manner incompatible with the way it is needed for musrfit, though the situation is improving. If you are +manner incompatible with the way it is needed by musrfit, though the situation is improving. If you are experienced enough you can try the packed ROOT version. Often ROOT is split in many sub-packages. Install the necessary ones (guess from the description below). One Warning: if the ROOT packages are upgraded after a yum update (apt-get update; apt-get upgrade) you might need to recompile musrfit. If you are not sure about @@ -235,12 +243,12 @@ be added starting with a ‘#’ which can be omitted. They are only the $ # creat the Apps directory if not already present $ mkdir Apps $ cd Apps -$ git clone http://root.cern.ch/git/root.git +$ git clone http://github.com/root-project/root.git $ cd root $ git tag -l -$ # git tag -l will list all available tags. In the next command choose the tag v6-14-00 +$ # git tag -l will list all available tags. In the next command choose the tag v6-16-00 $ # or the latest official release number -$ git checkout -b v6-14-00 v6-14-00 +$ git checkout -b v6-16-00 v6-16-00 $ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed. $ # since we are using cmake build now, first we will need to create the build directory. $ mkdir root_build @@ -284,20 +292,18 @@ $ cmake --build ./ --clean-first

    musrfit

    -

    When all required software has been set up with the musrfit installation can be proceeded. First, the most +

    When all required software has been set up you can proceed with the musrfit installatio. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in $HOME/Apps this is achieved most easily calling from the terminal

    $ cd $HOME/Apps
 $ git clone https://bitbucket.org/muonspin/musrfit.git
-$ # Only if legacy ROOT 5.xx.yy is used include the next line
-$ cd musrfit; git checkout root5
+$ cd musrfit

    or

    $ cd $HOME/Apps
 $ git clone git://gitlab.psi.ch/nemu/musrfit.git
-$ # Only if legacy ROOT 5.xx.yy is used include the next line
-$ cd musrfit; git checkout root5
+$ cd musrfit
    @@ -309,78 +315,15 @@ will needed to switch branches first.

    Update: If a local repository clone is already present (it needs to be newer than Dec. 2016), one can update it using:

    $ cd $HOME/Apps/musrfit
 $ git pull
-
    -
    -

    Now, depending whether you follow the automake or cmake tool chain you do

    -

    automake toolchain:

    -
    $ make uninstall
-$ make clean
-$ make
-$ make install
-
    -
    -

    or

    -

    cmake toolchain:

    -
    $ cd build
+$ cd build
 $ xargs rm < install_manifest.txt
 $ cmake --build ./ --clean-first
 $ make install

    As an alternative (if git is not available), the source code can also be downloaded from the following web-page: musrfit at bitbucket

    -
    -

    musrfit build with automake

    -

    After the source-code extraction the autogen.sh script is called to prepare the build environment. -If it has been executed successfully the configure script should be ready to collect all the information needed -to create the Makefiles. If musrfit should support NeXus data files this has to be enabled by specifying the ---enable-NeXus switch when calling configure. For an overview of all available options just call ./configure --help. -Besides the standard options there are a few special options which should be mentioned here:

    -
    -
    - -prefix
    -
    Specify the installation prefix, e.g. $ROOTSYS if already defined (by default: /usr/local).
    -
    - -with-rootsys
    -
    Specify the top of the ROOT installation directory, e.g. $ROOTSYS if already defined.
    -
    - -with-fftw3
    -
    Specify the prefix of the FFTW3 installation. e.g. /usr/local or /usr.
    -
    - -with-gsl
    -
    Set the prefix of the GSL installation, e.g. /usr/local or /usr.
    -
    - -with-boostinc
    -
    Set the path to the header files of the Boost installation, e.g. /usr/local/include or /usr/include.
    -
    - -with-hdf4
    -
    Set the prefix of the HDF4 installation, e.g. /usr/local (only useful in conjunction with the NeXus support).
    -
    - -with-hdf5
    -
    Set the prefix of the HDF5 installation, e.g. /usr (only useful in conjunction with the NeXus support).
    -
    - -with-nexus
    -
    Set the prefix of the NeXus installation, e.g. /usr/local (only useful in conjunction with the NeXus support).
    -
    - -with-qt3
    -
    Set the prefix of the Qt3 installation, e.g. /usr/lib/qt-3.3 (only useful in conjunction with building musrgui).
    -
    - -with-qt4
    -
    Set the prefix of the Qt4 installation, e.g. /usr/lib/qt47 (only useful in conjunction with building musredit).
    -
    - -with-qt5
    -
    Set the prefix of the Qt5 installation, e.g. /usr/lib64 (only useful in conjunction with building musredit).
    -
    - -enable-NeXus
    -
    Enable the support of NeXus data files (requires the HDF4, HDF5 and NeXus libraries to be installed).
    -
    - -disable-editor
    -
    Disable the integrated building of musredit/musrgui.
    -
    - -disable-omp
    -
    Switches off the OpenMP features of musrfit (parallelization of the \(\chi^2\) calculation when compiled with GCC ≥ 4.2).
    -
    -

    Normally it should not be necessary to make use of any of the options except for specifying the installation path with --prefix. The -other paths should be detected automatically. If this does not work for some reason the configure script will terminate and ask for the -information. When the configure script has been called successfully everything is ready for building the musrfit libraries and executables. -A standard installation sequence (without NeXus support) might then look like (In case the normal user has no write permissions to the -$ROOTSYS and the installation path the “make install” commands have to be executed as superuser.):

    -
    $ cd $HOME/Apps/musrfit
-$ sh autogen.sh
-$ ./configure --prefix=$ROOTSYS
-$ make
-$ make install
-$ /sbin/ldconfig     # (as superuser)
-
    -
    -
    -

    musrfit build with cmake

    +

    musrfit build with cmake

    Currently the following configuration switches for musrfit are available:

    -DCMAKE_INSTALL_PREFIX=<prefix-path>
    @@ -421,7 +364,7 @@ $ /sbin/ldconfig # (as superus
    -

    musrfit last step of the installation

    +

    musrfit last step of the installation

    In order to finish the installation of musrfit two more things should be done:

      @@ -440,10 +383,9 @@ detailed information on this XML file refer to the
    -

    musredit

    +

    musredit

    In the latest version of musrfit the configure script tries to determine automatically the highest available Qt version. -In case this is found, the editor musredit is built already together with musrfit. If not, one can try to call -the configure script with the - -with-qt5 option (automake). cmake will determine everthing automatically. +In case this is found, the editor musredit is built already together with musrfit. To install this editor separately, i.e. by “hand” do

    $ cd $HOME/Apps/musrfit/src/musredit_qt5
 $ # for some distributions you will need qmake-qt5 for the next command
@@ -505,7 +447,7 @@ Please also be aware of the fact that the X server which is going to be installe
 
    
 
    Requirements
    
 
    
-
    Setting up Cygwin
    
+
    Setting up Cygwin
    
 
    For the start go to the Cygwin website, download the setup file and use it to install Cygwin 1.7 or newer. During the installation
 process you will be asked where you want to install Cygwin and normally the default choice should just be fine. At some point you
 will be asked which packages should be installed. Make sure that you choose at least the following (or packages with revisions close
@@ -552,8 +494,8 @@ the later handling will be easier if a symbolic link to these files is created n
 
    
 
    Everything but ROOT and NeXus
    
 
    
-
    
-
    Installation of NeXus requirements (optional)
    
+
    
+
    Installation of NeXus requirements (optional)
    
 
    Only if musrfit should support reading data files in the NeXus format the further required software has
 to be set up. Under Cygwin of all the required libraries only HDF5 is available. The packages hdf5 and
 libhdf5-devel can be installed through the Cygwin setup. One should also make sure that bison, flex
@@ -597,8 +539,8 @@ $ make install
    -
    -

    ROOT

    +
    +

    ROOT

    In order to install the ROOT system, there are two possibilities:

    • Download the precompiled Cygwin GCC 4.3 (or newer) package of the most recent ROOT version @@ -639,8 +581,8 @@ for the user Username

      Afterwards close the Cygwin shell and reopen it again for the installation of musrfit.

    -
    -

    musrfit

    +
    +

    musrfit

    First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal

    $ cd
@@ -659,58 +601,8 @@ $ git pull

    As an alternative (if git is not available), the source code can also be downloaded from the following web-page: musrfit at bitbucket.

    -
    -

    musrfit build with automake

    -

    After the source-code extraction the autogen.sh script is called to prepare the build environment. -If it has been executed successfully the configure script should be ready to collect all the information -needed to create the Makefiles. If musrfit should support NeXus data files this has to be enabled by -specifying the --enable-static --enable-NeXus switches when calling configure. For an overview of all -available options just call ./configure --help. Besides the standard options there are a few special -options which should be mentioned here:

    -
    -
    - -prefix
    -
    Specify the installation prefix, e.g. /opt/root-system (by default: /usr/local)
    -
    - -with-rootsys
    -
    Specify the top of the ROOT installation directory, e.g. /opt/root-system
    -
    - -with-fftw3
    -
    Specify the prefix of the FFTW3 installation. e.g. /usr/local or /usr
    -
    - -with-gsl
    -
    Set the prefix of the GSL installation, e.g. /usr/local or /usr
    -
    - -with-boostinc
    -
    Set the path to the header files of the Boost installation, e.g. /usr/local/include or /usr/include
    -
    - -with-hdf4
    -
    Set the prefix of the HDF4 installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
    -
    - -with-hdf5
    -
    Set the prefix of the HDF5 installation, e.g. /usr (only useful in conjunction with the NeXus support)
    -
    - -with-nexus
    -
    Set the prefix of the NeXus installation, e.g. /usr/local (only useful in conjunction with the NeXus support)
    -
    - -with-qt3
    -
    Set the prefix of the Qt3 installation, e.g. /usr/lib/qt-3.3 (only useful in conjunction with building musrgui)
    -
    - -with-qt4
    -
    Set the prefix of the Qt4 installation, e.g. /usr/lib/qt47 (only useful in conjunction with building musredit)
    -
    - -with-qt5
    -
    Set the prefix of the Qt5 installation, e.g. /usr/lib/qt56 (only useful in conjunction with building musredit)
    -
    - -enable-NeXus
    -
    Enable the support of NeXus data files (requires the HDF4, HDF5 and NeXus libraries to be installed).
    -
    - -disable-editor
    -
    Disable the integrated building of musredit/musrgui.
    -
    - -disable-omp
    -
    Switches off the OpenMP features of musrfit (parallelization of the \(\chi^2\) calculation when compiled with GCC ≥ 4.2)
    -
    -

    Normally it should not be necessary to make use of any of the options except for specifying the installation path with --prefix. -The other paths should be detected automatically. If this does not work for some reason the configure script will terminate and -ask for the information. When the configure script has been called successfully everything is ready for building the musrfit -libraries and executables. A standard installation sequence (without NeXus support) might then look like:

    -
    $ cd musrfit
-$ sh autogen.sh
-$ ./configure --prefix=$ROOTSYS
-$ make
-$ make install
-
    -
    -
    -
    -

    musrfit build with cmake

    +
    +

    musrfit build with cmake

    Currently the following configuration switches for musrfit are available:

    -DCMAKE_INSTALL_PREFIX=<prefix-path>
    @@ -751,12 +643,11 @@ $ /sbin/ldconfig # (as superus
    -
    -

    musredit

    +
    +

    musredit

    In the latest version of musrfit the configure script tries to determine automatically if Qt4.5 or higher is set up on the machine. In case this is found, the editor musredit is built -readily with musrfit. If not, one can either try to call the configure script with the ---with-qt4 option or install this editor separately, .e.g.:

    +readily with musrfit. If not, try the following:

    $ cd src/musredit
 $ qmake-qt4 musredit.pro
    @@ -780,14 +671,14 @@ musredit &
    -
    -

    musrgui (obsolate)

    +
    +

    musrgui (obsolate)

    If Qt4.5 or higher is not available but Qt3 is set up musrgui can be installed. For this please follow the instructions for the musredit installation where simply every musredit occurrence has to be replaced by musrgui, and qt4 is replaced by qt3.

    -
    -

    Check the installation

    +
    +

    Check the installation

    In order to perform a quick test for finding out if the installation has been completed successfully, a few msr files together with the corresponding data files can be found in the musrfit source tree at doc/examples/. @@ -819,7 +710,7 @@ or Fink — In the following, both possibilities (using MacPorts or Fink) are described but it is emphasized here that it should be followed only one of the possible routes .

    -

    Requirements (MacPorts)

    +

    Requirements (MacPorts)

    Before proceeding with the usage of the MacPorts system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:

    @@ -838,7 +729,7 @@ $ sudo xcodebuild -license
    X11
    The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also -will need to install XQuartz <http://xquartz.macosforge.org/trac>. If ROOT runs without XQuartz do not +will need to install XQuartz. If ROOT runs without XQuartz do not install it.

    After installing the Xcode tools go to the MacPorts install page, download @@ -876,8 +767,8 @@ add a new line pointing to your local copy, e.g.

    With Qt5, musredit will be installed. If it happens that you used musrgui in the past, please change over to musredit since there will be no further development for musrgui anymore!

    -
    -

    Installation of NeXus requirements (optional)

    +
    +

    Installation of NeXus requirements (optional)

    Only if musrfit should support reading data files in the NeXus format the further required packages are set up:

    $ sudo port -v install hdf4 hdf5
    @@ -906,21 +797,21 @@ $ sudo make install
    -
    -

    ROOT

    -

    ROOT 5.34/xx is supported as legacy version only! The default now will be ROOT 6.xx/yy!

    +
    +

    ROOT

    +

    The default ROOT version is based on ROOT 6.xx/yy!

    ROOT installed via package installer

    The lazy way to get ROOT installed is via package installer. If your macOS is directly supported by the ROOT people you can download the package installer from the ROOT download page. Choose the latest ROOT release and download you macOS version dmg-file, e.g. for macOS 10.13 (High Sierra) -it is at the time of writting root_v6.14.00.macosx64-10.13-clang91.dmg. After the installation +it is at the time of writting root_v6.16.00.macosx64-10.13-clang91.dmg. After the installation ROOT will be installed under /Application as owner root. In order to ease your life for the steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the ROOT directory:

    $ cd /Applications
-$ sudo chown -R <username> root_v6.14.00
-$ sudo chgrp -R staff root_v6.14.00
-$ sudo ln -s root_v6.14.00 root
+$ sudo chown -R <username> root_v6.16.00
+$ sudo chgrp -R staff root_v6.16.00
+$ sudo ln -s root_v6.16.00 root
    @@ -934,12 +825,12 @@ to install it somewhere else, just systematically replace the related terms of t For the following list of commands the ‘$’ will be given, the command prompt. Do not enter it! Also some comments will be added starting with a ‘#’ which can be omitted. They are only there to explain what is going on.

    $ cd $HOME/Applications
-$ git clone http://root.cern.ch/git/root.git
+$ git clone http://github.com/root-project/root.git
 $ cd root
 $ git tag -l
 $ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx
-$ # where xx is the highest listed number, e.g. v6-14-00
-$ git checkout -b v6-14-00 v6-14-00
+$ # where xx is the highest listed number, e.g. v6-16-00
+$ git checkout -b v6-16-00 v6-16-00
 $ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
 $ # We will use the cmake out-of-source approach here.
 $ mkdir root_build
@@ -1000,7 +891,7 @@ launchctl setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH
    -

    Requirements (Fink)

    +

    Requirements (Fink)

    Before proceeding with the usage of the Fink system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:

    Xcode
    @@ -1014,7 +905,7 @@ $ sudo xcodebuild -license
    X11
    The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also -will need to install XQuartz <http://xquartz.macosforge.org/trac>. If ROOT runs without XQuartz do not +will need to install XQuartz. If ROOT runs without XQuartz do not install it.

    After installing the Xcode tools go to the Fink download page, @@ -1058,8 +949,8 @@ specific location, the later handling will be easier if a symbolic link to this

    where x_yy_z has to be substituted by the correct version number, e.g. 1_63_0.

    -
    -

    Installation of NeXus requirements (optional)

    +
    +

    Installation of NeXus requirements (optional)

    Only if musrfit should support reading data files in the NeXus format the further required packages can be installed through Fink (check for the most recent versions):

    libjpeg hdf hdf5-cpp11 hdf5-cpp11-shlibs
@@ -1088,21 +979,21 @@ $ sudo make install
    -
    -

    ROOT

    -

    ROOT 5.34/xx is supported as legacy version only and will likely to be dropped in 2018. The default now is ROOT 6.xx/yy!

    +
    +

    ROOT

    +

    The default ROOT version is based on ROOT 6.xx/yy!

    ROOT installed via package installer

    The lazy way to get ROOT installed is via package installer. If your macOS is directly supported by the ROOT people you can download the package installer from the ROOT download page. Choose the latest ROOT release and download you macOS version dmg-file, e.g. for macOS 10.13 (High Sierra) -it is at the time of writting root_v6.14.00.macosx64-10.13-clang91.dmg. After the installation +it is at the time of writting root_v6.16.00.macosx64-10.13-clang91.dmg. After the installation ROOT will be installed under /Application as owner root. In order to ease your life for the steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the ROOT directory:

    $ cd /Applications
-$ sudo chown -R <username> root_v6.14.00
-$ sudo chgrp -R staff root_v6.14.00
-$ sudo ln -s root_v6.14.00 root
+$ sudo chown -R <username> root_v6.16.00
+$ sudo chgrp -R staff root_v6.16.00
+$ sudo ln -s root_v6.16.00 root
    @@ -1116,12 +1007,12 @@ to install it somewhere else, just systematically replace the related terms of t For the following list of commands the ‘$’ will be given, the command prompt. Do not enter it! Also some comments will be added starting with a ‘#’ which can be omitted. They are only there to explain what is going on.

    $ cd $HOME/Applications
-$ git clone http://root.cern.ch/git/root.git
+$ git clone http://github.com/root-project/root.git
 $ cd root
 $ git tag -l
 $ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx
-$ # where xx is the highest listed number, e.g. v6-14-00
-$ git checkout -b v6-14-00 v6-14-00
+$ # where xx is the highest listed number, e.g. v6-16-00
+$ git checkout -b v6-16-00 v6-16-00
 $ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
 $ # We will use the cmake out-of-source approach here.
 $ mkdir root_build
@@ -1181,22 +1072,20 @@ launchctl setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH
    -
    -

    musrfit

    +
    +

    musrfit

    First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/Applications/musrfit this is achieved most easily calling from the termin

    $ cd ~/Applications
 $ git clone https://bitbucket.org/muonspin/musrfit.git
-$ # Only if legacy ROOT 5.xx.yy is used include the next line
-$ cd musrfit; git checkout root5
+$ cd musrfit

    or

    $ cd ~/Applications
 $ git clone git://gitlab.psi.ch/nemu/musrfit.git
-$ # Only if legacy ROOT 5.xx.yy is used include the next line
-$ cd musrfit; git checkout root5
+$ cd musrfit

    If a local repository clone is already present, one can update it using:

    @@ -1206,59 +1095,8 @@ $ git pull

    As an alternative (if git is not available), the source code can also be downloaded from the following web-page: musrfit at bitbucket.

    -
    -

    musrfit build with automake

    -

    After the source-code extraction the autogen.sh script is called to prepare the build environment. -If it has been executed successfully the configure script should be ready to collect all the information needed -to create the Makefiles. If musrfit should support NeXus data files this has to be enabled by specifying the ---enable-NeXus switch when calling configure. For an overview of all available options just call ./configure --help. -Besides the standard options there are a few special options which should be mentioned here:

    -
    -
    - -prefix
    -
    Specify the installation prefix, e.g. $ROOTSYS if already defined (by default: /usr/local).
    -
    - -with-rootsys
    -
    Specify the top of the ROOT installation directory, e.g. $ROOTSYS if already defined.
    -
    - -with-fftw3
    -
    Specify the prefix of the FFTW3 installation. e.g. /usr/local or /usr.
    -
    - -with-gsl
    -
    Set the prefix of the GSL installation, e.g. /usr/local or /usr.
    -
    - -with-boostinc
    -
    Set the path to the header files of the Boost installation, e.g. /usr/local/include or /usr/include.
    -
    - -with-hdf4
    -
    Set the prefix of the HDF4 installation, e.g. /usr/local (only useful in conjunction with the NeXus support).
    -
    - -with-hdf5
    -
    Set the prefix of the HDF5 installation, e.g. /usr (only useful in conjunction with the NeXus support).
    -
    - -with-nexus
    -
    Set the prefix of the NeXus installation, e.g. /usr/local (only useful in conjunction with the NeXus support).
    -
    - -with-qt3
    -
    Set the prefix of the Qt3 installation, e.g. /usr/lib/qt-3.3 (only useful in conjunction with building musrgui).
    -
    - -with-qt4
    -
    Set the prefix of the Qt4 installation, e.g. /usr/lib/qt47 (only useful in conjunction with building musredit).
    -
    - -with-qt5
    -
    Set the prefix of the Qt5 installation, e.g. /usr/lib64 (only useful in conjunction with building musredit).
    -
    - -enable-NeXus
    -
    Enable the support of NeXus data files (requires the HDF4, HDF5 and NeXus libraries to be installed).
    -
    - -disable-editor
    -
    Disable the integrated building of musredit/musrgui.
    -
    - -disable-omp
    -
    Switches off the OpenMP features of musrfit (parallelization of the \(\chi^2\) calculation when compiled with GCC ≥ 4.2).
    -
    -

    Normally it should not be necessary to make use of any of the options except for specifying the installation path with --prefix. The -other paths should be detected automatically. If this does not work for some reason the configure script will terminate and ask for the -information. When the configure script has been called successfully everything is ready for building the musrfit libraries and executables. -A standard installation sequence (without NeXus support) might then look like (In case the normal user has no write permissions to the -$ROOTSYS and the installation path the “make install” commands have to be executed as superuser.):

    -
    $ cd $HOME/Apps/musrfit
-$ sh autogen.sh
-$ ./configure --prefix=$ROOTSYS
-$ make
-$ make install
-$ /sbin/ldconfig     # (as superuser)
-
    -
    -
    -
    -

    musrfit build with cmake

    +
    +

    musrfit build with cmake

    Currently the following configuration switches for musrfit are available:

    -DCMAKE_INSTALL_PREFIX=<prefix-path>
    @@ -1298,8 +1136,8 @@ $ /sbin/ldconfig # (as superus
    -
    -

    musrfit last step of the installation

    +
    +

    musrfit last step of the installation

    In order to finish the installation of musrfit two more things should be done:

    • Define the MUSRFITPATH environment variable containing the path to the musrfit executables and XML files. @@ -1315,12 +1153,11 @@ detailed information on this XML file refer to the
    -
    -

    musredit

    +
    +

    musredit

    In the latest version of musrfit the configure script tries to determine automatically the highest available Qt version. In case this is found, the editor musredit is built already together with musrfit. -If not, one can try to call the configure script with the –with-qt5 option (automake). cmake will -determine everthing automatically. To install this editor separately, i.e. by “hand” do

    +If not, try the following:

    $ cd $HOME/Apps/musrfit/src/musredit_qt5
 $ # for some distributions you will need qmake-qt5 for the next command
 $ qmake musredit.pro
@@ -1353,8 +1190,8 @@ accomplish that, add the following lines to
    -
    -

    Check the installation

    +
    +

    Check the installation

    In order to perform a quick test for finding out if the installation has been completed successfully, a few msr files together with the corresponding data files can be found in the musrfit source tree at doc/examples/. If musrgui has been installed, just open one of the test-*.msr files in the editor and test the musrfit @@ -1386,7 +1223,6 @@ $ musrview test-histo-ROOT-NPP.msr

  • musrfit @@ -1400,41 +1236,39 @@ $ musrview test-histo-ROOT-NPP.msr
  • Requirements
    • -
  • musrfit
  • Mac OS X / macOS @@ -1481,12 +1315,12 @@ $ musrview test-histo-ROOT-NPP.msr
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/tutorial.html b/doc/html/tutorial.html index 14bc3db4..fea64867 100644 --- a/doc/html/tutorial.html +++ b/doc/html/tutorial.html @@ -6,7 +6,7 @@ - Tutorial for musrfit — musrfit 1.4.1 documentation + Tutorial for musrfit — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -443,12 +443,12 @@ For a complete description please refer to the manuals of previous | -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/user-libs.html b/doc/html/user-libs.html index 5dddef1f..0b91497e 100644 --- a/doc/html/user-libs.html +++ b/doc/html/user-libs.html @@ -6,7 +6,7 @@ - Documentation of user libs (user functions) — musrfit 1.4.1 documentation + Documentation of user libs (user functions) — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -662,12 +662,12 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/doc/html/user-manual.html b/doc/html/user-manual.html index 25a0005f..5b10f3a7 100644 --- a/doc/html/user-manual.html +++ b/doc/html/user-manual.html @@ -6,7 +6,7 @@ - User manual — musrfit 1.4.1 documentation + User manual — musrfit 1.4.2 documentation @@ -14,7 +14,7 @@ - + @@ -41,7 +41,7 @@
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • @@ -2238,12 +2238,12 @@ In case this cannot be ensured, the parallelization can be disabled by ̵
  • previous |
    • -
  • musrfit 1.4.1 documentation »
    • +
  • musrfit 1.4.2 documentation »
    • © Copyright 2018, Andreas Suter. - Last updated on Jan 21, 2019. + Last updated on Mar 08, 2019. Created using Sphinx 1.2.3.
    diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index d7d1e071..00000000 --- a/src/Makefile.am +++ /dev/null @@ -1,74 +0,0 @@ -## Process this file with automake to create Makefile.in - -BUILT_SOURCES = git-revision.h -git-revision.h : Makefile - sh git_revision.sh ./include git-revision.h - -if PNEXUS_ENABLED - PNEXUSDIRS = external/nexus -endif - -if BUILD_MUSRGUI - EDITORDIR = musrgui -endif - -if BUILD_MUSREDIT - EDITORDIR = musredit -endif - -if BUILD_MUSREDIT_QT5 - EDITORDIR = musredit_qt5 -endif - -SUBDIRS = external/MusrRoot \ - external/TLemRunHeader \ - external/MuSR_software \ - external/mud \ - $(PNEXUSDIRS) \ - classes \ - external \ - musredit_qt5 \ - musredit \ - musrgui - -if BUILD_MUSRGUI -#SUBDIRS += $(EDITORDIR) -EXTRA_DIST = $(EDITORDIR)/Makefile -endif - -if BUILD_MUSREDIT -#SUBDIRS += $(EDITORDIR) -EXTRA_DIST = $(EDITORDIR)/Makefile -endif - -if BUILD_MUSREDIT_QT5 -EXTRA_DIST = $(EDITORDIR)/Makefile -endif - -bin_PROGRAMS = musrfit musrview musrt0 musrFT msr2msr msr2data any2many -bin_PROGRAMS += write_musrRoot_runHeader musrRootValidation -bin_PROGRAMS += dump_header - -musrfit_SOURCES = musrfit.cpp -musrview_SOURCES = musrview.cpp -musrt0_SOURCES = musrt0.cpp -musrFT_SOURCES = musrFT.cpp -msr2msr_SOURCES = msr2msr.cpp -msr2data_SOURCES = msr2data.cpp -any2many_SOURCES = any2many.cpp -write_musrRoot_runHeader_SOURCES = write_musrRoot_runHeader.cpp -musrRootValidation_SOURCES = musrRootValidation.cpp -dump_header_SOURCES = dump_header.cpp - -LIBADD = $(PMUSR_LIBS) $(MUSR_ROOT_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS) - -AM_CXXFLAGS = $(LOCAL_BIN_CXXFLAGS) -AM_LDFLAGS = $(LOCAL_BIN_LDFLAGS) -AM_CPPFLAGS = $(MUSR_ROOT_CFLAGS) $(LEM_CFLAGS) $(MUD_CFLAGS) $(PSIBIN_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) $(BOOST_CFLAGS) $(ROOT_CFLAGS) \ - $(LIBXML2_CFLAGS) -if PNEXUS_ENABLED -AM_CPPFLAGS += $(HDF5_CFLAGS) $(NEXUS_CFLAGS) $(PNEXUS_CXXFLAGS) -endif - -LIBS = $(PMUSR_LIBS) $(USERFCN_LIBS) $(MUSR_ROOT_LIBS) $(LEM_LIBS) $(PSIBIN_LIBS) $(MUD_LIBS) $(PNEXUS_LIBS) \ - $(FFTW3_LIBS) $(GSL_LIBS) $(ROOT_LIBS) $(LIBXML2_LIBS) diff --git a/src/Makefile.musrfit b/src/Makefile.musrfit deleted file mode 100644 index afddd398..00000000 --- a/src/Makefile.musrfit +++ /dev/null @@ -1,149 +0,0 @@ -#--------------------------------------------------- -# Makefile -# -# Author: Andreas Suter -# e-mail: andreas.suter@psi.ch -# -# $Id$ -#--------------------------------------------------- - -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) -ROOTGLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) - -#--------------------------------------------------- -# depending on the architecture, choose the compiler, -# linker, and the flags to use -# - -ARCH = $(shell $(ROOTSYS)/bin/root-config --arch) - -ifeq ($(ARCH),linux) -OS = LINUX -endif -ifeq ($(ARCH),linuxx8664gcc) -OS = LINUX -endif -ifeq ($(ARCH),win32gcc) -OS = WIN32GCC -endif -ifeq ($(ARCH),macosx) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -O3 -Wall -fPIC -PMUSRPATH = ./include -MNPATH = $(ROOTSYS)/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -LD = g++ -LDFLAGS = -O -INSTALLPATH = $(ROOTSYS)/bin -EXEC = musrfit musrview musrparam musrt0 msr2msr -SUFFIX = -endif - -# -- Windows/Cygwin -ifeq ($(OS),WIN32GCC) -CXX = g++ -CXXFLAGS = -O3 -Wall -PMUSRPATH = ./include -MNPATH = $(ROOTSYS)/include -BOOSTPATH = /usr/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(BOOSTPATH) -LD = g++ -LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -INSTALLPATH = $(ROOTSYS)/bin -EXEC = musrfit.exe musrview.exe musrparam.exe musrt0.exe msr2msr.exe -SUFFIX = .exe -endif - -# -- MacOSX/Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -O3 -Wall -fPIC -PMUSRPATH = ./include -MNPATH = $(ROOTSYS)/include -BOOSTPATH = /sw/include -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(BOOSTPATH) -LD = g++ -LDFLAGS = -O -INSTALLPATH = $(ROOTSYS)/bin -EXEC = musrfit musrview musrparam musrt0 msr2msr -SUFFIX = -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -lXMLParser -GLIBS = $(ROOTGLIBS) -lXMLParser - -# PSI libs -PSILIBS = -L$(ROOTSYS)/lib -lTLemRunHeader -lPMusr -# Minuit2 lib -MNLIB = -L$(ROOTSYS)/lib -lMinuit2 -# MathMore lib -MMLIB = -L$(ROOTSYS)/lib -lMathMore - -# some definitions: headers, sources, objects,... -OBJS = -OBJS += musrfit.o musrview.o musrparam.o musrt0.o msr2msr.o - -# make the executable: -# -all: $(EXEC) - -musrfit$(SUFFIX): musrfit.o - @echo "---> Building $@ ..." - /bin/rm -f $@ - $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) - @echo "done" - -musrview$(SUFFIX): musrview.o - @echo "---> Building $@ ..." - /bin/rm -f $@ - $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) - @echo "done" - -musrt0$(SUFFIX): musrt0.o - @echo "---> Building $@ ..." - /bin/rm -f $@ - $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) - @echo "done" - -musrparam$(SUFFIX): musrparam.o - @echo "---> Building $@ ..." - /bin/rm -f $@ - $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) - @echo "done" - -msr2msr$(SUFFIX): msr2msr.o - @echo "---> Building $@ ..." - /bin/rm -f $@ - $(LD) $< -o $@ $(LDFLAGS) $(GLIBS) $(PSILIBS) $(MNLIB) $(MMLIB) - @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 $< - -install: all - cp -fvp $(EXEC) $(INSTALLPATH) - cp -fvp musrfit_startup.xml $(INSTALLPATH) - cp -fvp external/scripts/msr2data $(INSTALLPATH) - chmod 755 $(INSTALLPATH)/msr2data diff --git a/src/classes/Makefile.PMusr b/src/classes/Makefile.PMusr deleted file mode 100644 index 03c0a24b..00000000 --- a/src/classes/Makefile.PMusr +++ /dev/null @@ -1,261 +0,0 @@ -#--------------------------------------------------- -# Makefile.PMusr -# -# Author: Andreas Suter -# e-mail: andreas.suter@psi.ch -# -# $Id$ -# -# Comment: If it doesn't work, try -# make --warning-undefined-variables -f Makefile.PMusr -# it might be that OSTYPE is not set properly, i.e. -# OSTYPE being a variable (set), instead of a enviornment -# variable (printenv). If so, try -# export OSTYPE=linux-gnu -# are whatever makes sense on your system. -#--------------------------------------------------- - -#--------------------------------------------------- -# get compilation and library flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) -ROOTLIBS = $(shell $(ROOTSYS)/bin/root-config --libs) -ROOTGLIBS = $(shell $(ROOTSYS)/bin/root-config --glibs) - -#--------------------------------------------------- -# depending on the architecture, choose the compiler, -# linker, and the flags to use -# - -ARCH = $(shell $(ROOTSYS)/bin/root-config --arch) - -ifeq ($(ARCH),linux) -OS = LINUX -endif -ifeq ($(ARCH),linuxx8664gcc) -OS = LINUX -endif -ifeq ($(ARCH),win32gcc) -OS = WIN32GCC -endif -ifeq ($(ARCH),macosx) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../include -MNPATH = $(ROOTSYS)/include -GSLPATH = /usr/include/gsl -BOOSTPATH = /usr/include -FFTW3PATH = /usr/include -LEMPATH = ../external/TLemRunHeader -PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH) -LD = g++ -LDFLAGS = -O -SOFLAGS = -shared -LEMLIB = libTLemRunHeader.so -SHLIB = libPMusr.so -endif - -# -- Windows/Cygwin -ifeq ($(OS),WIN32GCC) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -D_DLL -PMUSRPATH = ../include -MNPATH = $(ROOTSYS)/include -GSLPATH = /usr/include/gsl -BOOSTPATH = /usr/include -FFTW3PATH = /usr/include -LEMPATH = ../external/TLemRunHeader -PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH) -LD = g++ -LDFLAGS = -O -Wl,--enable-auto-import -Wl,--enable-runtime-pseudo-reloc -SOFLAGS = -shared -Wl,--export-all-symbols -LEMLIB = libTLemRunHeader.dll -SHLIB = libPMusr.dll -endif - -# -- MacOSX/Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -PMUSRPATH = ../include -MNPATH = $(ROOTSYS)/include -FINKPATH = /sw/include -GSLPATH = $(FINKPATH)/gsl -BOOSTPATH = $(FINKPATH) -FFTW3PATH = $(FINKPATH) -LEMPATH = ../external/TLemRunHeader -PSIBINPATH = ../external/MuSR_software/Class_MuSR_PSI -INCLUDES = -I$(PMUSRPATH) -I$(MNPATH) -I$(GSLPATH) -I$(BOOSTPATH) -I$(LEMPATH) -I$(PSIBINPATH) -I$(FFTW3PATH) -LD = g++ -LDFLAGS = -O -Xlinker -bind_at_load -SOFLAGS = -dynamiclib -flat_namespace -undefined suppress -Wl,-x -LEMLIB = libTLemRunHeader.dylib -SHLIB = libPMusr.dylib -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -lXMLParser -GLIBS = $(ROOTGLIBS) -lXMLParser - -# LEM run header -PSILIB = -L. -lTLemRunHeader -# Minuit2 lib -MNLIB = -L$(ROOTSYS)/lib -lMinuit2 -# GSL lib -GSLLIB = -lgslcblas -lgsl -# FFTW lib -FFTW3LIB = -lfftw3 - -ifeq ($(OS),WIN32GCC) -# Minuit2 lib -MNLIB = -L$(ROOTSYS)/lib -lMinuit2 -lMathMore -# GSL lib -GSLLIB = -L/usr/lib -lgslcblas -lgsl -# FFTW lib -FFTW3LIB = -L/usr/lib -lfftw3 -endif - -ifeq ($(OS),DARWIN) -# Minuit2 lib -MNLIB = -L$(ROOTSYS)/lib -lMinuit2 -lMathMore -# GSL lib -GSLLIB = -L/sw/lib -lgslcblas -lgsl -# FFTW lib -FFTW3LIB = -L/sw/lib -lfftw3 -endif - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += PStartupHandler.o PStartupHandlerDict.o -OBJS += PMsrHandler.o -OBJS += PRunDataHandler.o -OBJS += PFunctionHandler.o -OBJS += PFunction.o -OBJS += PRunBase.o -OBJS += PRunSingleHisto.o -OBJS += PRunAsymmetry.o -OBJS += PRunRRF.o -OBJS += PRunNonMusr.o -OBJS += PRunListCollection.o -OBJS += PTheory.o -OBJS += PFitterFcn.o -OBJS += PFitter.o -OBJS += PMusrCanvas.o PMusrCanvasDict.o -OBJS += PUserFcnBase.o PUserFcnBaseDict.o -OBJS += PFourier.o -OBJS += PMusrT0.o PMusrT0Dict.o - -LEMOBJS = -LEMOBJS += TLemStats.o TLemStatsDict.o -LEMOBJS += TLemRunHeader.o TLemRunHeaderDict.o - -EXTOBJS = -EXTOBJS += MuSR_td_PSI_bin.o - -# make the shared libs: - -all: lemlib musrlib - -lemlib: $(LEMLIB) - -musrlib: $(SHLIB) - -$(LEMLIB): $(LEMOBJS) - @echo "---> Building shared library $(LEMLIB) ..." - /bin/rm -f $(LEMLIB) - $(LD) $(SOFLAGS) $(LDFLAGS) $(LEMOBJS) -o $(LEMLIB) $(LIBS) - @echo "done" - -$(SHLIB): $(OBJS) $(EXTOBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(SOFLAGS) $(LDFLAGS) $(OBJS) $(EXTOBJS) -o $(SHLIB) $(FFTW3LIB) $(GLIBS) $(PSILIB) $(MNLIB) $(GSLLIB) - @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) $(LEMOBJS) *Dict* core* - @echo "---> removing $(OBJS) $(EXTOBJS) $(LEMOBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -$(LEMOBJS): ../external/TLemRunHeader/TLemRunHeader.cxx TLemRunHeaderDict.cxx ../external/TLemRunHeader/TLemStats.cxx TLemStatsDict.cxx - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $^ - -$(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $^ - -TLemRunHeaderDict.cxx: ../external/TLemRunHeader/TLemRunHeader.h ../external/TLemRunHeader/TLemRunHeaderLinkDef.h - @echo "Generating dictionary $@..." - rootcling -f $@ -c -p $^ - -TLemStatsDict.cxx: ../external/TLemRunHeader/TLemStats.h ../external/TLemRunHeader/TLemStatsLinkDef.h - @echo "Generating dictionary $@..." - rootcling -f $@ -c -p $^ - -PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h - @echo "Generating dictionary $@..." - rootcling -f $@ -c -p $^ - -PMusrCanvasDict.cpp: ../include/PMusrCanvas.h ../include/PMusrCanvasLinkDef.h - @echo "Generating dictionary $@..." - rootcling -v -f $@ -c -p $^ - -PMusrT0Dict.cpp: ../include/PMusrT0.h ../include/PMusrT0LinkDef.h - @echo "Generating dictionary $@..." - rootcling -v -f $@ -c -p $^ - -PUserFcnBaseDict.cpp: ../include/PUserFcnBase.h ../include/PUserFcnBaseLinkDef.h - @echo "Generating dictionary $@..." - rootcling -v -f $@ -c -p $^ - -install: leminstall musrinstall - -leminstall: lemlib - @echo "Installing shared lib: $(LEMLIB) ( you must be root ;-) )" -ifeq ($(OS),LINUX) - cp -pv $(LEMLIB) $(ROOTSYS)/lib - cp -pv $(LEMPATH)/*.h $(ROOTSYS)/include -endif -ifeq ($(OS),WIN32GCC) - cp -pv $(LEMLIB) $(ROOTSYS)/bin - ln -sf $(ROOTSYS)/bin/$(LEMLIB) $(ROOTSYS)/lib/$(LEMLIB) - cp -pv $(LEMPATH)/*.h $(ROOTSYS)/include -endif -ifeq ($(OS),DARWIN) - cp -pv $(LEMLIB) $(ROOTSYS)/lib - cp -pv $(LEMPATH)/*.h $(ROOTSYS)/include -endif - -musrinstall: musrlib - @echo "Installing shared lib: $(SHLIB) ( you must be root ;-) )" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include -endif -ifeq ($(OS),WIN32GCC) - cp -pv $(SHLIB) $(ROOTSYS)/bin - ln -sf $(ROOTSYS)/bin/$(SHLIB) $(ROOTSYS)/lib/$(SHLIB) - cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include -endif -ifeq ($(OS),DARWIN) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv $(PMUSRPATH)/*.h $(ROOTSYS)/include -endif - -cleaninstall: clean install diff --git a/src/classes/Makefile.PUserFcn b/src/classes/Makefile.PUserFcn deleted file mode 100644 index 6dd9b43d..00000000 --- a/src/classes/Makefile.PUserFcn +++ /dev/null @@ -1,99 +0,0 @@ -#--------------------------------------------------- -# Makefile.PUserFcn -# -# Author: Andreas Suter -# e-mail: andreas.suter@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 -# - -OSTYPE = $(shell uname) - -ifeq ($(OSTYPE),Linux) -OS = LINUX -endif -ifeq ($(OSTYPE),Linux-gnu) -OS = LINUX -endif -ifeq ($(OSTYPE),darwin) -OS = DARWIN -endif - -# -- Linux -ifeq ($(OS),LINUX) -CXX = g++ -CXXFLAGS = -Wall -Wno-trigraphs -fPIC -INCLUDES = -I../include -LD = g++ -LDFLAGS = -g -SOFLAGS = -O -shared -endif - -# -- Darwin -ifeq ($(OS),DARWIN) -CXX = g++ -CXXFLAGS = -Wall -Wno-trigraphs -fPIC -INCLUDES = -I../include -LD = g++ -LDFLAGS = -g -SOFLAGS = -dynamic -endif - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# the ROOT libraries (G = graphic) -LIBS = $(ROOTLIBS) -lXMLParser -GLIBS = $(ROOTGLIBS) -lXMLParser - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += PUserFcn.o PUserFcnDict.o - -SHLIB = libPUserFcn.so - -# make the shared lib: -# -all: $(SHLIB) - -$(SHLIB): $(OBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(OBJS) $(SOFLAGS) -o $(SHLIB) $(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) *Dict* core* - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -PUserFcnDict.cpp: ../include/PUserFcn.h ../include/PUserFcnLinkDef.h - @echo "Generating dictionary $@..." - rootcling -f $@ -c -p $^ - -install: all - @echo "Installing shared lib: libPUserFcn.so ( you must be root ;-) )" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv ../include/PUserFcn.h $(ROOTSYS)/include -endif diff --git a/src/classes/PTheory.cpp b/src/classes/PTheory.cpp index 49b1bc18..b9f19285 100644 --- a/src/classes/PTheory.cpp +++ b/src/classes/PTheory.cpp @@ -390,7 +390,7 @@ Bool_t PTheory::IsValid() * \param paramValues vector with the parameters * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::Func(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::Func(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { if (fMul) { if (fAdd) { // fMul != 0 && fAdd != 0 @@ -1166,7 +1166,7 @@ Double_t PTheory::Asymmetry(const PDoubleVector& paramValues, const PDoubleVecto * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::SimpleExp(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::SimpleExp(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: lambda [tshift] @@ -1206,7 +1206,7 @@ Double_t PTheory::SimpleExp(register Double_t t, const PDoubleVector& paramValue * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::GeneralExp(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::GeneralExp(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: lambda beta [tshift] @@ -1254,7 +1254,7 @@ Double_t PTheory::GeneralExp(register Double_t t, const PDoubleVector& paramValu * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::SimpleGauss(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::SimpleGauss(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: sigma [tshift] @@ -1294,7 +1294,7 @@ Double_t PTheory::SimpleGauss(register Double_t t, const PDoubleVector& paramVal * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StaticGaussKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StaticGaussKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: sigma [tshift] @@ -1336,7 +1336,7 @@ Double_t PTheory::StaticGaussKT(register Double_t t, const PDoubleVector& paramV * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StaticGaussKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StaticGaussKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: frequency damping [tshift] @@ -1425,7 +1425,7 @@ Double_t PTheory::StaticGaussKTLF(register Double_t t, const PDoubleVector& para * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::DynamicGaussKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::DynamicGaussKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: frequency damping hopping [tshift] @@ -1523,7 +1523,7 @@ Double_t PTheory::DynamicGaussKTLF(register Double_t t, const PDoubleVector& par * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StaticLorentzKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StaticLorentzKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: lambda [tshift] @@ -1566,7 +1566,7 @@ Double_t PTheory::StaticLorentzKT(register Double_t t, const PDoubleVector& para * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StaticLorentzKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StaticLorentzKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: frequency damping [tshift] @@ -1663,7 +1663,7 @@ Double_t PTheory::StaticLorentzKTLF(register Double_t t, const PDoubleVector& pa * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::DynamicLorentzKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::DynamicLorentzKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: frequency damping hopping [tshift] @@ -1773,7 +1773,7 @@ Double_t PTheory::DynamicLorentzKTLF(register Double_t t, const PDoubleVector& p * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::CombiLGKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::CombiLGKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: lambdaL lambdaG [tshift] @@ -1819,7 +1819,7 @@ Double_t PTheory::CombiLGKT(register Double_t t, const PDoubleVector& paramValue * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StrKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StrKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: sigma beta [tshift] @@ -1868,7 +1868,7 @@ Double_t PTheory::StrKT(register Double_t t, const PDoubleVector& paramValues, c * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::SpinGlass(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::SpinGlass(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: lambda gamma q [tshift] @@ -1919,7 +1919,7 @@ Double_t PTheory::SpinGlass(register Double_t t, const PDoubleVector& paramValue * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::RandomAnisotropicHyperfine(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::RandomAnisotropicHyperfine(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: nu lambda [tshift] @@ -1964,7 +1964,7 @@ Double_t PTheory::RandomAnisotropicHyperfine(register Double_t t, const PDoubleV * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::Abragam(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::Abragam(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: sigma gamma [tshift] @@ -2008,7 +2008,7 @@ Double_t PTheory::Abragam(register Double_t t, const PDoubleVector& paramValues, * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::TFCos(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::TFCos(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: phase frequency [tshift] @@ -2049,7 +2049,7 @@ Double_t PTheory::TFCos(register Double_t t, const PDoubleVector& paramValues, c * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::InternalField(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::InternalField(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: fraction phase frequency rateT rateL [tshift] @@ -2091,7 +2091,7 @@ Double_t PTheory::InternalField(register Double_t t, const PDoubleVector& paramV * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::InternalFieldGK(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::InternalFieldGK(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: [0]:fraction [1]:frequency [2]:sigma [3]:lambda [4]:beta [[5]:tshift] @@ -2143,7 +2143,7 @@ Double_t PTheory::InternalFieldGK(register Double_t t, const PDoubleVector& para * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::InternalFieldLL(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::InternalFieldLL(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: [0]:fraction [1]:frequency [2]:a [3]:lambda [4]:beta [[5]:tshift] @@ -2195,7 +2195,7 @@ Double_t PTheory::InternalFieldLL(register Double_t t, const PDoubleVector& para * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::Bessel(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::Bessel(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: phase frequency [tshift] @@ -2236,7 +2236,7 @@ Double_t PTheory::Bessel(register Double_t t, const PDoubleVector& paramValues, * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::InternalBessel(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::InternalBessel(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: fraction phase frequency rateT rateL [tshift] @@ -2285,7 +2285,7 @@ Double_t PTheory::InternalBessel(register Double_t t, const PDoubleVector& param * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::SkewedGauss(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::SkewedGauss(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: phase frequency sigma- sigma+ [tshift] @@ -2352,7 +2352,7 @@ Double_t PTheory::SkewedGauss(register Double_t t, const PDoubleVector& paramVal * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StaticNKZF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StaticNKZF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected paramters: damping_D0 [0], R_b tshift [1] @@ -2407,7 +2407,7 @@ Double_t PTheory::StaticNKZF(register Double_t t, const PDoubleVector& paramValu * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::StaticNKTF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::StaticNKTF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected paramters: phase [0], frequency [1], damping_D0 [2], R_b [3], [tshift [4]] @@ -2463,7 +2463,7 @@ Double_t PTheory::StaticNKTF(register Double_t t, const PDoubleVector& paramValu * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::DynamicNKZF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::DynamicNKZF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected paramters: damping_D0 [0], R_b [1], nu_c [2], [tshift [3]] @@ -2524,7 +2524,7 @@ Double_t PTheory::DynamicNKZF(register Double_t t, const PDoubleVector& paramVal * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::DynamicNKTF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::DynamicNKTF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected paramters: phase [0], frequency [1], damping_D0 [2], R_b [3], nu_c [4], [tshift [5]] @@ -2578,7 +2578,7 @@ Double_t PTheory::DynamicNKTF(register Double_t t, const PDoubleVector& paramVal * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::Polynom(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::Polynom(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // expected parameters: tshift p0 p1 p2 ... @@ -2615,7 +2615,7 @@ Double_t PTheory::Polynom(register Double_t t, const PDoubleVector& paramValues, * \param paramValues parameter values * \param funcValues vector with the functions (i.e. functions of the parameters) */ -Double_t PTheory::UserFcn(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const +Double_t PTheory::UserFcn(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const { // check if FUNCTIONS are used for (UInt_t i=0; i Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(OBJS) $(SOFLAGS) -o $(SHLIB) - @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) *Dict* core* - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -# Generate the ROOT CLING dictionary - -TlibBNMRDict.cpp: TBNMR.h TBNMRLinkDef.h - @echo "Generating dictionary $@..." - rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^ - -install: all - @echo "Installing shared lib: libTApproximation.so" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib - cp -pv $(LOCALINCLUDE)/*.h $(ROOTSYS)/include -endif diff --git a/src/external/libBNMR/libLineProfile/Makefile.am b/src/external/libBNMR/libLineProfile/Makefile.am deleted file mode 100644 index 03874921..00000000 --- a/src/external/libBNMR/libLineProfile/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - LineProfile.h - -h_linkdef = \ - LineProfile.h - -dict_h_sources = \ - LineProfileDict.h - -cpp_sources = \ - LineProfile.cpp - -dict_cpp_sources = \ - LineProfileDict.cpp - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) -I$(ROOTINCDIR) -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 - -%Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libLineProfile.la - -libLineProfile_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libLineProfile_la_LIBADD = $(ROOT_LIBS) -libLineProfile_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS) - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libLineProfile.dylib $(libdir)/libLineProfile.so -uninstall-hook: - rm -f $(libdir)/libLineProfile.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygLineProfile-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libLineProfile.so -uninstall-hook: - rm -f $(libdir)/libLineProfile.so -endif diff --git a/src/external/libBNMR/libLineProfile/Makefile.libLineProfile b/src/external/libBNMR/libLineProfile/Makefile.libLineProfile deleted file mode 100644 index 00bcc296..00000000 --- a/src/external/libBNMR/libLineProfile/Makefile.libLineProfile +++ /dev/null @@ -1,66 +0,0 @@ -#--------------------------------------------------- -# get compilation flags from root-config - -ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags) - -#--------------------------------------------------- - -OS = LINUX -CXX = g++ -CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC -LOCALINCLUDE = . -ROOTINCLUDE = $(ROOTSYS)/include -INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE) -LD = g++ -LDFLAGS = -SOFLAGS = -O -shared - -# the output from the root-config script: -CXXFLAGS += $(ROOTCFLAGS) -LDFLAGS += - -# some definitions: headers (used to generate *Dict* stuff), sources, objects,... -OBJS = -OBJS += LineProfile.o LineProfileDict.o - -SHLIB = libLineProfile.so - -# make the shared lib: -# -all: $(SHLIB) - -$(SHLIB): $(OBJS) - @echo "---> Building shared library $(SHLIB) ..." - /bin/rm -f $(SHLIB) - $(LD) $(OBJS) $(SOFLAGS) -o $(SHLIB) - @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) *Dict* core* - @echo "---> removing $(OBJS)" - -# -$(OBJS): %.o: %.cpp - $(CXX) $(INCLUDES) $(CXXFLAGS) -c $< - -# Generate the ROOT CINT dictionary - -LineProfileDict.cpp: LineProfile.h LineProfileLinkDef.h - @echo "Generating dictionary $@..." - rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^ - -install: all - @echo "Installing shared lib: libLineProfile.so" -ifeq ($(OS),LINUX) - cp -pv $(SHLIB) $(ROOTSYS)/lib -endif - -uninstall:; -ifeq ($(OS),LINUX) - rm $(ROOTSYS)/lib/$(SHLIB) -endif - @echo "Installing shared lib: libLineProfile.so" - diff --git a/src/external/libCalcMeanFieldsLEM/Makefile.am b/src/external/libCalcMeanFieldsLEM/Makefile.am deleted file mode 100644 index 032aa1eb..00000000 --- a/src/external/libCalcMeanFieldsLEM/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - TCalcMeanFieldsLEM.h - -h_linkdef = \ - TCalcMeanFieldsLEMLinkDef.h - -dict_h_sources = \ - TCalcMeanFieldsLEMDict.h - -cpp_sources = \ - TCalcMeanFieldsLEM.cpp - -dict_cpp_sources = \ - TCalcMeanFieldsLEMDict.cpp - -pcmdir = $(libdir) -pcm_DATA = TCalcMeanFieldsLEMDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(FITPOFB_CFLAGS) $(PMUSR_CFLAGS) -I$(ROOTINCDIR) $(FFTW3_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 *Dict* *~ core - -%Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libCalcMeanFieldsLEM.la - -libCalcMeanFieldsLEM_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libCalcMeanFieldsLEM_la_LIBADD = $(BMWTOOLS_LIBS) $(FITPOFB_LIBS) $(USERFCN_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... -## pkgconfigdir = $(libdir)/pkgconfig -## pkgconfig_DATA = CalcMeanFieldsLEM.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libCalcMeanFieldsLEM.dylib $(libdir)/libCalcMeanFieldsLEM.so -uninstall-hook: - rm -f $(libdir)/libCalcMeanFieldsLEM.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygCalcMeanFieldsLEM-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libCalcMeanFieldsLEM.so -uninstall-hook: - rm -f $(libdir)/libCalcMeanFieldsLEM.so -endif diff --git a/src/external/libCuba/Makefile.am b/src/external/libCuba/Makefile.am deleted file mode 100644 index af437a64..00000000 --- a/src/external/libCuba/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = src diff --git a/src/external/libCuba/src/Makefile.am b/src/external/libCuba/src/Makefile.am deleted file mode 100644 index 9771bde9..00000000 --- a/src/external/libCuba/src/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## Process this file with automake to create Makefile.in - -SUBDIRS = cuhre divonne suave vegas common - -include_HEADERS = cuba.h - -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -CLEANFILES = common/*~ cuhre/*~ divonne/*~ suave/*~ vegas/*~ *~ core - -lib_LTLIBRARIES = libcuba.la - -libcuba_la_SOURCES = - -libcuba_la_LIBADD = common/libcommon.la cuhre/libcuhre.la divonne/libdivonne.la suave/libsuave.la vegas/libvegas.la -lm -libcuba_la_LDFLAGS = -version-info $(CUBA_LIBRARY_VERSION) -release $(CUBA_RELEASE) $(AM_LDFLAGS) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = cuba.pc - diff --git a/src/external/libCuba/src/common/Makefile.am b/src/external/libCuba/src/common/Makefile.am deleted file mode 100644 index d7f70508..00000000 --- a/src/external/libCuba/src/common/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -## Process this file with automake to create Makefile.in - -c_sources = \ - Global.c \ - Data.c - -AM_CPPFLAGS = -I. -I.. -I../common -DNOUNDERSCORE -AM_CFLAGS = $(LOCAL_CUBA_LIB_CFLAGS) -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) - -noinst_LTLIBRARIES = libcommon.la - -libcommon_la_SOURCES = $(c_sources) -libcommon_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/cuhre/Makefile.am b/src/external/libCuba/src/cuhre/Makefile.am deleted file mode 100644 index 820b8f64..00000000 --- a/src/external/libCuba/src/cuhre/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to create Makefile.in - -c_sources = Cuhre.c - -AM_CPPFLAGS = -I. -I.. -I../common -DNOUNDERSCORE -AM_CFLAGS = $(LOCAL_CUBA_LIB_CFLAGS) "-Dcubafun_=libCuhrecubafun_" -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) - -noinst_LTLIBRARIES = libcuhre.la - -libcuhre_la_SOURCES = $(c_sources) -libcuhre_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/divonne/Makefile.am b/src/external/libCuba/src/divonne/Makefile.am deleted file mode 100644 index a86cd97c..00000000 --- a/src/external/libCuba/src/divonne/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to create Makefile.in - -c_sources = Divonne.c - -AM_CPPFLAGS = -I. -I.. -I../common -DNOUNDERSCORE -AM_CFLAGS = $(LOCAL_CUBA_LIB_CFLAGS) "-Dcubafun_=libDivonnecubafun_" -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) - -noinst_LTLIBRARIES = libdivonne.la - -libdivonne_la_SOURCES = $(c_sources) -libdivonne_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/suave/Makefile.am b/src/external/libCuba/src/suave/Makefile.am deleted file mode 100644 index 47b77135..00000000 --- a/src/external/libCuba/src/suave/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to create Makefile.in - -c_sources = Suave.c - -AM_CPPFLAGS = -I. -I.. -I../common -DNOUNDERSCORE -AM_CFLAGS = $(LOCAL_CUBA_LIB_CFLAGS) "-Dcubafun_=libSuavecubafun_" -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) - -noinst_LTLIBRARIES = libsuave.la - -libsuave_la_SOURCES = $(c_sources) -libsuave_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libCuba/src/vegas/Makefile.am b/src/external/libCuba/src/vegas/Makefile.am deleted file mode 100644 index e67499cd..00000000 --- a/src/external/libCuba/src/vegas/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -## Process this file with automake to create Makefile.in - -c_sources = Vegas.c - -AM_CPPFLAGS = -I. -I.. -I../common -DNOUNDERSCORE -AM_CFLAGS = $(LOCAL_CUBA_LIB_CFLAGS) "-Dcubafun_=libVegascubafun_" -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) - -noinst_LTLIBRARIES = libvegas.la - -libvegas_la_SOURCES = $(c_sources) -libvegas_la_LDFLAGS = $(AM_LDFLAGS) diff --git a/src/external/libFitPofB/Makefile.am b/src/external/libFitPofB/Makefile.am deleted file mode 100644 index be500d10..00000000 --- a/src/external/libFitPofB/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = classes diff --git a/src/external/libFitPofB/classes/Makefile.am b/src/external/libFitPofB/classes/Makefile.am deleted file mode 100644 index 0726d0d0..00000000 --- a/src/external/libFitPofB/classes/Makefile.am +++ /dev/null @@ -1,80 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - ../include/TBofZCalc.h \ - ../include/TBulkTriVortexFieldCalc.h \ - ../include/TLondon1D.h \ - ../include/TPofBCalc.h \ - ../include/TPofTCalc.h \ - ../include/TSkewedGss.h \ - ../include/TVortex.h - -h_linkdef = \ - ../include/TLondon1DLinkDef.h \ - ../include/TVortexLinkDef.h \ - ../include/TSkewedGssLinkDef.h - -dict_h_sources = \ - TLondon1DDict.h \ - TSkewedGssDict.h \ - TVortexDict.h - -cpp_sources = \ - TBulkTriVortexFieldCalc.cpp \ - TBofZCalc.cpp \ - TLondon1D.cpp \ - TPofBCalc.cpp \ - TPofTCalc.cpp \ - TSkewedGss.cpp \ - TVortex.cpp - -dict_cpp_sources = \ - TLondon1DDict.cpp \ - TSkewedGssDict.cpp \ - TVortexDict.cpp - -pcmdir = $(libdir) -pcm_DATA = \ - TLondon1DDict_rdict.pcm \ - TSkewedGssDict_rdict.pcm \ - TVortexDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I../include $(BMWTOOLS_CFLAGS) $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) -I$(ROOTINCDIR) -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 *Dict* *~ ../include/*~ core - -%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libFitPofB.la - -libFitPofB_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libFitPofB_la_LIBADD = $(BMWTOOLS_LIBS) $(LEM_LIBS) $(USERFCN_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 -## pkgconfig_DATA = PTFitPofB.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libFitPofB.dylib $(libdir)/libFitPofB.so -uninstall-hook: - rm -f $(libdir)/libFitPofB.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygFitPofB-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libFitPofB.so -uninstall-hook: - rm -f $(libdir)/libFitPofB.so -endif diff --git a/src/external/libGapIntegrals/INSTALL b/src/external/libGapIntegrals/INSTALL index 427a963e..d00431a5 100644 --- a/src/external/libGapIntegrals/INSTALL +++ b/src/external/libGapIntegrals/INSTALL @@ -4,7 +4,7 @@ Installation of the musrfit-plugin "libGapIntegrals" -* Configure musrfit with the option --enable-BMWlibs and the plugin will be built. +* Configure musrfit with the option -DBMWlibs=1 and the plugin will be built. * The plugin classes can be accessed inside THEORY blocks of musrfit msr files via: diff --git a/src/external/libGapIntegrals/Makefile.am b/src/external/libGapIntegrals/Makefile.am deleted file mode 100644 index 7edbd1c3..00000000 --- a/src/external/libGapIntegrals/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - TGapIntegrals.h - -h_linkdef = \ - TGapIntegralsLinkDef.h - -dict_h_sources = \ - TGapIntegralsDict.h - -cpp_sources = \ - TGapIntegrals.cpp - -dict_cpp_sources = \ - TGapIntegralsDict.cpp - -pcmdir = $(libdir) -pcm_DATA = TGapIntegralsDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(PMUSR_CFLAGS) $(GSL_CFLAGS) -I$(ROOTINCDIR) $(CUBA_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 *Dict* *~ core - -%Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libGapIntegrals.la - -libGapIntegrals_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libGapIntegrals_la_LIBADD = $(BMWTOOLS_LIBS) $(USERFCN_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... -## pkgconfigdir = $(libdir)/pkgconfig -## pkgconfig_DATA = GapIntegrals.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libGapIntegrals.dylib $(libdir)/libGapIntegrals.so -uninstall-hook: - rm -f $(libdir)/libGapIntegrals.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygGapIntegrals-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libGapIntegrals.so -uninstall-hook: - rm -f $(libdir)/libGapIntegrals.so -endif diff --git a/src/external/libGbGLF/CMakeLists.txt b/src/external/libGbGLF/CMakeLists.txt new file mode 100644 index 00000000..4edfdbf9 --- /dev/null +++ b/src/external/libGbGLF/CMakeLists.txt @@ -0,0 +1,65 @@ +# GbGLF library --------------------------------------------------------------- + +#--- generate necessary dictionaries ------------------------------------------ +set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include) +set(GBGLF_INC ${CMAKE_SOURCE_DIR}/src/external/libGbGLF) +set(PREFIX_INC ${CMAKE_INSTALL_PREFIX}/include) + +root_generate_dictionary( + PGbGLFDict + -I${GBGLF_INC} + -I${MUSRFIT_INC} + -I${CMAKE_CURRENT_SOURCE_DIR} + -I${PREFIX_INC} + PGbGLF.h + LINKDEF PGbGLFLinkDef.h + OPTIONS -inlineInputHeader + MODULE PGbGLF +) + +#--- create pkg-config info --------------------------------------------------- +set(PGBGLF_VERSION "1.0.0") +# nothing more for now + +#--- lib creation ------------------------------------------------------------- +add_library(PGbGLF SHARED + PGbGLF.cpp + PGbGLFDict.cxx +) +#--- make sure that the include directory is found ---------------------------- +target_include_directories( + PGbGLF BEFORE PRIVATE + $ + $ + $ +) + +#--- set target properties, e.g. version -------------------------------------- +set_target_properties(PGbGLF + PROPERTIES + VERSION ${PGBGLF_VERSION} +) + +#--- add library dependencies ------------------------------------------------- +target_link_libraries(PGbGLF ${FFTW3_LIBRARY} ${ROOT_LIBRARIES} PUserFcnBase) + +#--- install PGbGLF solib ----------------------------------------------------- +install(TARGETS PGbGLF DESTINATION lib) + +#--- install root pcm's and rootmaps ------------------------------------------ +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/libPGbGLF_rdict.pcm + ${CMAKE_CURRENT_BINARY_DIR}/libPGbGLF.rootmap + DESTINATION lib +) + +#--- install PGbGLF header ---------------------------------------------------- +install( + FILES + PGbGLF.h + DESTINATION + include +) + +#--- install pkg-config info -------------------------------------------------- +# nothing here for now diff --git a/src/external/libGbGLF/Makefile.am b/src/external/libGbGLF/Makefile.am deleted file mode 100644 index 61c9d2bc..00000000 --- a/src/external/libGbGLF/Makefile.am +++ /dev/null @@ -1,56 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - PGbGLF.h - -h_linkdef = \ - PGbGLFLinkDef.h - -dict_h_sources = \ - PGbGLFDict.h - -cpp_sources = \ - PGbGLF.cpp - -dict_cpp_sources = \ - PGbGLFDict.cpp - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) -I$(ROOTINCDIR) -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 - -%Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libGbGLF.la - -libGbGLF_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libGbGLF_la_LIBADD = $(USERFCN_LIBS) -libGbGLF_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 -## pkgconfig_DATA = LFRelaxation.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libGbGLF.dylib $(libdir)/libGbGLF.so -uninstall-hook: - rm -f $(libdir)/libGbGLF.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygGbGLF-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libGbGLF.so -uninstall-hook: - rm -f $(libdir)/libGbGLF.so -endif diff --git a/src/external/libGbGLF/doc/GbG-LF.pdf b/src/external/libGbGLF/doc/GbG-LF.pdf index f7493f5c..19fe32c8 100644 Binary files a/src/external/libGbGLF/doc/GbG-LF.pdf and b/src/external/libGbGLF/doc/GbG-LF.pdf differ diff --git a/src/external/libGbGLF/doc/GbG-LF.tex b/src/external/libGbGLF/doc/GbG-LF.tex index 96cf3370..0161a4be 100644 --- a/src/external/libGbGLF/doc/GbG-LF.tex +++ b/src/external/libGbGLF/doc/GbG-LF.tex @@ -89,7 +89,7 @@ The Gauss-Kubo-Toyabe LF polarization function is \noindent In Ref.\cite{yaouanc2011} a slightly different notation is used: $\sigma \to \Delta_{\rm G}$, $\sigma_0 \to \Delta_{0}$, and $\sigma_1 \to \Delta_{\rm GbG}$. -\noindent The GbG LF polarizatio function is given by +\noindent The GbG LF polarization function is given by \begin{equation} P_{Z,{\rm GbG}}^{\rm LF} = \int_0^\infty d\sigma \left\{ \varrho \cdot P_{Z,{\rm GKT}}^{\rm LF} \right\}. diff --git a/src/external/libLFRelaxation/Makefile.am b/src/external/libLFRelaxation/Makefile.am deleted file mode 100644 index 3b6ca9f3..00000000 --- a/src/external/libLFRelaxation/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - TLFRelaxation.h - -h_linkdef = \ - TLFRelaxationLinkDef.h - -dict_h_sources = \ - TLFRelaxationDict.h - -cpp_sources = \ - TLFRelaxation.cpp - -dict_cpp_sources = \ - TLFRelaxationDict.cpp - -pcmdir = $(libdir) -pcm_DATA = TLFRelaxationDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) $(GSL_CFLAGS) -I$(ROOTINCDIR) $(CUBA_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 *Dict* *~ core - -%Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libLFRelaxation.la - -libLFRelaxation_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libLFRelaxation_la_LIBADD = $(BMWTOOLS_LIBS) $(USERFCN_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... -## pkgconfigdir = $(libdir)/pkgconfig -## pkgconfig_DATA = LFRelaxation.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libLFRelaxation.dylib $(libdir)/libLFRelaxation.so -uninstall-hook: - rm -f $(libdir)/libLFRelaxation.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygLFRelaxation-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libLFRelaxation.so -uninstall-hook: - rm -f $(libdir)/libLFRelaxation.so -endif diff --git a/src/external/libLFRelaxation/README b/src/external/libLFRelaxation/README index d8bddc0e..2a9f978a 100644 --- a/src/external/libLFRelaxation/README +++ b/src/external/libLFRelaxation/README @@ -8,7 +8,7 @@ Implementation of a userFcn-interface to Gaussian and Lorentzian static and dyna At the moment this is a simple alternative implementation to the functions provided by musrfit itself. Mostly, this effort should be regarded as a design study which is not really indended for production use. -If musrfit has been configured with --enable-BMWlibs the functions can be called as: +If musrfit has been configured with -DBMWlibs=1 the functions can be called as: userFcn libLFRelaxation TLFStatGssKT 1 2 (frequency rate) userFcn libLFRelaxation TLFStatExpKT 1 2 (frequency rate) diff --git a/src/external/libPhotoMeissner/Makefile.am b/src/external/libPhotoMeissner/Makefile.am deleted file mode 100644 index be500d10..00000000 --- a/src/external/libPhotoMeissner/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = classes diff --git a/src/external/libPhotoMeissner/classes/Makefile.am b/src/external/libPhotoMeissner/classes/Makefile.am deleted file mode 100644 index 162fa3cd..00000000 --- a/src/external/libPhotoMeissner/classes/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - ../include/PStartupHandler_PM.h \ - ../include/PPhotoMeissner.h - -h_linkdef = \ - ../include/PStartupHandler_PMLinkDef.h \ - ../include/PPhotoMeissnerLinkDef.h - -dict_h_sources = \ - ../include/PStartupHandler_PMDict.h \ - ../include/PPhotoMeissnerDict.h - -cpp_sources = \ - PStartupHandler_PM.cpp \ - PPhotoMeissner.cpp - -dict_cpp_sources = \ - PStartupHandler_PMDict.cpp \ - PPhotoMeissnerDict.cpp - -pcmdir = $(libdir) -pcm_DATA = \ - PPhotoMeissnerDict_rdict.pcm \ - PStartupHandler_PMDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I../include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) -I$(ROOTINCDIR) $(GSL_CFLAGS) -AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) - -BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core - -%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libPPhotoMeissner.la - -libPPhotoMeissner_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libPPhotoMeissner_la_LIBADD = $(USERFCN_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS) $(GSL_LIBS) -libPPhotoMeissner_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 -## pkgconfig_DATA = PPhotoMeissner.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libPPhotoMeissner.dylib $(libdir)/libPPhotoMeissner.so -uninstall-hook: - rm -f $(libdir)/libPPhotoMeissner.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygPPhotoMeissner-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPSpinValve.so -uninstall-hook: - rm -f $(libdir)/libPPhotoMeissner.so -endif - diff --git a/src/external/libSpinValve/Makefile.am b/src/external/libSpinValve/Makefile.am deleted file mode 100644 index be500d10..00000000 --- a/src/external/libSpinValve/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -SUBDIRS = classes diff --git a/src/external/libSpinValve/classes/Makefile.am b/src/external/libSpinValve/classes/Makefile.am deleted file mode 100644 index f88b337f..00000000 --- a/src/external/libSpinValve/classes/Makefile.am +++ /dev/null @@ -1,67 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - ../include/PStartupHandler_SV.h \ - ../include/PSkewedLorentzian.h - -h_linkdef = \ - ../include/PStartupHandler_SVLinkDef.h \ - ../include/PSkewedLorentzianLinkDef.h - -dict_h_sources = \ - ../include/PStartupHandler_SVDict.h \ - ../include/PSkewedLorentzianDict.h - -cpp_sources = \ - PStartupHandler_SV.cpp \ - PSkewedLorentzian.cpp - -dict_cpp_sources = \ - PStartupHandler_SVDict.cpp \ - PSkewedLorentzianDict.cpp - -pcmdir = $(libdir) -pcm_DATA = \ - PStartupHandler_SVDict_rdict.pcm \ - PSkewedLorentzianDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include -I../include $(PMUSR_CFLAGS) $(FFTW3_CFLAGS) -I$(ROOTINCDIR) -AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS) - -BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources) -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@ -CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core - -%Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libPSpinValve.la - -libPSpinValve_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libPSpinValve_la_LIBADD = $(USERFCN_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS) -libPSpinValve_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 -## pkgconfig_DATA = PSpinValve.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libPSpinValve.dylib $(libdir)/libPSpinValve.so -uninstall-hook: - rm -f $(libdir)/libPSpinValve.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygPSpinValve-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPSpinValve.so -uninstall-hook: - rm -f $(libdir)/libPSpinValve.so -endif - diff --git a/src/external/libZFRelaxation/Makefile.am b/src/external/libZFRelaxation/Makefile.am deleted file mode 100644 index 8389b0bf..00000000 --- a/src/external/libZFRelaxation/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - ZFRelaxation.h - -h_linkdef = \ - ZFRelaxationLinkDef.h - -dict_h_sources = \ - ZFRelaxationDict.h - -cpp_sources = \ - ZFRelaxation.cpp - -dict_cpp_sources = \ - ZFRelaxationDict.cpp - -pcmdir = $(libdir) -pcm_DATA = ZFRelaxationDict_rdict.pcm - -include_HEADERS = $(h_sources) -noinst_HEADERS = $(h_linkdef) $(dict_h_sources) - -AM_CPPFLAGS = -I$(top_srcdir)/src/include $(BMWTOOLS_CFLAGS) $(PMUSR_CFLAGS) -I$(ROOTINCDIR) -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 *Dict* *~ core - -%Dict.cpp %Dict.h: %.h %LinkDef.h - @ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^ - -lib_LTLIBRARIES = libZFRelaxation.la - -libZFRelaxation_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources) -libZFRelaxation_la_LIBADD = $(BMWTOOLS_LIBS) $(USERFCN_LIBS) $(GSL_LIBS) $(ROOT_LIBS) -libZFRelaxation_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 -## pkgconfig_DATA = ZFRelaxation.pc - -## However, create some symbolic links to the shared library -## in order to unify the function call on different operating systems - -if IS_DARWIN -install-exec-hook: - $(LN_S) -f $(libdir)/libZFRelaxation.dylib $(libdir)/libZFRelaxation.so -uninstall-hook: - rm -f $(libdir)/libZFRelaxation.so -endif - -if IS_CYGWIN -install-exec-hook: - $(LN_S) -f $(bindir)/cygZFRelaxation-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libZFRelaxation.so -uninstall-hook: - rm -f $(libdir)/libZFRelaxation.so -endif diff --git a/src/external/mud/Makefile.am b/src/external/mud/Makefile.am deleted file mode 100644 index 2cad62a2..00000000 --- a/src/external/mud/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = src diff --git a/src/external/mud/src/Makefile.am b/src/external/mud/src/Makefile.am deleted file mode 100644 index 4faa5b9e..00000000 --- a/src/external/mud/src/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = mud.h -cpp_sources = mud_all.c \ - mud.c \ - mud_encode.c \ - mud_friendly.c \ - mud_gen.c \ - mud_new.c \ - mud_tri_ti.c - -include_HEADERS = mud.h - -AM_CPPFLAGS = -I. -AM_CFLAGS = $(LOCAL_MUD_LIB_CFLAGS) - -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -CLEANFILES = *~ core - -lib_LTLIBRARIES = libmud.la - -libmud_la_SOURCES = $(h_sources) $(cpp_sources) -libmud_la_LDFLAGS = $(AM_LDFLAGS) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = mud.pc - diff --git a/src/external/nexus/Makefile.am b/src/external/nexus/Makefile.am deleted file mode 100644 index 31ea2254..00000000 --- a/src/external/nexus/Makefile.am +++ /dev/null @@ -1,25 +0,0 @@ -## Process this file with automake to create Makefile.in - -h_sources = \ - PNeXus.h - -cpp_sources = \ - PNeXus.cpp - -include_HEADERS = $(h_sources) - -AM_CPPFLAGS = $(HDF5_CFLAGS) $(NEXUS_CFLAGS) -AM_CXXFLAGS = $(LOCAL_PNEXUS_LIB_CXXFLAGS) - -AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -CLEANFILES = *~ core - -lib_LTLIBRARIES = libPNeXus.la - -libPNeXus_la_SOURCES = $(h_sources) $(cpp_sources) -libPNeXus_la_LIBADD = $(NEXUS_LIBS) -libPNeXus_la_LDFLAGS = -version-info $(PNEXUS_LIBRARY_VERSION) -release $(PNEXUS_RELEASE) $(AM_LDFLAGS) - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = PNeXus.pc - diff --git a/src/include/PTheory.h b/src/include/PTheory.h index 01c8c233..b132a347 100644 --- a/src/include/PTheory.h +++ b/src/include/PTheory.h @@ -240,7 +240,7 @@ class PTheory virtual ~PTheory(); virtual Bool_t IsValid(); - virtual Double_t Func(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t Func(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; private: virtual void CleanUp(PTheory *theo); @@ -252,34 +252,34 @@ class PTheory virtual Double_t Constant(const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; virtual Double_t Asymmetry(const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t SimpleExp(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t GeneralExp(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t SimpleGauss(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StaticGaussKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StaticGaussKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t DynamicGaussKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StaticLorentzKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StaticLorentzKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t DynamicLorentzKTLF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t CombiLGKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StrKT(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t SpinGlass(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t RandomAnisotropicHyperfine(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t Abragam(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t TFCos(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t InternalField(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t InternalFieldGK(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t InternalFieldLL(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t Bessel(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t InternalBessel(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t SkewedGauss(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StaticNKZF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t StaticNKTF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t DynamicNKZF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t DynamicNKTF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t MuMinusExpTF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t Polynom(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; - virtual Double_t UserFcn(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t SimpleExp(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t GeneralExp(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t SimpleGauss(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StaticGaussKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StaticGaussKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t DynamicGaussKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StaticLorentzKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StaticLorentzKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t DynamicLorentzKTLF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t CombiLGKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StrKT(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t SpinGlass(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t RandomAnisotropicHyperfine(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t Abragam(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t TFCos(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t InternalField(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t InternalFieldGK(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t InternalFieldLL(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t Bessel(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t InternalBessel(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t SkewedGauss(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StaticNKZF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t StaticNKTF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t DynamicNKZF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t DynamicNKTF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t MuMinusExpTF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t Polynom(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; + virtual Double_t UserFcn(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const; virtual void CalculateGaussLFIntegral(const Double_t *val) const; virtual void CalculateLorentzLFIntegral(const Double_t *val) const; diff --git a/src/musredit/Makefile.am b/src/musredit/Makefile.am deleted file mode 100644 index b940078e..00000000 --- a/src/musredit/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to create Makefile.in - -CLEANFILES = *~ core moc_* ui_* - - diff --git a/src/musredit_qt5/Makefile.am b/src/musredit_qt5/Makefile.am deleted file mode 100644 index 5b8f3d2e..00000000 --- a/src/musredit_qt5/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -## Process this file with automake to create Makefile.in - -CLEANFILES = *~ core moc_* ui_* - diff --git a/src/musredit_qt5/musredit/PTextEdit.cpp b/src/musredit_qt5/musredit/PTextEdit.cpp index 3f9d8ade..7361e90e 100644 --- a/src/musredit_qt5/musredit/PTextEdit.cpp +++ b/src/musredit_qt5/musredit/PTextEdit.cpp @@ -1061,9 +1061,9 @@ void PTextEdit::fileOpen() tr( "msr-Files (*.msr);;msr-Files (*.msr *.mlog);;All Files (*)" )); QStringList::Iterator it = flns.begin(); - QFileInfo finfo1, finfo2; - QString tabFln; + QFileInfo finfo1; bool alreadyOpen = false; + int idx; // if flns are present, keep the corresponding directory if (flns.size() > 0) { @@ -1071,23 +1071,17 @@ void PTextEdit::fileOpen() fLastDirInUse = finfo1.absoluteFilePath(); } - while( it != flns.end() ) { + while( it != flns.end() ) { // check if the file is not already open finfo1.setFile(*it); - for (int i=0; icount(); i++) { - tabFln = *fFilenames.find( dynamic_cast(fTabWidget->widget(i))); - finfo2.setFile(tabFln); - if (finfo1.absoluteFilePath() == finfo2.absoluteFilePath()) { - alreadyOpen = true; - fTabWidget->setCurrentIndex(i); - break; - } - } + alreadyOpen = fileAlreadyOpen(finfo1, idx); - if (!alreadyOpen) + if (!alreadyOpen) { load(*it); - else + } else { + fTabWidget->setCurrentIndex(idx); fileReload(); + } ++it; } @@ -1368,8 +1362,13 @@ void PTextEdit::filePrint() */ void PTextEdit::fileClose(const bool check) { + // first check if there is any tab present + if (fTabWidget->count()==0) // no tabs present + return; + // check if the has modification int idx = fTabWidget->currentIndex(); + if ((fTabWidget->tabText(idx).indexOf("*")>0) && check) { int result = QMessageBox::warning(this, "**WARNING**", "Do you really want to close this file.\nChanges will be lost", @@ -2053,7 +2052,6 @@ void PTextEdit::musrMsr2Data() } if (dlg->exec() == QDialog::Accepted) { - QString first, last; QString runList; QString runListFileName; QFileInfo fi; @@ -2246,6 +2244,9 @@ void PTextEdit::musrMsr2Data() QString fln; QFile *file; QTextStream *stream; + QFileInfo finfo; + bool alreadOpen=false; + int idx=0; if (!fMsr2DataParam->global) { // standard fits switch(dlg->getRunTag()) { @@ -2264,7 +2265,14 @@ void PTextEdit::musrMsr2Data() if (fTabWidget->count() != 0) { workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(); } - load(workDir + "/" + fln); + finfo.setFile(workDir + "/" + fln); + alreadOpen = fileAlreadyOpen(finfo, idx); + if (!alreadOpen) { + load(workDir + "/" + fln); + } else { + fTabWidget->setCurrentIndex(idx); + fileReload(); + } } break; case 1: // run list file @@ -2290,7 +2298,14 @@ void PTextEdit::musrMsr2Data() if (fTabWidget->count() != 0) { workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(); } - load(workDir + "/" + fln); + finfo.setFile(workDir + "/" + fln); + alreadOpen = fileAlreadyOpen(finfo, idx); + if (!alreadOpen) { + load(workDir + "/" + fln); + } else { + fTabWidget->setCurrentIndex(idx); + fileReload(); + } } } @@ -3196,6 +3211,32 @@ QStringList PTextEdit::getRunList(QString runListStr, bool &ok) return result; } +//---------------------------------------------------------------------------------------------------- +/** + * @brief PTextEdit::fileAlreadyOpen + * @param finfo + * @param idx + * @return + */ +bool PTextEdit::fileAlreadyOpen(QFileInfo &finfo, int &idx) +{ + bool result = false; + QFileInfo finfo2; + QString tabFln; + + for (int i=0; icount(); i++) { + tabFln = *fFilenames.find( dynamic_cast(fTabWidget->widget(i))); + finfo2.setFile(tabFln); + if (finfo.absoluteFilePath() == finfo2.absoluteFilePath()) { + result = true; + idx = i; + break; + } + } + + return result; +} + //---------------------------------------------------------------------------------------------------- // END //---------------------------------------------------------------------------------------------------- diff --git a/src/musredit_qt5/musredit/PTextEdit.h b/src/musredit_qt5/musredit/PTextEdit.h index 6f0c9615..3fc8e21a 100644 --- a/src/musredit_qt5/musredit/PTextEdit.h +++ b/src/musredit_qt5/musredit/PTextEdit.h @@ -38,6 +38,7 @@ #include #include #include +#include #include @@ -186,6 +187,7 @@ private: void getTheme(); void fillRecentFiles(); QStringList getRunList(QString runListStr, bool &ok); + bool fileAlreadyOpen(QFileInfo &finfo, int &idx); }; diff --git a/src/musrgui/Makefile.am b/src/musrgui/Makefile.am deleted file mode 100644 index 2f509505..00000000 --- a/src/musrgui/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ -## Process this file with automake to create Makefile.in - -CLEANFILES = *~ core - -