LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged master into beta-NMR

Browse Source
This commit is contained in:
Zaher Salman 2019-04-05 08:15:03 +00:00
commit cf2e127aae
81 changed files with 475 additions and 4382 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -9,8 +9,6 @@ Andreas Suter <andreas.suter@psi.ch>
Bastian M. Wojek Bastian M. Wojek
msr2data; initial testing; full initial documentation; BMWlibs; msr2data; initial testing; full initial documentation; BMWlibs;
unified building process on Linux, MacOSX and Windows (Cygwin)
through autotools
#--------------------------------------------------------------------- #---------------------------------------------------------------------
# this is the end ... # this is the end ...

2
CMakeLists.txt
View File

@ -1,7 +1,7 @@
# - musrfit # - musrfit
cmake_minimum_required(VERSION 3.6) 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 ------------------------------------------------- #--- musrfit specific options -------------------------------------------------
option(nexus "build optional NeXus support. Needed for ISIS" OFF) option(nexus "build optional NeXus support. Needed for ISIS" OFF)

6
ChangeLog
View File

@ -12,6 +12,12 @@ or
https://bitbucket.org/muonspin/musrfit/commits/all 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 Release of V1.2.0, 2017/10/26
============================= =============================

40
INSTALL
View File

@ -2,45 +2,11 @@
# INSTALL # INSTALL
#--------------------------------------------------------------------- #---------------------------------------------------------------------
There are currently two ways to build musrfit, In the following it is assumed that the system variable ROOTSYS is already
defined and pointing to the place where CERN/ROOT is installed.
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.
#---------------------------------- #----------------------------------
# Install using automake tool chain # Install via cmake 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
#---------------------------------- #----------------------------------
cmake minimal required version is 3.6. cmake minimal required version is 3.6.

32
Makefile.am
View File

@ -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)

128
acinclude.m4
View File

@ -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 <cholm@nbi.dk>
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
#

101
autogen.sh
View File

@ -1,101 +0,0 @@
#! /bin/sh
# autogen.sh
#
# Copyright (c) 2009 BMW
# Copyright (c) 2002 Daniel Elstner <daniel.elstner@gmx.net>
#
# 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

4
cmake/CPackOptions.cmake.in
View File

@ -24,11 +24,11 @@ set (CPACK_SET_DESTDIR "OFF")
set (CPACK_PACKAGE_RELOCATABLE "true") set (CPACK_PACKAGE_RELOCATABLE "true")
if (${CPACK_GENERATOR} STREQUAL "RPM") 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_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set (CPACK_PACKAGING_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@") set (CPACK_PACKAGING_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
set (CPACK_RPM_FILE_NAME "RPM-DEFAULT") 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 # next variable for RHEL, CentOS, Fedfora
set (CPACK_RPM_PACKAGE_RELEASE_DIST "") set (CPACK_RPM_PACKAGE_RELEASE_DIST "")
set (CPACK_RPM_PACKAGE_LICENSE "GPLv2") set (CPACK_RPM_PACKAGE_LICENSE "GPLv2")

2
cmake/ChangeLogRPM
View File

@ -1,2 +1,4 @@
* Mon Mar 11 2019 Andreas Suter <andreas.suter@psi.ch> - 1.4.2-2
- minor version update
* Mon Jan 14 2019 Andreas Suter <andreas.suter@psi.ch> - 1.4.0-1 * Mon Jan 14 2019 Andreas Suter <andreas.suter@psi.ch> - 1.4.0-1
- first cpack/cmake version - first cpack/cmake version

1475
configure.ac
View File

File diff suppressed because it is too large Load Diff

2
doc/html/.buildinfo
View File

@ -1,4 +1,4 @@
# Sphinx build info version 1 # 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. # 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 tags: 645f666f9bcd5a90fca523b33c5a78b7

42
doc/html/_sources/setup-dks.txt
View File

@ -149,46 +149,6 @@ switch the working branch which is done by
$ cd $HOME/Apps/musrfit $ cd $HOME/Apps/musrfit
$ git checkout dks6 $ 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 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 .. 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 After

280
doc/html/_sources/setup-standard.txt
View File

@ -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 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! present installation step *before* starting the installation process!
Apart from `GCC, the GNU Compiler Collection <http://gcc.gnu.org/>`_ (``gcc``, ``g++``), the GNU build tools `autoconf <http://www.gnu.org/software/autoconf/>`_, Apart from `GCC, the GNU Compiler Collection <http://gcc.gnu.org/>`_ (``gcc``, ``g++``), the build tool `cmake <https://cmake.org/>`_ is needed. Furthermore the helper
`automake <http://www.gnu.org/software/automake/>`_, and `libtool <http://www.gnu.org/software/libtool/>`_ are needed, if you want to build musrfit via the automake toolchain. tool `pkg-config <http://pkg-config.freedesktop.org/wiki/>`_ needs to be in place, and musrfit requires the installation of a few open-source libraries and programs including
The ``automake`` toolchain will eventually be droped in upcoming releases. their header packages:
If you plan to use the cmake toolchain (preferred way), `cmake <https://cmake.org/>`_. Furthermore the helper tool `pkg-config <http://pkg-config.freedesktop.org/wiki/>`_ is
needed and musrfit requires the installation of a few open-source libraries and programs including their header packages:
.. index:: boost-c++ .. index:: boost-c++
@ -94,14 +92,15 @@ Before the installation procedure will be described, please note the following r
**GNU/Linux** **GNU/Linux**
No serious problems are currently known. Tested distributions: `RHEL <https://www.redhat.com/de/technologies/linux-platforms/enterprise-linux>`_, `Fedora <https://getfedora.org/>`_, No serious problems are currently known. Tested distributions: `RHEL <https://www.redhat.com/de/technologies/linux-platforms/enterprise-linux>`_, `Fedora <https://getfedora.org/>`_,
`Debian <https://www.debian.org/>`_, `Ubuntu <https://www.ubuntu.com/>`_, `Mint <https://linuxmint.com/>`_, `openSUSE <https://en.opensuse.org/Main_Page>`_. `Debian <https://www.debian.org/>`_, `Ubuntu <https://www.ubuntu.com/>`_, `Mint <https://linuxmint.com/>`_, `openSUSE <https://en.opensuse.org/Main_Page>`_,
`manjaro <https://de.manjaro.org/>`_, and `antergos <https://antergos.com/>`_.
**Mac OS X/macOS** **Mac OS X/macOS**
No serious problems are currently known for macOS ≥ 10.6. No serious problems are currently known for macOS ≥ 10.6.
**MS Windows** **MS Windows**
Native *MS Windows* support is currently not available. Potential ways to get ``musrfit`` running are: 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 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`_. * via `cygwin`_.
.. _cygwin: https://www.cygwin.com/ .. _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 *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 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 GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. The necessary
Red Hat-like systems binary packages for ``MXML``, ``HDF4``, and ``HDF5`` might be called ``mxml``, ``mxml-devel``, packages to build ``NeXus`` are ``MXML``, (``HDF4``), and ``HDF5``. This means, for a rpm-package based distro try something like:
``hdf``, ``hdf-devel``, ``hdf5``, ``hdf5-devel``, on Debian-like systems ``libmxml1``, ``libmxml-dev``, ``libhdf4-dev``, ``libhdf5-dev``.
.. 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:: .. note::
@ -213,10 +221,8 @@ A brief instruction how to get ``NeXus`` compiled from source (lines starting wi
ROOT 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 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 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 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 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 $ # creat the Apps directory if not already present
$ mkdir Apps $ mkdir Apps
$ cd Apps $ cd Apps
$ git clone http://root.cern.ch/git/root.git $ git clone http://github.com/root-project/root.git
$ cd root $ cd root
$ git tag -l $ 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 $ # 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. $ # 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. $ # since we are using cmake build now, first we will need to create the build directory.
$ mkdir root_build $ mkdir root_build
@ -299,7 +305,7 @@ If an update of ROOT is needed, simple do the following:
musrfit 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. 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 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 $ cd $HOME/Apps
$ git clone https://bitbucket.org/muonspin/musrfit.git $ git clone https://bitbucket.org/muonspin/musrfit.git
$ # Only if legacy ROOT 5.xx.yy is used include the next line $ cd musrfit
$ cd musrfit; git checkout root5
or or
@ -316,8 +321,7 @@ or
$ cd $HOME/Apps $ cd $HOME/Apps
$ git clone git://gitlab.psi.ch/nemu/musrfit.git $ git clone git://gitlab.psi.ch/nemu/musrfit.git
$ # Only if legacy ROOT 5.xx.yy is used include the next line $ cd musrfit
$ cd musrfit; git checkout root5
.. note:: .. note::
@ -331,24 +335,6 @@ or
$ cd $HOME/Apps/musrfit $ cd $HOME/Apps/musrfit
$ git pull $ 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 $ cd build
$ xargs rm < install_manifest.txt $ xargs rm < install_manifest.txt
$ cmake --build ./ --clean-first $ 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`_ 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 <http://en.wikipedia.org/wiki/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 .. index:: musrfit-build-cmake-linux
musrfit build with cmake 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 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 In case this is found, the editor ``musredit`` is built already together with ``musrfit``.
the configure script with the **- -with-qt5** option (``automake``). ``cmake`` will determine everthing automatically.
To install this editor separately, *i.e.* by "hand" do To install this editor separately, *i.e.* by "hand" do
.. code-block:: bash .. code-block:: bash
@ -740,60 +670,6 @@ 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 As an alternative (if git is not available), the source code can also be downloaded from the following
web-page: `musrfit at bitbucket`_. 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 .. index:: musrfit-build-cmake-windows
musrfit build with cmake musrfit build with cmake
@ -847,8 +723,7 @@ musredit
In the latest version of ``musrfit`` the configure script tries to determine automatically if 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 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 readily with ``musrfit``. If not, try the following:
``--with-qt4`` option or install this editor separately, *.e.g.*:
.. code-block:: bash .. code-block:: bash
@ -945,7 +820,7 @@ with OS X (on the installation DVD/CDs) should be installed:
**X11** **X11**
The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also 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 <http://xquartz.macosforge.org/trac>`_. If ``ROOT`` runs without ``XQuartz`` *do not*
install it. install it.
After installing the ``Xcode`` tools go to the `MacPorts install page <http://www.macports.org/install.php>`_, download After installing the ``Xcode`` tools go to the `MacPorts install page <http://www.macports.org/install.php>`_, download
@ -1034,7 +909,7 @@ Only ``NeXus`` Version ≥ 4.4 is support!) this can be achieved for example by:
ROOT 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 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 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 <https://root.cern.ch/downloading-root>`_. by the ``ROOT`` people you can download the package installer from the ``ROOT`` `download page <https://root.cern.ch/downloading-root>`_.
Choose the latest ``ROOT`` release and download you macOS version dmg-file, *e.g.* for macOS 10.13 (High Sierra) 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 ``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: 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 .. code-block:: bash
$ cd /Applications $ cd /Applications
$ sudo chown -R <username> root_v6.14.00 $ sudo chown -R <username> root_v6.16.00
$ sudo chgrp -R staff root_v6.14.00 $ sudo chgrp -R staff root_v6.16.00
$ sudo ln -s root_v6.14.00 root $ sudo ln -s root_v6.16.00 root
ROOT installed from source 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 .. code-block:: bash
$ cd $HOME/Applications $ cd $HOME/Applications
$ git clone http://root.cern.ch/git/root.git $ git clone http://github.com/root-project/root.git
$ cd root $ cd root
$ git tag -l $ git tag -l
$ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx $ # 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 $ # where xx is the highest listed number, e.g. v6-16-00
$ 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. $ # 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. $ # We will use the cmake out-of-source approach here.
$ mkdir root_build $ mkdir root_build
@ -1158,7 +1033,7 @@ Before proceeding with the usage of the `Fink`_ system first a few useful tools
**X11** **X11**
The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also 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 <http://xquartz.macosforge.org/trac>`_. If ``ROOT`` runs without ``XQuartz`` *do not*
install it. install it.
After installing the ``Xcode`` tools go to the `Fink download page <http://www.finkproject.org/download/index.php?phpLang=en>`_, After installing the ``Xcode`` tools go to the `Fink download page <http://www.finkproject.org/download/index.php?phpLang=en>`_,
@ -1256,7 +1131,7 @@ this can be achieved for example by:
ROOT 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 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 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 <https://root.cern.ch/downloading-root>`_. by the ``ROOT`` people you can download the package installer from the ``ROOT`` `download page <https://root.cern.ch/downloading-root>`_.
Choose the latest ``ROOT`` release and download you macOS version dmg-file, *e.g.* for macOS 10.13 (High Sierra) 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 ``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: 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 .. code-block:: bash
$ cd /Applications $ cd /Applications
$ sudo chown -R <username> root_v6.14.00 $ sudo chown -R <username> root_v6.16.00
$ sudo chgrp -R staff root_v6.14.00 $ sudo chgrp -R staff root_v6.16.00
$ sudo ln -s root_v6.14.00 root $ sudo ln -s root_v6.16.00 root
ROOT installed from source 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 .. code-block:: bash
$ cd $HOME/Applications $ cd $HOME/Applications
$ git clone http://root.cern.ch/git/root.git $ git clone http://github.com/root-project/root.git
$ cd root $ cd root
$ git tag -l $ git tag -l
$ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx $ # 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 $ # where xx is the highest listed number, e.g. v6-16-00
$ 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. $ # 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. $ # We will use the cmake out-of-source approach here.
$ mkdir root_build $ mkdir root_build
@ -1374,8 +1249,7 @@ in ``~/Applications/musrfit`` this is achieved most easily calling from the term
$ cd ~/Applications $ cd ~/Applications
$ git clone https://bitbucket.org/muonspin/musrfit.git $ git clone https://bitbucket.org/muonspin/musrfit.git
$ # Only if legacy ROOT 5.xx.yy is used include the next line $ cd musrfit
$ cd musrfit; git checkout root5
or or
@ -1383,8 +1257,7 @@ or
$ cd ~/Applications $ cd ~/Applications
$ git clone git://gitlab.psi.ch/nemu/musrfit.git $ git clone git://gitlab.psi.ch/nemu/musrfit.git
$ # Only if legacy ROOT 5.xx.yy is used include the next line $ cd musrfit
$ cd musrfit; git checkout root5
If a local repository clone is already present, one can update it using: If a local repository clone is already present, one can update it using:
@ -1396,62 +1269,6 @@ 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 As an alternative (*if git is not available*), the source code can also be downloaded from the following
web-page: `musrfit at bitbucket`_. 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 <http://en.wikipedia.org/wiki/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 .. index:: musrfit-build-cmake-macos
musrfit build with cmake musrfit build with cmake
@ -1521,8 +1338,7 @@ musredit
In the latest version of ``musrfit`` the configure script tries to determine automatically the highest 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``. 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 If not, try the following:
determine everthing automatically. To install this editor separately, *i.e.* by “hand” do
.. code-block:: bash .. code-block:: bash

12
doc/html/acknowledgement.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Acknowledgements &mdash; musrfit 1.4.1 documentation</title> <title>Acknowledgements &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="Bugtracking" href="bugtracking.html" /> <link rel="next" title="Bugtracking" href="bugtracking.html" />
<link rel="prev" title="MusrRoot - an Extensible Open File Format for μSR" href="musr-root.html" /> <link rel="prev" title="MusrRoot - an Extensible Open File Format for μSR" href="musr-root.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="musr-root.html" title="MusrRoot - an Extensible Open File Format for μSR" <a href="musr-root.html" title="MusrRoot - an Extensible Open File Format for μSR"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -108,12 +108,12 @@ extremely competent way to deal with his projects as well as to deal with the ch
<li class="right" > <li class="right" >
<a href="musr-root.html" title="MusrRoot - an Extensible Open File Format for μSR" <a href="musr-root.html" title="MusrRoot - an Extensible Open File Format for μSR"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/any2many.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>any2many - a Universal μSR-file-format converter &mdash; musrfit 1.4.1 documentation</title> <title>any2many - a Universal μSR-file-format converter &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="MusrRoot - an Extensible Open File Format for μSR" href="musr-root.html" /> <link rel="next" title="MusrRoot - an Extensible Open File Format for μSR" href="musr-root.html" />
<link rel="prev" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files" href="msr2data.html" /> <link rel="prev" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files" href="msr2data.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="msr2data.html" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files" <a href="msr2data.html" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -102,12 +102,12 @@ For a detailed description see <a class="reference internal" href="user-manual.h
<li class="right" > <li class="right" >
<a href="msr2data.html" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files" <a href="msr2data.html" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/bugtracking.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Bugtracking &mdash; musrfit 1.4.1 documentation</title> <title>Bugtracking &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="prev" title="Acknowledgements" href="acknowledgement.html" /> <link rel="prev" title="Acknowledgements" href="acknowledgement.html" />
</head> </head>
<body> <body>
@ -37,7 +37,7 @@
<li class="right" > <li class="right" >
<a href="acknowledgement.html" title="Acknowledgements" <a href="acknowledgement.html" title="Acknowledgements"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -93,12 +93,12 @@ or send an e-mail to A. Suter at PSI.</p>
<li class="right" > <li class="right" >
<a href="acknowledgement.html" title="Acknowledgements" <a href="acknowledgement.html" title="Acknowledgements"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/cite.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>How to Cite musrfit? &mdash; musrfit 1.4.1 documentation</title> <title>How to Cite musrfit? &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="Tutorial for musrfit" href="tutorial.html" /> <link rel="next" title="Tutorial for musrfit" href="tutorial.html" />
<link rel="prev" title="Welcome to the musrfit documentation!" href="index.html" /> <link rel="prev" title="Welcome to the musrfit documentation!" href="index.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="index.html" title="Welcome to the musrfit documentation!" <a href="index.html" title="Welcome to the musrfit documentation!"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -114,12 +114,12 @@
<li class="right" > <li class="right" >
<a href="index.html" title="Welcome to the musrfit documentation!" <a href="index.html" title="Welcome to the musrfit documentation!"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

64
doc/html/genindex.html
View File

@ -7,7 +7,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; musrfit 1.4.1 documentation</title> <title>Index &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -15,7 +15,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -25,7 +25,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
</head> </head>
<body> <body>
<div class="related"> <div class="related">
@ -34,7 +34,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="#" title="General Index" <a href="#" title="General Index"
accesskey="I">index</a></li> accesskey="I">index</a></li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -179,7 +179,7 @@
</dl></td> </dl></td>
<td style="width: 33%" valign="top"><dl> <td style="width: 33%" valign="top"><dl>
<dt><a href="setup-standard.html#index-22">cygwin</a> <dt><a href="setup-standard.html#index-21">cygwin</a>
</dt> </dt>
</dl></td> </dl></td>
@ -243,7 +243,7 @@
</dt> </dt>
<dt><a href="setup-standard.html#index-32">fink</a> <dt><a href="setup-standard.html#index-30">fink</a>
</dt> </dt>
@ -407,7 +407,7 @@
<table style="width: 100%" class="indextable genindextable"><tr> <table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl> <td style="width: 33%" valign="top"><dl>
<dt><a href="setup-standard.html#index-29">macports</a> <dt><a href="setup-standard.html#index-27">macports</a>
</dt> </dt>
@ -542,6 +542,8 @@
<dt><a href="mupp.html#index-2">mupp-scripting</a> <dt><a href="mupp.html#index-2">mupp-scripting</a>
</dt> </dt>
</dl></td>
<td style="width: 33%" valign="top"><dl>
<dt><a href="mupp.html#index-3">mupp-usage</a> <dt><a href="mupp.html#index-3">mupp-usage</a>
</dt> </dt>
@ -550,10 +552,8 @@
<dt><a href="musredit.html#index-0">musredit</a> <dt><a href="musredit.html#index-0">musredit</a>
</dt> </dt>
</dl></td>
<td style="width: 33%" valign="top"><dl>
<dt><a href="setup-standard.html#index-38">musredit-build-macos</a> <dt><a href="setup-standard.html#index-35">musredit-build-macos</a>
</dt> </dt>
@ -561,11 +561,11 @@
</dt> </dt>
<dt><a href="setup-standard.html#index-21">musredit-install-linux</a> <dt><a href="setup-standard.html#index-20">musredit-install-linux</a>
</dt> </dt>
<dt><a href="setup-standard.html#index-28">musredit-install-windows</a> <dt><a href="setup-standard.html#index-26">musredit-install-windows</a>
</dt> </dt>
@ -577,27 +577,15 @@
</dt> </dt>
<dt><a href="setup-standard.html#index-18">musrfit-build-automake-linux</a> <dt><a href="setup-standard.html#index-18">musrfit-build-cmake-linux</a>
</dt> </dt>
<dt><a href="setup-standard.html#index-36">musrfit-build-automake-macos</a> <dt><a href="setup-standard.html#index-34">musrfit-build-cmake-macos</a>
</dt> </dt>
<dt><a href="setup-standard.html#index-26">musrfit-build-automake-windows</a> <dt><a href="setup-standard.html#index-25">musrfit-build-cmake-windows</a>
</dt>
<dt><a href="setup-standard.html#index-19">musrfit-build-cmake-linux</a>
</dt>
<dt><a href="setup-standard.html#index-37">musrfit-build-cmake-macos</a>
</dt>
<dt><a href="setup-standard.html#index-27">musrfit-build-cmake-windows</a>
</dt> </dt>
@ -605,15 +593,15 @@
</dt> </dt>
<dt><a href="setup-standard.html#index-35">musrfit-build-macos</a> <dt><a href="setup-standard.html#index-33">musrfit-build-macos</a>
</dt> </dt>
<dt><a href="setup-standard.html#index-25">musrfit-build-windows</a> <dt><a href="setup-standard.html#index-24">musrfit-build-windows</a>
</dt> </dt>
<dt><a href="setup-standard.html#index-20">musrfit-post-install-linux</a> <dt><a href="setup-standard.html#index-19">musrfit-post-install-linux</a>
</dt> </dt>
@ -707,7 +695,7 @@
</dt> </dt>
<dt><a href="setup-standard.html#index-33">nexus-build-fink</a> <dt><a href="setup-standard.html#index-31">nexus-build-fink</a>
</dt> </dt>
@ -717,11 +705,11 @@
</dl></td> </dl></td>
<td style="width: 33%" valign="top"><dl> <td style="width: 33%" valign="top"><dl>
<dt><a href="setup-standard.html#index-30">nexus-build-macports</a> <dt><a href="setup-standard.html#index-28">nexus-build-macports</a>
</dt> </dt>
<dt><a href="setup-standard.html#index-23">nexus-build-windows</a> <dt><a href="setup-standard.html#index-22">nexus-build-windows</a>
</dt> </dt>
@ -787,7 +775,7 @@
<table style="width: 100%" class="indextable genindextable"><tr> <table style="width: 100%" class="indextable genindextable"><tr>
<td style="width: 33%" valign="top"><dl> <td style="width: 33%" valign="top"><dl>
<dt><a href="setup-standard.html#index-34">root-build-fink</a> <dt><a href="setup-standard.html#index-32">root-build-fink</a>
</dt> </dt>
@ -795,13 +783,13 @@
</dt> </dt>
<dt><a href="setup-standard.html#index-31">root-build-macports</a> <dt><a href="setup-standard.html#index-29">root-build-macports</a>
</dt> </dt>
</dl></td> </dl></td>
<td style="width: 33%" valign="top"><dl> <td style="width: 33%" valign="top"><dl>
<dt><a href="setup-standard.html#index-24">root-build-windows</a> <dt><a href="setup-standard.html#index-23">root-build-windows</a>
</dt> </dt>
@ -982,12 +970,12 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="#" title="General Index" <a href="#" title="General Index"
>index</a></li> >index</a></li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/index.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Welcome to the musrfit documentation! &mdash; musrfit 1.4.1 documentation</title> <title>Welcome to the musrfit documentation! &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="#" /> <link rel="top" title="musrfit 1.4.2 documentation" href="#" />
<link rel="next" title="How to Cite musrfit?" href="cite.html" /> <link rel="next" title="How to Cite musrfit?" href="cite.html" />
</head> </head>
<body> <body>
@ -37,7 +37,7 @@
<li class="right" > <li class="right" >
<a href="cite.html" title="How to Cite musrfit?" <a href="cite.html" title="How to Cite musrfit?"
accesskey="N">next</a> |</li> accesskey="N">next</a> |</li>
<li><a href="#">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="#">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -180,12 +180,12 @@
<li class="right" > <li class="right" >
<a href="cite.html" title="How to Cite musrfit?" <a href="cite.html" title="How to Cite musrfit?"
>next</a> |</li> >next</a> |</li>
<li><a href="#">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="#">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/msr2data.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>msr2data - A Program for Automatically Processing Multiple musrfit msr Files &mdash; musrfit 1.4.1 documentation</title> <title>msr2data - A Program for Automatically Processing Multiple musrfit msr Files &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="any2many - a Universal μSR-file-format converter" href="any2many.html" /> <link rel="next" title="any2many - a Universal μSR-file-format converter" href="any2many.html" />
<link rel="prev" title="mupp - μSR Parameter Plotter" href="mupp.html" /> <link rel="prev" title="mupp - μSR Parameter Plotter" href="mupp.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="mupp.html" title="mupp - μSR Parameter Plotter" <a href="mupp.html" title="mupp - μSR Parameter Plotter"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -434,12 +434,12 @@ fit serves as template for the second and so on. The template field stays empty
<li class="right" > <li class="right" >
<a href="mupp.html" title="mupp - μSR Parameter Plotter" <a href="mupp.html" title="mupp - μSR Parameter Plotter"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/mupp.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>mupp - μSR Parameter Plotter &mdash; musrfit 1.4.1 documentation</title> <title>mupp - μSR Parameter Plotter &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files" href="msr2data.html" /> <link rel="next" title="msr2data - A Program for Automatically Processing Multiple musrfit msr Files" href="msr2data.html" />
<link rel="prev" title="musredit: the GUI Based Interface to musrfit" href="musredit.html" /> <link rel="prev" title="musredit: the GUI Based Interface to musrfit" href="musredit.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="musredit.html" title="musredit: the GUI Based Interface to musrfit" <a href="musredit.html" title="musredit: the GUI Based Interface to musrfit"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -252,12 +252,12 @@ SCRIPT COMMANDS:
<li class="right" > <li class="right" >
<a href="musredit.html" title="musredit: the GUI Based Interface to musrfit" <a href="musredit.html" title="musredit: the GUI Based Interface to musrfit"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/musr-root.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>MusrRoot - an Extensible Open File Format for μSR &mdash; musrfit 1.4.1 documentation</title> <title>MusrRoot - an Extensible Open File Format for μSR &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="Acknowledgements" href="acknowledgement.html" /> <link rel="next" title="Acknowledgements" href="acknowledgement.html" />
<link rel="prev" title="any2many - a Universal μSR-file-format converter" href="any2many.html" /> <link rel="prev" title="any2many - a Universal μSR-file-format converter" href="any2many.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="any2many.html" title="any2many - a Universal μSR-file-format converter" <a href="any2many.html" title="any2many - a Universal μSR-file-format converter"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -923,12 +923,12 @@ the entry has been added. The last token, <tt class="docutils literal"><span cla
<li class="right" > <li class="right" >
<a href="any2many.html" title="any2many - a Universal μSR-file-format converter" <a href="any2many.html" title="any2many - a Universal μSR-file-format converter"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/musredit.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>musredit: the GUI Based Interface to musrfit &mdash; musrfit 1.4.1 documentation</title> <title>musredit: the GUI Based Interface to musrfit &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="mupp - μSR Parameter Plotter" href="mupp.html" /> <link rel="next" title="mupp - μSR Parameter Plotter" href="mupp.html" />
<link rel="prev" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s" href="setup-dks.html" /> <link rel="prev" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s" href="setup-dks.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s" <a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -550,12 +550,12 @@ the corresponding fit parameter value, except the phases where the step will be
<li class="right" > <li class="right" >
<a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s" <a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

BIN
doc/html/objects.inv
View File

Binary file not shown.

12
doc/html/search.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; musrfit 1.4.1 documentation</title> <title>Search &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -25,7 +25,7 @@
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<script type="text/javascript" src="_static/searchtools.js"></script> <script type="text/javascript" src="_static/searchtools.js"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<script type="text/javascript"> <script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); }); jQuery(function() { Search.loadIndex("searchindex.js"); });
</script> </script>
@ -41,7 +41,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index" <a href="genindex.html" title="General Index"
accesskey="I">index</a></li> accesskey="I">index</a></li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -89,12 +89,12 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index" <a href="genindex.html" title="General Index"
>index</a></li> >index</a></li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

2
doc/html/searchindex.js
View File

File diff suppressed because one or more lines are too long

47
doc/html/setup-dks.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Setting up musrfit / DKS: High Speed Fitting with GPU’s &mdash; musrfit 1.4.1 documentation</title> <title>Setting up musrfit / DKS: High Speed Fitting with GPU’s &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="musredit: the GUI Based Interface to musrfit" href="musredit.html" /> <link rel="next" title="musredit: the GUI Based Interface to musrfit" href="musredit.html" />
<link rel="prev" title="Setting up musrfit on Different Platforms" href="setup-standard.html" /> <link rel="prev" title="Setting up musrfit on Different Platforms" href="setup-standard.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="setup-standard.html" title="Setting up musrfit on Different Platforms" <a href="setup-standard.html" title="Setting up musrfit on Different Platforms"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -160,39 +160,6 @@ switch the working branch which is done by</p>
$ git checkout dks6 $ git checkout dks6
</pre></div> </pre></div>
</div> </div>
<div class="section" id="install-via-automake">
<h4>Install via automake<a class="headerlink" href="#install-via-automake" title="Permalink to this headline"></a></h4>
<div class="admonition note">
<p class="first admonition-title">Note</p>
<p class="last">Currently <tt class="docutils literal"><span class="pre">automake</span></tt> is still supported but soon will be replaced by <tt class="docutils literal"><span class="pre">cmake</span></tt>. Only follow
the <tt class="docutils literal"><span class="pre">automake</span></tt> procedure if you have good reasons.</p>
</div>
<p>The configure script for musrfit has now a couple of more tags/options, which are:</p>
<dl class="docutils">
<dt><strong>- -enable-dks</strong></dt>
<dd>by default this is set to no, hence if you want to have GPU support you need to enable it.</dd>
<dt><strong>- -with-cuda</strong></dt>
<dd>with this tag you tell the configure script where it can find <tt class="docutils literal"><span class="pre">CUDA</span></tt></dd>
<dt><strong>- -with-opencl</strong></dt>
<dd>with this tag you tell the configure script where it can find <tt class="docutils literal"><span class="pre">OpenCL</span></tt></dd>
<dt><strong>- -with-dks</strong></dt>
<dd>with this tag you tell the configure script where it can find <tt class="docutils literal"><span class="pre">DKS</span></tt></dd>
</dl>
<p>For a typical setup on a RHEL system it could look like this</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks<span class="o">=</span><span class="nv">$HOME</span>/Apps/DKS/exec --enable-dks --prefix<span class="o">=</span><span class="nv">$ROOTSYS</span>
</pre></div>
</div>
<p>After</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ make
$ make install
</pre></div>
</div>
<p>and updating the shared library lookup table (<em>only</em> needed for Linux)</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ /sbin/ldconfig <span class="c1"># as superuser / root</span>
</pre></div>
</div>
<p>you are done with the setup.</p>
</div>
<div class="section" id="install-via-cmake"> <div class="section" id="install-via-cmake">
<h4>Install via cmake<a class="headerlink" href="#install-via-cmake" title="Permalink to this headline"></a></h4> <h4>Install via cmake<a class="headerlink" href="#install-via-cmake" title="Permalink to this headline"></a></h4>
<p>There is on more configuration switch</p> <p>There is on more configuration switch</p>
@ -201,7 +168,7 @@ $ make install
<dd>it allows to enable/disable <tt class="docutils literal"><span class="pre">DKS</span></tt> support. The default is <tt class="docutils literal"><span class="pre">&lt;value&gt;=1</span></tt>, <em>i.e.</em> enabled. To disable use <tt class="docutils literal"><span class="pre">&lt;value&gt;=0</span></tt>.</dd> <dd>it allows to enable/disable <tt class="docutils literal"><span class="pre">DKS</span></tt> support. The default is <tt class="docutils literal"><span class="pre">&lt;value&gt;=1</span></tt>, <em>i.e.</em> enabled. To disable use <tt class="docutils literal"><span class="pre">&lt;value&gt;=0</span></tt>.</dd>
</dl> </dl>
<p>For a typical setup on a RHEL or macOS system it could look like this</p> <p>For a typical setup on a RHEL or macOS system it could look like this</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ cmake ../ -DCMAKE_INSTALL_PREFIX<span class="o">=</span><span class="nv">$ROOTSYS</span> -DASlibs<span class="o">=</span><span class="m">1</span> -DBMWlibs<span class="o">=</span><span class="m">1</span> -Dnexus<span class="o">=</span><span class="m">1</span> <div class="highlight-bash"><div class="highlight"><pre><span></span>$ cmake ../ -DCMAKE_INSTALL_PREFIX<span class="o">=</span><span class="nv">$ROOTSYS</span> -DASlibs<span class="o">=</span><span class="m">1</span> -DBMWlibs<span class="o">=</span><span class="m">1</span> -Dnexus<span class="o">=</span><span class="m">1</span> -Ddks<span class="o">=</span><span class="m">1</span>
</pre></div> </pre></div>
</div> </div>
<p>After</p> <p>After</p>
@ -354,12 +321,12 @@ The only thing you need <tt class="docutils literal"><span class="pre">DKS</span
<li class="right" > <li class="right" >
<a href="setup-standard.html" title="Setting up musrfit on Different Platforms" <a href="setup-standard.html" title="Setting up musrfit on Different Platforms"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

386
doc/html/setup-standard.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Setting up musrfit on Different Platforms &mdash; musrfit 1.4.1 documentation</title> <title>Setting up musrfit on Different Platforms &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s" href="setup-dks.html" /> <link rel="next" title="Setting up musrfit / DKS: High Speed Fitting with GPU’s" href="setup-dks.html" />
<link rel="prev" title="Documentation of user libs (user functions)" href="user-libs.html" /> <link rel="prev" title="Documentation of user libs (user functions)" href="user-libs.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="user-libs.html" title="Documentation of user libs (user functions)" <a href="user-libs.html" title="Documentation of user libs (user functions)"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -62,11 +62,9 @@ it can also be set up under <strong>MS Windows</strong> (cygwin, only for the <e
<p class="last">In case musrfit should be installed according to the description found on this page, the user is strongly encouraged to <em>read completely</em> each section dealing with the <p class="last">In case musrfit should be installed according to the description found on this page, the user is strongly encouraged to <em>read completely</em> each section dealing with the
present installation step <em>before</em> starting the installation process!</p> present installation step <em>before</em> starting the installation process!</p>
</div> </div>
<p>Apart from <a class="reference external" href="http://gcc.gnu.org/">GCC, the GNU Compiler Collection</a> (<tt class="docutils literal"><span class="pre">gcc</span></tt>, <tt class="docutils literal"><span class="pre">g++</span></tt>), the GNU build tools <a class="reference external" href="http://www.gnu.org/software/autoconf/">autoconf</a>, <p>Apart from <a class="reference external" href="http://gcc.gnu.org/">GCC, the GNU Compiler Collection</a> (<tt class="docutils literal"><span class="pre">gcc</span></tt>, <tt class="docutils literal"><span class="pre">g++</span></tt>), the build tool <a class="reference external" href="https://cmake.org/">cmake</a> is needed. Furthermore the helper
<a class="reference external" href="http://www.gnu.org/software/automake/">automake</a>, and <a class="reference external" href="http://www.gnu.org/software/libtool/">libtool</a> are needed, if you want to build musrfit via the automake toolchain. tool <a class="reference external" href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a> needs to be in place, and musrfit requires the installation of a few open-source libraries and programs including
The <tt class="docutils literal"><span class="pre">automake</span></tt> toolchain will eventually be droped in upcoming releases. their header packages:</p>
If you plan to use the cmake toolchain (preferred way), <a class="reference external" href="https://cmake.org/">cmake</a>. Furthermore the helper tool <a class="reference external" href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a> is
needed and musrfit requires the installation of a few open-source libraries and programs including their header packages:</p>
<dl class="docutils" id="index-2"> <dl class="docutils" id="index-2">
<dt><strong>boost C++ libraries</strong></dt> <dt><strong>boost C++ libraries</strong></dt>
<dd>The powerful Spirit parser framework used by musrfit is included in that collection of libraries. <em>Required version ≥ 1.33</em> (see <a class="reference external" href="http://www.boost.org/">boost C++ libraries</a>).</dd> <dd>The powerful Spirit parser framework used by musrfit is included in that collection of libraries. <em>Required version ≥ 1.33</em> (see <a class="reference external" href="http://www.boost.org/">boost C++ libraries</a>).</dd>
@ -117,14 +115,15 @@ needed and musrfit requires the installation of a few open-source libraries and
<dl class="docutils"> <dl class="docutils">
<dt><strong>GNU/Linux</strong></dt> <dt><strong>GNU/Linux</strong></dt>
<dd>No serious problems are currently known. Tested distributions: <a class="reference external" href="https://www.redhat.com/de/technologies/linux-platforms/enterprise-linux">RHEL</a>, <a class="reference external" href="https://getfedora.org/">Fedora</a>, <dd>No serious problems are currently known. Tested distributions: <a class="reference external" href="https://www.redhat.com/de/technologies/linux-platforms/enterprise-linux">RHEL</a>, <a class="reference external" href="https://getfedora.org/">Fedora</a>,
<a class="reference external" href="https://www.debian.org/">Debian</a>, <a class="reference external" href="https://www.ubuntu.com/">Ubuntu</a>, <a class="reference external" href="https://linuxmint.com/">Mint</a>, <a class="reference external" href="https://en.opensuse.org/Main_Page">openSUSE</a>.</dd> <a class="reference external" href="https://www.debian.org/">Debian</a>, <a class="reference external" href="https://www.ubuntu.com/">Ubuntu</a>, <a class="reference external" href="https://linuxmint.com/">Mint</a>, <a class="reference external" href="https://en.opensuse.org/Main_Page">openSUSE</a>,
<a class="reference external" href="https://de.manjaro.org/">manjaro</a>, and <a class="reference external" href="https://antergos.com/">antergos</a>.</dd>
<dt><strong>Mac OS X/macOS</strong></dt> <dt><strong>Mac OS X/macOS</strong></dt>
<dd>No serious problems are currently known for macOS ≥ 10.6.</dd> <dd>No serious problems are currently known for macOS ≥ 10.6.</dd>
<dt><strong>MS Windows</strong></dt> <dt><strong>MS Windows</strong></dt>
<dd><p class="first">Native <em>MS Windows</em> support is currently not available. Potential ways to get <tt class="docutils literal"><span class="pre">musrfit</span></tt> running are:</p> <dd><p class="first">Native <em>MS Windows</em> support is currently not available. Potential ways to get <tt class="docutils literal"><span class="pre">musrfit</span></tt> running are:</p>
<ul class="last simple"> <ul class="last simple">
<li>via installation of Linux via the Microsoft App store for Windows 10.</li> <li>via installation of Linux via the Microsoft App store for Windows 10.</li>
<li>via installation of the virtual machine on which you install Linux.</li> <li>via installation of the virtual machine on which you install Linux (probably the easiest for most Windows users).</li>
<li>via <a class="reference external" href="https://www.cygwin.com/">cygwin</a>.</li> <li>via <a class="reference external" href="https://www.cygwin.com/">cygwin</a>.</li>
</ul> </ul>
</dd> </dd>
@ -178,9 +177,19 @@ the source code from the corresponding website, or to clone the git repo. If you
<span id="index-15"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#installation-of-nexus-requirements-optional" title="Permalink to this headline"></a></h4> <span id="index-15"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#installation-of-nexus-requirements-optional" title="Permalink to this headline"></a></h4>
<p><em>Only</em> if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading/writing data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required <p><em>Only</em> if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading/writing data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required
software has to be set up. The required libraries and header files could either be available through the user&#8217;s software has to be set up. The required libraries and header files could either be available through the user&#8217;s
GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. <em>E.g.</em> on GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. The necessary
Red Hat-like systems binary packages for <tt class="docutils literal"><span class="pre">MXML</span></tt>, <tt class="docutils literal"><span class="pre">HDF4</span></tt>, and <tt class="docutils literal"><span class="pre">HDF5</span></tt> might be called <tt class="docutils literal"><span class="pre">mxml</span></tt>, <tt class="docutils literal"><span class="pre">mxml-devel</span></tt>, packages to build <tt class="docutils literal"><span class="pre">NeXus</span></tt> are <tt class="docutils literal"><span class="pre">MXML</span></tt>, (<tt class="docutils literal"><span class="pre">HDF4</span></tt>), and <tt class="docutils literal"><span class="pre">HDF5</span></tt>. This means, for a rpm-package based distro try something like:</p>
<tt class="docutils literal"><span class="pre">hdf</span></tt>, <tt class="docutils literal"><span class="pre">hdf-devel</span></tt>, <tt class="docutils literal"><span class="pre">hdf5</span></tt>, <tt class="docutils literal"><span class="pre">hdf5-devel</span></tt>, on Debian-like systems <tt class="docutils literal"><span class="pre">libmxml1</span></tt>, <tt class="docutils literal"><span class="pre">libmxml-dev</span></tt>, <tt class="docutils literal"><span class="pre">libhdf4-dev</span></tt>, <tt class="docutils literal"><span class="pre">libhdf5-dev</span></tt>.</p> <blockquote>
<div><div class="highlight-bash"><div class="highlight"><pre><span></span>$ yum install mxml-devel hdf-devel hdf5-devel
</pre></div>
</div>
</div></blockquote>
<p>and on a deb-package based distro try something like:</p>
<blockquote>
<div><div class="highlight-bash"><div class="highlight"><pre><span></span>$ apt-get install libmxml-dev libhdf4-dev libhdf5-dev
</pre></div>
</div>
</div></blockquote>
<div class="admonition note"> <div class="admonition note">
<p class="first admonition-title">Note</p> <p class="first admonition-title">Note</p>
<p class="last"><tt class="docutils literal"><span class="pre">HDF4</span></tt> support within <tt class="docutils literal"><span class="pre">NeXus</span></tt> will be dropped by <tt class="docutils literal"><span class="pre">musrfit</span></tt> in the near future. If you <em>not</em> urgently need <p class="last"><tt class="docutils literal"><span class="pre">HDF4</span></tt> support within <tt class="docutils literal"><span class="pre">NeXus</span></tt> will be dropped by <tt class="docutils literal"><span class="pre">musrfit</span></tt> in the near future. If you <em>not</em> urgently need
@ -211,9 +220,8 @@ $ sudo make install
</div> </div>
<div class="section" id="index-16"> <div class="section" id="index-16">
<span id="id4"></span><h4>ROOT<a class="headerlink" href="#index-16" title="Permalink to this headline"></a></h4> <span id="id4"></span><h4>ROOT<a class="headerlink" href="#index-16" title="Permalink to this headline"></a></h4>
<p>ROOT 5.34/xx is supported as legacy version <em>only</em>! <strong>The default now will be ROOT 6.xx/yy!</strong></p>
<p>The ROOT framework may or may not be part of the GNU/Linux distribution. Some distributions are packing ROOT in a <p>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 <tt class="docutils literal"><span class="pre">musrfit</span></tt>, though the situation is improving. If you are manner incompatible with the way it is needed by <tt class="docutils literal"><span class="pre">musrfit</span></tt>, 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 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). <strong>One Warning:</strong> if the ROOT packages are upgraded after a necessary ones (guess from the description below). <strong>One Warning:</strong> if the ROOT packages are upgraded after a
yum update (apt-get update; apt-get upgrade) you might need to recompile <tt class="docutils literal"><span class="pre">musrfit</span></tt>. <em>If you are not sure about yum update (apt-get update; apt-get upgrade) you might need to recompile <tt class="docutils literal"><span class="pre">musrfit</span></tt>. <em>If you are not sure about
@ -235,12 +243,12 @@ be added starting with a &#8216;#&#8217; which can be omitted. They are only the
$ <span class="c1"># creat the Apps directory if not already present</span> $ <span class="c1"># creat the Apps directory if not already present</span>
$ mkdir Apps $ mkdir Apps
$ <span class="nb">cd</span> Apps $ <span class="nb">cd</span> Apps
$ git clone http://root.cern.ch/git/root.git $ git clone http://github.com/root-project/root.git
$ <span class="nb">cd</span> root $ <span class="nb">cd</span> root
$ git tag -l $ git tag -l
$ <span class="c1"># git tag -l will list all available tags. In the next command choose the tag v6-14-00</span> $ <span class="c1"># git tag -l will list all available tags. In the next command choose the tag v6-16-00</span>
$ <span class="c1"># or the latest official release number</span> $ <span class="c1"># or the latest official release number</span>
$ git checkout -b v6-14-00 v6-14-00 $ git checkout -b v6-16-00 v6-16-00
$ <span class="c1"># now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.</span> $ <span class="c1"># now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.</span>
$ <span class="c1"># since we are using cmake build now, first we will need to create the build directory.</span> $ <span class="c1"># since we are using cmake build now, first we will need to create the build directory.</span>
$ mkdir root_build $ mkdir root_build
@ -284,20 +292,18 @@ $ cmake --build ./ --clean-first
</div> </div>
<div class="section" id="musrfit"> <div class="section" id="musrfit">
<span id="index-17"></span><h3>musrfit<a class="headerlink" href="#musrfit" title="Permalink to this headline"></a></h3> <span id="index-17"></span><h3>musrfit<a class="headerlink" href="#musrfit" title="Permalink to this headline"></a></h3>
<p>When all required software has been set up with the <tt class="docutils literal"><span class="pre">musrfit</span></tt> installation can be proceeded. First, the most <p>When all required software has been set up you can proceed with the <tt class="docutils literal"><span class="pre">musrfit</span></tt> installatio. First, the most
recent source code should be downloaded. The preferred way of doing so is to clone the <tt class="docutils literal"><span class="pre">musrfit</span></tt> repository via git. recent source code should be downloaded. The preferred way of doing so is to clone the <tt class="docutils literal"><span class="pre">musrfit</span></tt> repository via git.
Assuming the code should be located in <tt class="docutils literal"><span class="pre">$HOME/Apps</span></tt> this is achieved most easily calling from the terminal</p> Assuming the code should be located in <tt class="docutils literal"><span class="pre">$HOME/Apps</span></tt> this is achieved most easily calling from the terminal</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps
$ git clone https://bitbucket.org/muonspin/musrfit.git $ git clone https://bitbucket.org/muonspin/musrfit.git
$ <span class="c1"># Only if legacy ROOT 5.xx.yy is used include the next line</span> $ <span class="nb">cd</span> musrfit
$ <span class="nb">cd</span> musrfit<span class="p">;</span> git checkout root5
</pre></div> </pre></div>
</div> </div>
<p>or</p> <p>or</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps
$ git clone git://gitlab.psi.ch/nemu/musrfit.git $ git clone git://gitlab.psi.ch/nemu/musrfit.git
$ <span class="c1"># Only if legacy ROOT 5.xx.yy is used include the next line</span> $ <span class="nb">cd</span> musrfit
$ <span class="nb">cd</span> musrfit<span class="p">;</span> git checkout root5
</pre></div> </pre></div>
</div> </div>
<div class="admonition note"> <div class="admonition note">
@ -309,78 +315,15 @@ will needed to switch branches first.</p>
<p><strong>Update:</strong> If a local repository clone is already present (it needs to be newer than Dec. 2016), one can update it using:</p> <p><strong>Update:</strong> If a local repository clone is already present (it needs to be newer than Dec. 2016), one can update it using:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit
$ git pull $ git pull
</pre></div> $ <span class="nb">cd</span> build
</div>
<p>Now, depending whether you follow the <tt class="docutils literal"><span class="pre">automake</span></tt> or <tt class="docutils literal"><span class="pre">cmake</span></tt> tool chain you do</p>
<p><strong>automake toolchain:</strong></p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ make uninstall
$ make clean
$ make
$ make install
</pre></div>
</div>
<p>or</p>
<p><strong>cmake toolchain:</strong></p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> build
$ xargs rm &lt; install_manifest.txt $ xargs rm &lt; install_manifest.txt
$ cmake --build ./ --clean-first $ cmake --build ./ --clean-first
$ make install $ make install
</pre></div> </pre></div>
</div> </div>
<p>As an alternative (if git is not available), the source code can also be downloaded from the following web-page: <a class="reference external" href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a></p> <p>As an alternative (if git is not available), the source code can also be downloaded from the following web-page: <a class="reference external" href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a></p>
<div class="section" id="musrfit-build-with-automake">
<span id="index-18"></span><h4>musrfit build with automake<a class="headerlink" href="#musrfit-build-with-automake" title="Permalink to this headline"></a></h4>
<p>After the source-code extraction the <tt class="docutils literal"><span class="pre">autogen.sh</span></tt> script is called to prepare the build environment.
If it has been executed successfully the <tt class="docutils literal"><span class="pre">configure</span></tt> script should be ready to collect all the information needed
to create the Makefiles. If <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support <tt class="docutils literal"><span class="pre">NeXus</span></tt> data files this has to be enabled by specifying the
<tt class="docutils literal"><span class="pre">--enable-NeXus</span></tt> switch when calling configure. For an overview of all available options just call <tt class="docutils literal"><span class="pre">./configure</span> <span class="pre">--help</span></tt>.
Besides the standard options there are a few special options which should be mentioned here:</p>
<dl class="docutils">
<dt><strong>- -prefix</strong></dt>
<dd>Specify the installation prefix, <em>e.g.</em> <tt class="docutils literal"><span class="pre">$ROOTSYS</span></tt> if already defined (by default: <tt class="docutils literal"><span class="pre">/usr/local</span></tt>).</dd>
<dt><strong>- -with-rootsys</strong></dt>
<dd>Specify the top of the <tt class="docutils literal"><span class="pre">ROOT</span></tt> installation directory, <em>e.g.</em> <tt class="docutils literal"><span class="pre">$ROOTSYS</span></tt> if already defined.</dd>
<dt><strong>- -with-fftw3</strong></dt>
<dd>Specify the prefix of the <tt class="docutils literal"><span class="pre">FFTW3</span></tt> installation. <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> or <tt class="docutils literal"><span class="pre">/usr</span></tt>.</dd>
<dt><strong>- -with-gsl</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">GSL</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> or <tt class="docutils literal"><span class="pre">/usr</span></tt>.</dd>
<dt><strong>- -with-boostinc</strong></dt>
<dd>Set the path to the header files of the <tt class="docutils literal"><span class="pre">Boost</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local/include</span></tt> or <tt class="docutils literal"><span class="pre">/usr/include</span></tt>.</dd>
<dt><strong>- -with-hdf4</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">HDF4</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support).</dd>
<dt><strong>- -with-hdf5</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">HDF5</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support).</dd>
<dt><strong>- -with-nexus</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">NeXus</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support).</dd>
<dt><strong>- -with-qt3</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt3</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt-3.3</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musrgui</span></tt>).</dd>
<dt><strong>- -with-qt4</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt4</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt47</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musredit</span></tt>).</dd>
<dt><strong>- -with-qt5</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt5</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib64</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musredit</span></tt>).</dd>
<dt><strong>- -enable-NeXus</strong></dt>
<dd>Enable the support of <tt class="docutils literal"><span class="pre">NeXus</span></tt> data files (requires the <tt class="docutils literal"><span class="pre">HDF4</span></tt>, <tt class="docutils literal"><span class="pre">HDF5</span></tt> and <tt class="docutils literal"><span class="pre">NeXus</span></tt> libraries to be installed).</dd>
<dt><strong>- -disable-editor</strong></dt>
<dd>Disable the integrated building of <tt class="docutils literal"><span class="pre">musredit</span></tt>/<tt class="docutils literal"><span class="pre">musrgui</span></tt>.</dd>
<dt><strong>- -disable-omp</strong></dt>
<dd>Switches off the <a class="reference external" href="http://en.wikipedia.org/wiki/OpenMP">OpenMP</a> features of <tt class="docutils literal"><span class="pre">musrfit</span></tt> (parallelization of the <span class="math">\(\chi^2\)</span> calculation when compiled with GCC ≥ 4.2).</dd>
</dl>
<p>Normally it should not be necessary to make use of any of the options except for specifying the installation path with <tt class="docutils literal"><span class="pre">--prefix</span></tt>. 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 <tt class="docutils literal"><span class="pre">musrfit</span></tt> libraries and executables.
A standard installation sequence (without <tt class="docutils literal"><span class="pre">NeXus</span></tt> support) might then look like (In case the normal user has no write permissions to the
<tt class="docutils literal"><span class="pre">$ROOTSYS</span></tt> and the installation path the &#8220;make install&#8221; commands have to be executed as superuser.):</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit
$ sh autogen.sh
$ ./configure --prefix<span class="o">=</span><span class="nv">$ROOTSYS</span>
$ make
$ make install
$ /sbin/ldconfig <span class="c1"># (as superuser)</span>
</pre></div>
</div>
</div>
<div class="section" id="musrfit-build-with-cmake"> <div class="section" id="musrfit-build-with-cmake">
<span id="index-19"></span><h4>musrfit build with cmake<a class="headerlink" href="#musrfit-build-with-cmake" title="Permalink to this headline"></a></h4> <span id="index-18"></span><h4>musrfit build with cmake<a class="headerlink" href="#musrfit-build-with-cmake" title="Permalink to this headline"></a></h4>
<p>Currently the following configuration switches for <tt class="docutils literal"><span class="pre">musrfit</span></tt> are available:</p> <p>Currently the following configuration switches for <tt class="docutils literal"><span class="pre">musrfit</span></tt> are available:</p>
<dl class="docutils"> <dl class="docutils">
<dt><strong>-DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt;</strong></dt> <dt><strong>-DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt;</strong></dt>
@ -421,7 +364,7 @@ $ /sbin/ldconfig <span class="c1"># (as superus
</div> </div>
</div> </div>
<div class="section" id="musrfit-last-step-of-the-installation"> <div class="section" id="musrfit-last-step-of-the-installation">
<span id="index-20"></span><h4>musrfit last step of the installation<a class="headerlink" href="#musrfit-last-step-of-the-installation" title="Permalink to this headline"></a></h4> <span id="index-19"></span><h4>musrfit last step of the installation<a class="headerlink" href="#musrfit-last-step-of-the-installation" title="Permalink to this headline"></a></h4>
<p>In order to finish the installation of musrfit two more things should be done:</p> <p>In order to finish the installation of musrfit two more things should be done:</p>
<blockquote> <blockquote>
<div><ul> <div><ul>
@ -440,10 +383,9 @@ detailed information on this XML file refer to the <a class="reference internal"
</div> </div>
</div> </div>
<div class="section" id="musredit"> <div class="section" id="musredit">
<span id="index-21"></span><h3>musredit<a class="headerlink" href="#musredit" title="Permalink to this headline"></a></h3> <span id="index-20"></span><h3>musredit<a class="headerlink" href="#musredit" title="Permalink to this headline"></a></h3>
<p>In the latest version of <tt class="docutils literal"><span class="pre">musrfit</span></tt> the configure script tries to determine automatically the highest available <tt class="docutils literal"><span class="pre">Qt</span></tt> version. <p>In the latest version of <tt class="docutils literal"><span class="pre">musrfit</span></tt> the configure script tries to determine automatically the highest available <tt class="docutils literal"><span class="pre">Qt</span></tt> version.
In case this is found, the editor <tt class="docutils literal"><span class="pre">musredit</span></tt> is built already together with <tt class="docutils literal"><span class="pre">musrfit</span></tt>. If not, one can try to call In case this is found, the editor <tt class="docutils literal"><span class="pre">musredit</span></tt> is built already together with <tt class="docutils literal"><span class="pre">musrfit</span></tt>.
the configure script with the <strong>- -with-qt5</strong> option (<tt class="docutils literal"><span class="pre">automake</span></tt>). <tt class="docutils literal"><span class="pre">cmake</span></tt> will determine everthing automatically.
To install this editor separately, <em>i.e.</em> by &#8220;hand&#8221; do</p> To install this editor separately, <em>i.e.</em> by &#8220;hand&#8221; do</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit/src/musredit_qt5 <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit/src/musredit_qt5
$ <span class="c1"># for some distributions you will need qmake-qt5 for the next command</span> $ <span class="c1"># for some distributions you will need qmake-qt5 for the next command</span>
@ -505,7 +447,7 @@ Please also be aware of the fact that the X server which is going to be installe
<div class="section" id="id5"> <div class="section" id="id5">
<h3>Requirements<a class="headerlink" href="#id5" title="Permalink to this headline"></a></h3> <h3>Requirements<a class="headerlink" href="#id5" title="Permalink to this headline"></a></h3>
<div class="section" id="setting-up-cygwin"> <div class="section" id="setting-up-cygwin">
<span id="index-22"></span><h4>Setting up Cygwin<a class="headerlink" href="#setting-up-cygwin" title="Permalink to this headline"></a></h4> <span id="index-21"></span><h4>Setting up Cygwin<a class="headerlink" href="#setting-up-cygwin" title="Permalink to this headline"></a></h4>
<p>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 <p>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 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 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
<div class="section" id="id6"> <div class="section" id="id6">
<h4>Everything but ROOT and NeXus<a class="headerlink" href="#id6" title="Permalink to this headline"></a></h4> <h4>Everything but ROOT and NeXus<a class="headerlink" href="#id6" title="Permalink to this headline"></a></h4>
</div> </div>
<div class="section" id="index-23"> <div class="section" id="index-22">
<span id="id7"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-23" title="Permalink to this headline"></a></h4> <span id="id7"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-22" title="Permalink to this headline"></a></h4>
<p>Only if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required software has <p>Only if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required software has
to be set up. Under <tt class="docutils literal"><span class="pre">Cygwin</span></tt> of all the required libraries only <tt class="docutils literal"><span class="pre">HDF5</span></tt> is available. The packages <tt class="docutils literal"><span class="pre">hdf5</span></tt> and to be set up. Under <tt class="docutils literal"><span class="pre">Cygwin</span></tt> of all the required libraries only <tt class="docutils literal"><span class="pre">HDF5</span></tt> is available. The packages <tt class="docutils literal"><span class="pre">hdf5</span></tt> and
<tt class="docutils literal"><span class="pre">libhdf5-devel</span></tt> can be installed through the <tt class="docutils literal"><span class="pre">Cygwin</span></tt> setup. One should also make sure that <tt class="docutils literal"><span class="pre">bison</span></tt>, <tt class="docutils literal"><span class="pre">flex</span></tt> <tt class="docutils literal"><span class="pre">libhdf5-devel</span></tt> can be installed through the <tt class="docutils literal"><span class="pre">Cygwin</span></tt> setup. One should also make sure that <tt class="docutils literal"><span class="pre">bison</span></tt>, <tt class="docutils literal"><span class="pre">flex</span></tt>
@ -597,8 +539,8 @@ $ make install
</pre></div> </pre></div>
</div> </div>
</div> </div>
<div class="section" id="index-24"> <div class="section" id="index-23">
<span id="id8"></span><h4>ROOT<a class="headerlink" href="#index-24" title="Permalink to this headline"></a></h4> <span id="id8"></span><h4>ROOT<a class="headerlink" href="#index-23" title="Permalink to this headline"></a></h4>
<p>In order to install the <tt class="docutils literal"><span class="pre">ROOT</span></tt> system, there are two possibilities:</p> <p>In order to install the <tt class="docutils literal"><span class="pre">ROOT</span></tt> system, there are two possibilities:</p>
<ul> <ul>
<li><p class="first">Download the precompiled Cygwin GCC 4.3 (or newer) package of the most recent <tt class="docutils literal"><span class="pre">ROOT</span></tt> version <li><p class="first">Download the precompiled Cygwin GCC 4.3 (or newer) package of the most recent <tt class="docutils literal"><span class="pre">ROOT</span></tt> version
@ -639,8 +581,8 @@ for the user <tt class="docutils literal"><span class="pre">Username</span></tt>
<p>Afterwards close the Cygwin shell and reopen it again for the installation of <tt class="docutils literal"><span class="pre">musrfit</span></tt>.</p> <p>Afterwards close the Cygwin shell and reopen it again for the installation of <tt class="docutils literal"><span class="pre">musrfit</span></tt>.</p>
</div> </div>
</div> </div>
<div class="section" id="index-25"> <div class="section" id="index-24">
<span id="id9"></span><h3>musrfit<a class="headerlink" href="#index-25" title="Permalink to this headline"></a></h3> <span id="id9"></span><h3>musrfit<a class="headerlink" href="#index-24" title="Permalink to this headline"></a></h3>
<p>First, the most recent source code should be downloaded. The preferred way of doing so is to clone the <tt class="docutils literal"><span class="pre">musrfit</span></tt> <p>First, the most recent source code should be downloaded. The preferred way of doing so is to clone the <tt class="docutils literal"><span class="pre">musrfit</span></tt>
repository via git. Assuming the code should be located in <tt class="docutils literal"><span class="pre">~/musrfit</span></tt> this is achieved most easily calling from the terminal</p> repository via git. Assuming the code should be located in <tt class="docutils literal"><span class="pre">~/musrfit</span></tt> this is achieved most easily calling from the terminal</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span>
@ -659,58 +601,8 @@ $ git pull
</div> </div>
<p>As an alternative (if git is not available), the source code can also be downloaded from the following <p>As an alternative (if git is not available), the source code can also be downloaded from the following
web-page: <a class="reference external" href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.</p> web-page: <a class="reference external" href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.</p>
<div class="section" id="index-26"> <div class="section" id="index-25">
<span id="id10"></span><h4>musrfit build with automake<a class="headerlink" href="#index-26" title="Permalink to this headline"></a></h4> <span id="id10"></span><h4>musrfit build with cmake<a class="headerlink" href="#index-25" title="Permalink to this headline"></a></h4>
<p>After the source-code extraction the <tt class="docutils literal"><span class="pre">autogen.sh</span></tt> script is called to prepare the build environment.
If it has been executed successfully the <tt class="docutils literal"><span class="pre">configure</span></tt> script should be ready to collect all the information
needed to create the Makefiles. If <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support <tt class="docutils literal"><span class="pre">NeXus</span></tt> data files this has to be enabled by
specifying the <tt class="docutils literal"><span class="pre">--enable-static</span> <span class="pre">--enable-NeXus</span></tt> switches when calling configure. For an overview of all
available options just call <tt class="docutils literal"><span class="pre">./configure</span> <span class="pre">--help</span></tt>. Besides the standard options there are a few special
options which should be mentioned here:</p>
<dl class="docutils">
<dt><strong>- -prefix</strong></dt>
<dd>Specify the installation prefix, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/opt/root-system</span></tt> (by default: <tt class="docutils literal"><span class="pre">/usr/local</span></tt>)</dd>
<dt><strong>- -with-rootsys</strong></dt>
<dd>Specify the top of the <tt class="docutils literal"><span class="pre">ROOT</span></tt> installation directory, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/opt/root-system</span></tt></dd>
<dt><strong>- -with-fftw3</strong></dt>
<dd>Specify the prefix of the <tt class="docutils literal"><span class="pre">FFTW3</span></tt> installation. <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> or <tt class="docutils literal"><span class="pre">/usr</span></tt></dd>
<dt><strong>- -with-gsl</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">GSL</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> or <tt class="docutils literal"><span class="pre">/usr</span></tt></dd>
<dt><strong>- -with-boostinc</strong></dt>
<dd>Set the path to the header files of the <tt class="docutils literal"><span class="pre">Boost</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local/include</span></tt> or <tt class="docutils literal"><span class="pre">/usr/include</span></tt></dd>
<dt><strong>- -with-hdf4</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">HDF4</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support)</dd>
<dt><strong>- -with-hdf5</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">HDF5</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support)</dd>
<dt><strong>- -with-nexus</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">NeXus</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support)</dd>
<dt><strong>- -with-qt3</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt3</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt-3.3</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musrgui</span></tt>)</dd>
<dt><strong>- -with-qt4</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt4</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt47</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musredit</span></tt>)</dd>
<dt><strong>- -with-qt5</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt5</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt56</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musredit</span></tt>)</dd>
<dt><strong>- -enable-NeXus</strong></dt>
<dd>Enable the support of <tt class="docutils literal"><span class="pre">NeXus</span></tt> data files (requires the <tt class="docutils literal"><span class="pre">HDF4</span></tt>, <tt class="docutils literal"><span class="pre">HDF5</span></tt> and <tt class="docutils literal"><span class="pre">NeXus</span></tt> libraries to be installed).</dd>
<dt><strong>- -disable-editor</strong></dt>
<dd>Disable the integrated building of <tt class="docutils literal"><span class="pre">musredit</span></tt>/<tt class="docutils literal"><span class="pre">musrgui</span></tt>.</dd>
<dt><strong>- -disable-omp</strong></dt>
<dd>Switches off the <tt class="docutils literal"><span class="pre">OpenMP</span></tt> features of <tt class="docutils literal"><span class="pre">musrfit</span></tt> (parallelization of the <span class="math">\(\chi^2\)</span> calculation when compiled with <tt class="docutils literal"><span class="pre">GCC</span></tt> ≥ 4.2)</dd>
</dl>
<p>Normally it should not be necessary to make use of any of the options except for specifying the installation path with <tt class="docutils literal"><span class="pre">--prefix</span></tt>.
The other paths should be detected automatically. If this does not work for some reason the <tt class="docutils literal"><span class="pre">configure</span></tt> script will terminate and
ask for the information. When the <tt class="docutils literal"><span class="pre">configure</span></tt> script has been called successfully everything is ready for building the <tt class="docutils literal"><span class="pre">musrfit</span></tt>
libraries and executables. A standard installation sequence (without <tt class="docutils literal"><span class="pre">NeXus</span></tt> support) might then look like:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> musrfit
$ sh autogen.sh
$ ./configure --prefix<span class="o">=</span><span class="nv">$ROOTSYS</span>
$ make
$ make install
</pre></div>
</div>
</div>
<div class="section" id="index-27">
<span id="id11"></span><h4>musrfit build with cmake<a class="headerlink" href="#index-27" title="Permalink to this headline"></a></h4>
<p>Currently the following configuration switches for <tt class="docutils literal"><span class="pre">musrfit</span></tt> are available:</p> <p>Currently the following configuration switches for <tt class="docutils literal"><span class="pre">musrfit</span></tt> are available:</p>
<dl class="docutils"> <dl class="docutils">
<dt><strong>-DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt;</strong></dt> <dt><strong>-DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt;</strong></dt>
@ -751,12 +643,11 @@ $ /sbin/ldconfig <span class="c1"># (as superus
</div> </div>
</div> </div>
</div> </div>
<div class="section" id="index-28"> <div class="section" id="index-26">
<span id="id12"></span><h3>musredit<a class="headerlink" href="#index-28" title="Permalink to this headline"></a></h3> <span id="id11"></span><h3>musredit<a class="headerlink" href="#index-26" title="Permalink to this headline"></a></h3>
<p>In the latest version of <tt class="docutils literal"><span class="pre">musrfit</span></tt> the configure script tries to determine automatically if <p>In the latest version of <tt class="docutils literal"><span class="pre">musrfit</span></tt> 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 <tt class="docutils literal"><span class="pre">musredit</span></tt> is built Qt4.5 or higher is set up on the machine. In case this is found, the editor <tt class="docutils literal"><span class="pre">musredit</span></tt> is built
readily with <tt class="docutils literal"><span class="pre">musrfit</span></tt>. If not, one can either try to call the <tt class="docutils literal"><span class="pre">configure</span></tt> script with the readily with <tt class="docutils literal"><span class="pre">musrfit</span></tt>. If not, try the following:</p>
<tt class="docutils literal"><span class="pre">--with-qt4</span></tt> option or install this editor separately, <em>.e.g.</em>:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> src/musredit <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> src/musredit
$ qmake-qt4 musredit.pro $ qmake-qt4 musredit.pro
</pre></div> </pre></div>
@ -780,14 +671,14 @@ musredit <span class="p">&amp;</span>
</pre></div> </pre></div>
</div> </div>
</div> </div>
<div class="section" id="id13"> <div class="section" id="id12">
<h3>musrgui (obsolate)<a class="headerlink" href="#id13" title="Permalink to this headline"></a></h3> <h3>musrgui (obsolate)<a class="headerlink" href="#id12" title="Permalink to this headline"></a></h3>
<p>If <tt class="docutils literal"><span class="pre">Qt4.5</span></tt> or higher is not available but <tt class="docutils literal"><span class="pre">Qt3</span></tt> is set up <tt class="docutils literal"><span class="pre">musrgui</span></tt> can be installed. For this <p>If <tt class="docutils literal"><span class="pre">Qt4.5</span></tt> or higher is not available but <tt class="docutils literal"><span class="pre">Qt3</span></tt> is set up <tt class="docutils literal"><span class="pre">musrgui</span></tt> can be installed. For this
please follow the instructions for the <tt class="docutils literal"><span class="pre">musredit</span></tt> installation where simply every <tt class="docutils literal"><span class="pre">musredit</span></tt> occurrence please follow the instructions for the <tt class="docutils literal"><span class="pre">musredit</span></tt> installation where simply every <tt class="docutils literal"><span class="pre">musredit</span></tt> occurrence
has to be replaced by <tt class="docutils literal"><span class="pre">musrgui</span></tt>, and <tt class="docutils literal"><span class="pre">qt4</span></tt> is replaced by <tt class="docutils literal"><span class="pre">qt3</span></tt>.</p> has to be replaced by <tt class="docutils literal"><span class="pre">musrgui</span></tt>, and <tt class="docutils literal"><span class="pre">qt4</span></tt> is replaced by <tt class="docutils literal"><span class="pre">qt3</span></tt>.</p>
</div> </div>
<div class="section" id="id14"> <div class="section" id="id13">
<h3>Check the installation<a class="headerlink" href="#id14" title="Permalink to this headline"></a></h3> <h3>Check the installation<a class="headerlink" href="#id13" title="Permalink to this headline"></a></h3>
<p>In order to perform a quick test for finding out if the installation has been completed successfully, <p>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 <tt class="docutils literal"><span class="pre">musrfit</span></tt> source tree a few msr files together with the corresponding data files can be found in the <tt class="docutils literal"><span class="pre">musrfit</span></tt> source tree
at doc/examples/. at doc/examples/.
@ -819,7 +710,7 @@ or <a class="reference external" href="http://www.finkproject.org/">Fink</a> —
In the following, both possibilities (using MacPorts or Fink) are described but it is emphasized here that In the following, both possibilities (using MacPorts or Fink) are described but it is emphasized here that
it should be followed only <em>one</em> of the possible routes .</p> it should be followed only <em>one</em> of the possible routes .</p>
<div class="section" id="requirements-macports"> <div class="section" id="requirements-macports">
<span id="index-29"></span><h3>Requirements (MacPorts)<a class="headerlink" href="#requirements-macports" title="Permalink to this headline"></a></h3> <span id="index-27"></span><h3>Requirements (MacPorts)<a class="headerlink" href="#requirements-macports" title="Permalink to this headline"></a></h3>
<p>Before proceeding with the usage of the <tt class="docutils literal"><span class="pre">MacPorts</span></tt> system first a few useful tools provided by Apple together <p>Before proceeding with the usage of the <tt class="docutils literal"><span class="pre">MacPorts</span></tt> system first a few useful tools provided by Apple together
with OS X (on the installation DVD/CDs) should be installed:</p> with OS X (on the installation DVD/CDs) should be installed:</p>
<blockquote> <blockquote>
@ -838,7 +729,7 @@ $ sudo xcodebuild -license
<dl class="docutils"> <dl class="docutils">
<dt><strong>X11</strong></dt> <dt><strong>X11</strong></dt>
<dd>The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also <dd>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 <cite>XQuartz &lt;http://xquartz.macosforge.org/trac&gt;</cite>. If <tt class="docutils literal"><span class="pre">ROOT</span></tt> runs without <tt class="docutils literal"><span class="pre">XQuartz</span></tt> <em>do not</em> will need to install <a class="reference external" href="http://xquartz.macosforge.org/trac">XQuartz</a>. If <tt class="docutils literal"><span class="pre">ROOT</span></tt> runs without <tt class="docutils literal"><span class="pre">XQuartz</span></tt> <em>do not</em>
install it.</dd> install it.</dd>
</dl> </dl>
<p>After installing the <tt class="docutils literal"><span class="pre">Xcode</span></tt> tools go to the <a class="reference external" href="http://www.macports.org/install.php">MacPorts install page</a>, download <p>After installing the <tt class="docutils literal"><span class="pre">Xcode</span></tt> tools go to the <a class="reference external" href="http://www.macports.org/install.php">MacPorts install page</a>, download
@ -876,8 +767,8 @@ add a new line pointing to your local copy, <em>e.g.</em></p>
</div> </div>
<p>With <tt class="docutils literal"><span class="pre">Qt5</span></tt>, <tt class="docutils literal"><span class="pre">musredit</span></tt> will be installed. If it happens that you used <tt class="docutils literal"><span class="pre">musrgui</span></tt> in the past, <p>With <tt class="docutils literal"><span class="pre">Qt5</span></tt>, <tt class="docutils literal"><span class="pre">musredit</span></tt> will be installed. If it happens that you used <tt class="docutils literal"><span class="pre">musrgui</span></tt> in the past,
please change over to <tt class="docutils literal"><span class="pre">musredit</span></tt> since there will be no further development for <tt class="docutils literal"><span class="pre">musrgui</span></tt> anymore!</p> please change over to <tt class="docutils literal"><span class="pre">musredit</span></tt> since there will be no further development for <tt class="docutils literal"><span class="pre">musrgui</span></tt> anymore!</p>
<div class="section" id="index-30"> <div class="section" id="index-28">
<span id="id15"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-30" title="Permalink to this headline"></a></h4> <span id="id14"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-28" title="Permalink to this headline"></a></h4>
<p><em>Only</em> if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required packages are set up:</p> <p><em>Only</em> if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required packages are set up:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ sudo port -v install hdf4 hdf5 <div class="highlight-bash"><div class="highlight"><pre><span></span>$ sudo port -v install hdf4 hdf5
</pre></div> </pre></div>
@ -906,21 +797,21 @@ $ sudo make install
</pre></div> </pre></div>
</div> </div>
</div> </div>
<div class="section" id="index-31"> <div class="section" id="index-29">
<span id="id16"></span><h4>ROOT<a class="headerlink" href="#index-31" title="Permalink to this headline"></a></h4> <span id="id15"></span><h4>ROOT<a class="headerlink" href="#index-29" title="Permalink to this headline"></a></h4>
<p>ROOT 5.34/xx is supported as legacy version only! <strong>The default now will be ROOT 6.xx/yy!</strong></p> <p><strong>The default ROOT version is based on ROOT 6.xx/yy!</strong></p>
<div class="section" id="root-installed-via-package-installer"> <div class="section" id="root-installed-via-package-installer">
<h5>ROOT installed via package installer<a class="headerlink" href="#root-installed-via-package-installer" title="Permalink to this headline"></a></h5> <h5>ROOT installed via package installer<a class="headerlink" href="#root-installed-via-package-installer" title="Permalink to this headline"></a></h5>
<p>The lazy way to get <tt class="docutils literal"><span class="pre">ROOT</span></tt> installed is via package installer. If your macOS is directly supported <p>The lazy way to get <tt class="docutils literal"><span class="pre">ROOT</span></tt> installed is via package installer. If your macOS is directly supported
by the <tt class="docutils literal"><span class="pre">ROOT</span></tt> people you can download the package installer from the <tt class="docutils literal"><span class="pre">ROOT</span></tt> <a class="reference external" href="https://root.cern.ch/downloading-root">download page</a>. by the <tt class="docutils literal"><span class="pre">ROOT</span></tt> people you can download the package installer from the <tt class="docutils literal"><span class="pre">ROOT</span></tt> <a class="reference external" href="https://root.cern.ch/downloading-root">download page</a>.
Choose the latest <tt class="docutils literal"><span class="pre">ROOT</span></tt> release and download you macOS version dmg-file, <em>e.g.</em> for macOS 10.13 (High Sierra) Choose the latest <tt class="docutils literal"><span class="pre">ROOT</span></tt> release and download you macOS version dmg-file, <em>e.g.</em> for macOS 10.13 (High Sierra)
it is at the time of writting <tt class="docutils literal"><span class="pre">root_v6.14.00.macosx64-10.13-clang91.dmg</span></tt>. After the installation it is at the time of writting <tt class="docutils literal"><span class="pre">root_v6.16.00.macosx64-10.13-clang91.dmg</span></tt>. After the installation
<tt class="docutils literal"><span class="pre">ROOT</span></tt> will be installed under <tt class="docutils literal"><span class="pre">/Application</span></tt> as owner root. In order to ease your life for the <tt class="docutils literal"><span class="pre">ROOT</span></tt> will be installed under <tt class="docutils literal"><span class="pre">/Application</span></tt> 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 <tt class="docutils literal"><span class="pre">ROOT</span></tt> directory:</p> steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the <tt class="docutils literal"><span class="pre">ROOT</span></tt> directory:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> /Applications <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> /Applications
$ sudo chown -R &lt;username&gt; root_v6.14.00 $ sudo chown -R &lt;username&gt; root_v6.16.00
$ sudo chgrp -R staff root_v6.14.00 $ sudo chgrp -R staff root_v6.16.00
$ sudo ln -s root_v6.14.00 root $ sudo ln -s root_v6.16.00 root
</pre></div> </pre></div>
</div> </div>
</div> </div>
@ -934,12 +825,12 @@ to install it somewhere else, just systematically replace the related terms of t
For the following list of commands the &#8216;$&#8217; will be given, the command prompt. Do not enter it! Also some For the following list of commands the &#8216;$&#8217; will be given, the command prompt. Do not enter it! Also some
comments will be added starting with a &#8216;#&#8217; which can be omitted. They are only there to explain what is going on.</p> comments will be added starting with a &#8216;#&#8217; which can be omitted. They are only there to explain what is going on.</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Applications <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Applications
$ git clone http://root.cern.ch/git/root.git $ git clone http://github.com/root-project/root.git
$ <span class="nb">cd</span> root $ <span class="nb">cd</span> root
$ git tag -l $ git tag -l
$ <span class="c1"># git tag -l will list all available tags. In the next command choose the tag v6-10-xx</span> $ <span class="c1"># git tag -l will list all available tags. In the next command choose the tag v6-10-xx</span>
$ <span class="c1"># where xx is the highest listed number, e.g. v6-14-00</span> $ <span class="c1"># where xx is the highest listed number, e.g. v6-16-00</span>
$ git checkout -b v6-14-00 v6-14-00 $ git checkout -b v6-16-00 v6-16-00
$ <span class="c1"># now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.</span> $ <span class="c1"># now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.</span>
$ <span class="c1"># We will use the cmake out-of-source approach here.</span> $ <span class="c1"># We will use the cmake out-of-source approach here.</span>
$ mkdir root_build $ mkdir root_build
@ -1000,7 +891,7 @@ launchctl setenv LD_LIBRARY_PATH <span class="nv">$LD_LIBRARY_PATH</span>
</div> </div>
</div> </div>
<div class="section" id="requirements-fink"> <div class="section" id="requirements-fink">
<span id="index-32"></span><h3>Requirements (Fink)<a class="headerlink" href="#requirements-fink" title="Permalink to this headline"></a></h3> <span id="index-30"></span><h3>Requirements (Fink)<a class="headerlink" href="#requirements-fink" title="Permalink to this headline"></a></h3>
<p>Before proceeding with the usage of the <a class="reference external" href="http://www.finkproject.org/">Fink</a> system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:</p> <p>Before proceeding with the usage of the <a class="reference external" href="http://www.finkproject.org/">Fink</a> system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:</p>
<dl class="docutils"> <dl class="docutils">
<dt><strong>Xcode</strong></dt> <dt><strong>Xcode</strong></dt>
@ -1014,7 +905,7 @@ $ sudo xcodebuild -license
</dd> </dd>
<dt><strong>X11</strong></dt> <dt><strong>X11</strong></dt>
<dd>The X-window system is automatically installed on 10.5 Leopard and 10.6 Snow Leopard. For some other versions you also <dd>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 <cite>XQuartz &lt;http://xquartz.macosforge.org/trac&gt;</cite>. If <tt class="docutils literal"><span class="pre">ROOT</span></tt> runs without <tt class="docutils literal"><span class="pre">XQuartz</span></tt> <em>do not</em> will need to install <a class="reference external" href="http://xquartz.macosforge.org/trac">XQuartz</a>. If <tt class="docutils literal"><span class="pre">ROOT</span></tt> runs without <tt class="docutils literal"><span class="pre">XQuartz</span></tt> <em>do not</em>
install it.</dd> install it.</dd>
</dl> </dl>
<p>After installing the <tt class="docutils literal"><span class="pre">Xcode</span></tt> tools go to the <a class="reference external" href="http://www.finkproject.org/download/index.php?phpLang=en">Fink download page</a>, <p>After installing the <tt class="docutils literal"><span class="pre">Xcode</span></tt> tools go to the <a class="reference external" href="http://www.finkproject.org/download/index.php?phpLang=en">Fink download page</a>,
@ -1058,8 +949,8 @@ specific location, the later handling will be easier if a symbolic link to this
</pre></div> </pre></div>
</div> </div>
<p>where <tt class="docutils literal"><span class="pre">x_yy_z</span></tt> has to be substituted by the correct version number, <em>e.g.</em> <tt class="docutils literal"><span class="pre">1_63_0</span></tt>.</p> <p>where <tt class="docutils literal"><span class="pre">x_yy_z</span></tt> has to be substituted by the correct version number, <em>e.g.</em> <tt class="docutils literal"><span class="pre">1_63_0</span></tt>.</p>
<div class="section" id="index-33"> <div class="section" id="index-31">
<span id="id17"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-33" title="Permalink to this headline"></a></h4> <span id="id17"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-31" title="Permalink to this headline"></a></h4>
<p><em>Only</em> if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required <p><em>Only</em> if <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support reading data files in the <tt class="docutils literal"><span class="pre">NeXus</span></tt> format the further required
packages can be installed through Fink (check for the most recent versions):</p> packages can be installed through Fink (check for the most recent versions):</p>
<div class="highlight-python"><div class="highlight"><pre><span></span>libjpeg hdf hdf5-cpp11 hdf5-cpp11-shlibs <div class="highlight-python"><div class="highlight"><pre><span></span>libjpeg hdf hdf5-cpp11 hdf5-cpp11-shlibs
@ -1088,21 +979,21 @@ $ sudo make install
</pre></div> </pre></div>
</div> </div>
</div> </div>
<div class="section" id="index-34"> <div class="section" id="index-32">
<span id="id18"></span><h4>ROOT<a class="headerlink" href="#index-34" title="Permalink to this headline"></a></h4> <span id="id18"></span><h4>ROOT<a class="headerlink" href="#index-32" title="Permalink to this headline"></a></h4>
<p>ROOT 5.34/xx is supported as legacy version only and will likely to be dropped in 2018. <strong>The default now is ROOT 6.xx/yy!</strong></p> <p><strong>The default ROOT version is based on ROOT 6.xx/yy!</strong></p>
<div class="section" id="id19"> <div class="section" id="id19">
<h5>ROOT installed via package installer<a class="headerlink" href="#id19" title="Permalink to this headline"></a></h5> <h5>ROOT installed via package installer<a class="headerlink" href="#id19" title="Permalink to this headline"></a></h5>
<p>The lazy way to get <tt class="docutils literal"><span class="pre">ROOT</span></tt> installed is via package installer. If your macOS is directly supported <p>The lazy way to get <tt class="docutils literal"><span class="pre">ROOT</span></tt> installed is via package installer. If your macOS is directly supported
by the <tt class="docutils literal"><span class="pre">ROOT</span></tt> people you can download the package installer from the <tt class="docutils literal"><span class="pre">ROOT</span></tt> <a class="reference external" href="https://root.cern.ch/downloading-root">download page</a>. by the <tt class="docutils literal"><span class="pre">ROOT</span></tt> people you can download the package installer from the <tt class="docutils literal"><span class="pre">ROOT</span></tt> <a class="reference external" href="https://root.cern.ch/downloading-root">download page</a>.
Choose the latest <tt class="docutils literal"><span class="pre">ROOT</span></tt> release and download you macOS version dmg-file, <em>e.g.</em> for macOS 10.13 (High Sierra) Choose the latest <tt class="docutils literal"><span class="pre">ROOT</span></tt> release and download you macOS version dmg-file, <em>e.g.</em> for macOS 10.13 (High Sierra)
it is at the time of writting <tt class="docutils literal"><span class="pre">root_v6.14.00.macosx64-10.13-clang91.dmg</span></tt>. After the installation it is at the time of writting <tt class="docutils literal"><span class="pre">root_v6.16.00.macosx64-10.13-clang91.dmg</span></tt>. After the installation
<tt class="docutils literal"><span class="pre">ROOT</span></tt> will be installed under <tt class="docutils literal"><span class="pre">/Application</span></tt> as owner root. In order to ease your life for the <tt class="docutils literal"><span class="pre">ROOT</span></tt> will be installed under <tt class="docutils literal"><span class="pre">/Application</span></tt> 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 <tt class="docutils literal"><span class="pre">ROOT</span></tt> directory:</p> steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the <tt class="docutils literal"><span class="pre">ROOT</span></tt> directory:</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> /Applications <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> /Applications
$ sudo chown -R &lt;username&gt; root_v6.14.00 $ sudo chown -R &lt;username&gt; root_v6.16.00
$ sudo chgrp -R staff root_v6.14.00 $ sudo chgrp -R staff root_v6.16.00
$ sudo ln -s root_v6.14.00 root $ sudo ln -s root_v6.16.00 root
</pre></div> </pre></div>
</div> </div>
</div> </div>
@ -1116,12 +1007,12 @@ to install it somewhere else, just systematically replace the related terms of t
For the following list of commands the &#8216;$&#8217; will be given, the command prompt. Do not enter it! Also some For the following list of commands the &#8216;$&#8217; will be given, the command prompt. Do not enter it! Also some
comments will be added starting with a &#8216;#&#8217; which can be omitted. They are only there to explain what is going on.</p> comments will be added starting with a &#8216;#&#8217; which can be omitted. They are only there to explain what is going on.</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Applications <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Applications
$ git clone http://root.cern.ch/git/root.git $ git clone http://github.com/root-project/root.git
$ <span class="nb">cd</span> root $ <span class="nb">cd</span> root
$ git tag -l $ git tag -l
$ <span class="c1"># git tag -l will list all available tags. In the next command choose the tag v6-10-xx</span> $ <span class="c1"># git tag -l will list all available tags. In the next command choose the tag v6-10-xx</span>
$ <span class="c1"># where xx is the highest listed number, e.g. v6-14-00</span> $ <span class="c1"># where xx is the highest listed number, e.g. v6-16-00</span>
$ git checkout -b v6-14-00 v6-14-00 $ git checkout -b v6-16-00 v6-16-00
$ <span class="c1"># now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.</span> $ <span class="c1"># now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.</span>
$ <span class="c1"># We will use the cmake out-of-source approach here.</span> $ <span class="c1"># We will use the cmake out-of-source approach here.</span>
$ mkdir root_build $ mkdir root_build
@ -1181,22 +1072,20 @@ launchctl setenv LD_LIBRARY_PATH <span class="nv">$LD_LIBRARY_PATH</span>
</div> </div>
</div> </div>
</div> </div>
<div class="section" id="index-35"> <div class="section" id="index-33">
<span id="id24"></span><h3>musrfit<a class="headerlink" href="#index-35" title="Permalink to this headline"></a></h3> <span id="id24"></span><h3>musrfit<a class="headerlink" href="#index-33" title="Permalink to this headline"></a></h3>
<p>First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. <p>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 <tt class="docutils literal"><span class="pre">musrfit</span></tt> repository via git. Assuming the code should be located The preferred way of doing so is to clone the <tt class="docutils literal"><span class="pre">musrfit</span></tt> repository via git. Assuming the code should be located
in <tt class="docutils literal"><span class="pre">~/Applications/musrfit</span></tt> this is achieved most easily calling from the termin</p> in <tt class="docutils literal"><span class="pre">~/Applications/musrfit</span></tt> this is achieved most easily calling from the termin</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> ~/Applications <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> ~/Applications
$ git clone https://bitbucket.org/muonspin/musrfit.git $ git clone https://bitbucket.org/muonspin/musrfit.git
$ <span class="c1"># Only if legacy ROOT 5.xx.yy is used include the next line</span> $ <span class="nb">cd</span> musrfit
$ <span class="nb">cd</span> musrfit<span class="p">;</span> git checkout root5
</pre></div> </pre></div>
</div> </div>
<p>or</p> <p>or</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> ~/Applications <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> ~/Applications
$ git clone git://gitlab.psi.ch/nemu/musrfit.git $ git clone git://gitlab.psi.ch/nemu/musrfit.git
$ <span class="c1"># Only if legacy ROOT 5.xx.yy is used include the next line</span> $ <span class="nb">cd</span> musrfit
$ <span class="nb">cd</span> musrfit<span class="p">;</span> git checkout root5
</pre></div> </pre></div>
</div> </div>
<p>If a local repository clone is already present, one can update it using:</p> <p>If a local repository clone is already present, one can update it using:</p>
@ -1206,59 +1095,8 @@ $ git pull
</div> </div>
<p>As an alternative (<em>if git is not available</em>), the source code can also be downloaded from the following <p>As an alternative (<em>if git is not available</em>), the source code can also be downloaded from the following
web-page: <a class="reference external" href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.</p> web-page: <a class="reference external" href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.</p>
<div class="section" id="index-36"> <div class="section" id="index-34">
<span id="id25"></span><h4>musrfit build with automake<a class="headerlink" href="#index-36" title="Permalink to this headline"></a></h4> <span id="id25"></span><h4>musrfit build with cmake<a class="headerlink" href="#index-34" title="Permalink to this headline"></a></h4>
<p>After the source-code extraction the <tt class="docutils literal"><span class="pre">autogen.sh</span></tt> script is called to prepare the build environment.
If it has been executed successfully the <tt class="docutils literal"><span class="pre">configure</span></tt> script should be ready to collect all the information needed
to create the Makefiles. If <tt class="docutils literal"><span class="pre">musrfit</span></tt> should support <tt class="docutils literal"><span class="pre">NeXus</span></tt> data files this has to be enabled by specifying the
<tt class="docutils literal"><span class="pre">--enable-NeXus</span></tt> switch when calling configure. For an overview of all available options just call <tt class="docutils literal"><span class="pre">./configure</span> <span class="pre">--help</span></tt>.
Besides the standard options there are a few special options which should be mentioned here:</p>
<dl class="docutils">
<dt><strong>- -prefix</strong></dt>
<dd>Specify the installation prefix, <em>e.g.</em> <tt class="docutils literal"><span class="pre">$ROOTSYS</span></tt> if already defined (by default: <tt class="docutils literal"><span class="pre">/usr/local</span></tt>).</dd>
<dt><strong>- -with-rootsys</strong></dt>
<dd>Specify the top of the <tt class="docutils literal"><span class="pre">ROOT</span></tt> installation directory, <em>e.g.</em> <tt class="docutils literal"><span class="pre">$ROOTSYS</span></tt> if already defined.</dd>
<dt><strong>- -with-fftw3</strong></dt>
<dd>Specify the prefix of the <tt class="docutils literal"><span class="pre">FFTW3</span></tt> installation. <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> or <tt class="docutils literal"><span class="pre">/usr</span></tt>.</dd>
<dt><strong>- -with-gsl</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">GSL</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> or <tt class="docutils literal"><span class="pre">/usr</span></tt>.</dd>
<dt><strong>- -with-boostinc</strong></dt>
<dd>Set the path to the header files of the <tt class="docutils literal"><span class="pre">Boost</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local/include</span></tt> or <tt class="docutils literal"><span class="pre">/usr/include</span></tt>.</dd>
<dt><strong>- -with-hdf4</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">HDF4</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support).</dd>
<dt><strong>- -with-hdf5</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">HDF5</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support).</dd>
<dt><strong>- -with-nexus</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">NeXus</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/local</span></tt> (only useful in conjunction with the <tt class="docutils literal"><span class="pre">NeXus</span></tt> support).</dd>
<dt><strong>- -with-qt3</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt3</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt-3.3</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musrgui</span></tt>).</dd>
<dt><strong>- -with-qt4</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt4</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib/qt47</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musredit</span></tt>).</dd>
<dt><strong>- -with-qt5</strong></dt>
<dd>Set the prefix of the <tt class="docutils literal"><span class="pre">Qt5</span></tt> installation, <em>e.g.</em> <tt class="docutils literal"><span class="pre">/usr/lib64</span></tt> (only useful in conjunction with building <tt class="docutils literal"><span class="pre">musredit</span></tt>).</dd>
<dt><strong>- -enable-NeXus</strong></dt>
<dd>Enable the support of <tt class="docutils literal"><span class="pre">NeXus</span></tt> data files (requires the <tt class="docutils literal"><span class="pre">HDF4</span></tt>, <tt class="docutils literal"><span class="pre">HDF5</span></tt> and <tt class="docutils literal"><span class="pre">NeXus</span></tt> libraries to be installed).</dd>
<dt><strong>- -disable-editor</strong></dt>
<dd>Disable the integrated building of <tt class="docutils literal"><span class="pre">musredit</span></tt>/<tt class="docutils literal"><span class="pre">musrgui</span></tt>.</dd>
<dt><strong>- -disable-omp</strong></dt>
<dd>Switches off the <a class="reference external" href="http://en.wikipedia.org/wiki/OpenMP">OpenMP</a> features of <tt class="docutils literal"><span class="pre">musrfit</span></tt> (parallelization of the <span class="math">\(\chi^2\)</span> calculation when compiled with GCC ≥ 4.2).</dd>
</dl>
<p>Normally it should not be necessary to make use of any of the options except for specifying the installation path with <tt class="docutils literal"><span class="pre">--prefix</span></tt>. 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 <tt class="docutils literal"><span class="pre">musrfit</span></tt> libraries and executables.
A standard installation sequence (without <tt class="docutils literal"><span class="pre">NeXus</span></tt> support) might then look like (In case the normal user has no write permissions to the
<tt class="docutils literal"><span class="pre">$ROOTSYS</span></tt> and the installation path the &#8220;make install&#8221; commands have to be executed as superuser.):</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit
$ sh autogen.sh
$ ./configure --prefix<span class="o">=</span><span class="nv">$ROOTSYS</span>
$ make
$ make install
$ /sbin/ldconfig <span class="c1"># (as superuser)</span>
</pre></div>
</div>
</div>
<div class="section" id="index-37">
<span id="id27"></span><h4>musrfit build with cmake<a class="headerlink" href="#index-37" title="Permalink to this headline"></a></h4>
<p>Currently the following configuration switches for <tt class="docutils literal"><span class="pre">musrfit</span></tt> are available:</p> <p>Currently the following configuration switches for <tt class="docutils literal"><span class="pre">musrfit</span></tt> are available:</p>
<dl class="docutils"> <dl class="docutils">
<dt><strong>-DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt;</strong></dt> <dt><strong>-DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt;</strong></dt>
@ -1298,8 +1136,8 @@ $ /sbin/ldconfig <span class="c1"># (as superus
</pre></div> </pre></div>
</div> </div>
</div> </div>
<div class="section" id="id28"> <div class="section" id="id26">
<h4>musrfit last step of the installation<a class="headerlink" href="#id28" title="Permalink to this headline"></a></h4> <h4>musrfit last step of the installation<a class="headerlink" href="#id26" title="Permalink to this headline"></a></h4>
<p>In order to finish the installation of <tt class="docutils literal"><span class="pre">musrfit</span></tt> two more things should be done:</p> <p>In order to finish the installation of <tt class="docutils literal"><span class="pre">musrfit</span></tt> two more things should be done:</p>
<ul class="simple"> <ul class="simple">
<li>Define the <tt class="docutils literal"><span class="pre">MUSRFITPATH</span></tt> environment variable containing the path to the <tt class="docutils literal"><span class="pre">musrfit</span></tt> executables and <tt class="docutils literal"><span class="pre">XML</span></tt> files. <li>Define the <tt class="docutils literal"><span class="pre">MUSRFITPATH</span></tt> environment variable containing the path to the <tt class="docutils literal"><span class="pre">musrfit</span></tt> executables and <tt class="docutils literal"><span class="pre">XML</span></tt> files.
@ -1315,12 +1153,11 @@ detailed information on this XML file refer to the <a class="reference internal"
</ul> </ul>
</div> </div>
</div> </div>
<div class="section" id="index-38"> <div class="section" id="index-35">
<span id="id29"></span><h3>musredit<a class="headerlink" href="#index-38" title="Permalink to this headline"></a></h3> <span id="id27"></span><h3>musredit<a class="headerlink" href="#index-35" title="Permalink to this headline"></a></h3>
<p>In the latest version of <tt class="docutils literal"><span class="pre">musrfit</span></tt> the configure script tries to determine automatically the highest <p>In the latest version of <tt class="docutils literal"><span class="pre">musrfit</span></tt> the configure script tries to determine automatically the highest
available Qt version. In case this is found, the editor <tt class="docutils literal"><span class="pre">musredit</span></tt> is built already together with <tt class="docutils literal"><span class="pre">musrfit</span></tt>. available Qt version. In case this is found, the editor <tt class="docutils literal"><span class="pre">musredit</span></tt> is built already together with <tt class="docutils literal"><span class="pre">musrfit</span></tt>.
If not, one can try to call the configure script with the <strong>&#8211;with-qt5</strong> option (<tt class="docutils literal"><span class="pre">automake</span></tt>). <tt class="docutils literal"><span class="pre">cmake</span></tt> will If not, try the following:</p>
determine everthing automatically. To install this editor separately, <em>i.e.</em> by “hand” do</p>
<div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit/src/musredit_qt5 <div class="highlight-bash"><div class="highlight"><pre><span></span>$ <span class="nb">cd</span> <span class="nv">$HOME</span>/Apps/musrfit/src/musredit_qt5
$ <span class="c1"># for some distributions you will need qmake-qt5 for the next command</span> $ <span class="c1"># for some distributions you will need qmake-qt5 for the next command</span>
$ qmake musredit.pro $ qmake musredit.pro
@ -1353,8 +1190,8 @@ accomplish that, add the following lines to <tt class="docutils literal"><span c
</pre></div> </pre></div>
</div> </div>
</div> </div>
<div class="section" id="id30"> <div class="section" id="id28">
<h3>Check the installation<a class="headerlink" href="#id30" title="Permalink to this headline"></a></h3> <h3>Check the installation<a class="headerlink" href="#id28" title="Permalink to this headline"></a></h3>
<p>In order to perform a quick test for finding out if the installation has been completed successfully, a few msr <p>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 <tt class="docutils literal"><span class="pre">doc/examples/</span></tt>. files together with the corresponding data files can be found in the musrfit source tree at <tt class="docutils literal"><span class="pre">doc/examples/</span></tt>.
If <tt class="docutils literal"><span class="pre">musrgui</span></tt> has been installed, just open one of the <tt class="docutils literal"><span class="pre">test-*.msr</span></tt> files in the editor and test the <tt class="docutils literal"><span class="pre">musrfit</span></tt> If <tt class="docutils literal"><span class="pre">musrgui</span></tt> has been installed, just open one of the <tt class="docutils literal"><span class="pre">test-*.msr</span></tt> files in the editor and test the <tt class="docutils literal"><span class="pre">musrfit</span></tt>
@ -1386,7 +1223,6 @@ $ musrview test-histo-ROOT-NPP.msr
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#musrfit">musrfit</a><ul> <li><a class="reference internal" href="#musrfit">musrfit</a><ul>
<li><a class="reference internal" href="#musrfit-build-with-automake">musrfit build with automake</a></li>
<li><a class="reference internal" href="#musrfit-build-with-cmake">musrfit build with cmake</a></li> <li><a class="reference internal" href="#musrfit-build-with-cmake">musrfit build with cmake</a></li>
<li><a class="reference internal" href="#musrfit-last-step-of-the-installation">musrfit last step of the installation</a></li> <li><a class="reference internal" href="#musrfit-last-step-of-the-installation">musrfit last step of the installation</a></li>
</ul> </ul>
@ -1400,41 +1236,39 @@ $ musrview test-histo-ROOT-NPP.msr
<li><a class="reference internal" href="#id5">Requirements</a><ul> <li><a class="reference internal" href="#id5">Requirements</a><ul>
<li><a class="reference internal" href="#setting-up-cygwin">Setting up Cygwin</a></li> <li><a class="reference internal" href="#setting-up-cygwin">Setting up Cygwin</a></li>
<li><a class="reference internal" href="#id6">Everything but ROOT and NeXus</a></li> <li><a class="reference internal" href="#id6">Everything but ROOT and NeXus</a></li>
<li><a class="reference internal" href="#index-23">Installation of NeXus requirements (optional)</a></li> <li><a class="reference internal" href="#index-22">Installation of NeXus requirements (optional)</a></li>
<li><a class="reference internal" href="#index-24">ROOT</a></li> <li><a class="reference internal" href="#index-23">ROOT</a></li>
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#index-25">musrfit</a><ul> <li><a class="reference internal" href="#index-24">musrfit</a><ul>
<li><a class="reference internal" href="#index-26">musrfit build with automake</a></li> <li><a class="reference internal" href="#index-25">musrfit build with cmake</a></li>
<li><a class="reference internal" href="#index-27">musrfit build with cmake</a></li>
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#index-28">musredit</a></li> <li><a class="reference internal" href="#index-26">musredit</a></li>
<li><a class="reference internal" href="#id13">musrgui (obsolate)</a></li> <li><a class="reference internal" href="#id12">musrgui (obsolate)</a></li>
<li><a class="reference internal" href="#id14">Check the installation</a></li> <li><a class="reference internal" href="#id13">Check the installation</a></li>
<li><a class="reference internal" href="#potential-problems">Potential Problems</a></li> <li><a class="reference internal" href="#potential-problems">Potential Problems</a></li>
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#mac-os-x-macos">Mac OS X / macOS</a><ul> <li><a class="reference internal" href="#mac-os-x-macos">Mac OS X / macOS</a><ul>
<li><a class="reference internal" href="#requirements-macports">Requirements (MacPorts)</a><ul> <li><a class="reference internal" href="#requirements-macports">Requirements (MacPorts)</a><ul>
<li><a class="reference internal" href="#index-30">Installation of NeXus requirements (optional)</a></li> <li><a class="reference internal" href="#index-28">Installation of NeXus requirements (optional)</a></li>
<li><a class="reference internal" href="#index-31">ROOT</a></li> <li><a class="reference internal" href="#index-29">ROOT</a></li>
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#requirements-fink">Requirements (Fink)</a><ul> <li><a class="reference internal" href="#requirements-fink">Requirements (Fink)</a><ul>
<li><a class="reference internal" href="#index-33">Installation of NeXus requirements (optional)</a></li> <li><a class="reference internal" href="#index-31">Installation of NeXus requirements (optional)</a></li>
<li><a class="reference internal" href="#index-34">ROOT</a></li> <li><a class="reference internal" href="#index-32">ROOT</a></li>
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#index-35">musrfit</a><ul> <li><a class="reference internal" href="#index-33">musrfit</a><ul>
<li><a class="reference internal" href="#index-36">musrfit build with automake</a></li> <li><a class="reference internal" href="#index-34">musrfit build with cmake</a></li>
<li><a class="reference internal" href="#index-37">musrfit build with cmake</a></li> <li><a class="reference internal" href="#id26">musrfit last step of the installation</a></li>
<li><a class="reference internal" href="#id28">musrfit last step of the installation</a></li>
</ul> </ul>
</li> </li>
<li><a class="reference internal" href="#index-38">musredit</a></li> <li><a class="reference internal" href="#index-35">musredit</a></li>
<li><a class="reference internal" href="#musrgui-obsolete">musrgui (obsolete)</a></li> <li><a class="reference internal" href="#musrgui-obsolete">musrgui (obsolete)</a></li>
<li><a class="reference internal" href="#id30">Check the installation</a></li> <li><a class="reference internal" href="#id28">Check the installation</a></li>
</ul> </ul>
</li> </li>
</ul> </ul>
@ -1481,12 +1315,12 @@ $ musrview test-histo-ROOT-NPP.msr
<li class="right" > <li class="right" >
<a href="user-libs.html" title="Documentation of user libs (user functions)" <a href="user-libs.html" title="Documentation of user libs (user functions)"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/tutorial.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Tutorial for musrfit &mdash; musrfit 1.4.1 documentation</title> <title>Tutorial for musrfit &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="User manual" href="user-manual.html" /> <link rel="next" title="User manual" href="user-manual.html" />
<link rel="prev" title="How to Cite musrfit?" href="cite.html" /> <link rel="prev" title="How to Cite musrfit?" href="cite.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="cite.html" title="How to Cite musrfit?" <a href="cite.html" title="How to Cite musrfit?"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -443,12 +443,12 @@ For a complete description please refer to the manuals of <a class="reference in
<li class="right" > <li class="right" >
<a href="cite.html" title="How to Cite musrfit?" <a href="cite.html" title="How to Cite musrfit?"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/user-libs.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Documentation of user libs (user functions) &mdash; musrfit 1.4.1 documentation</title> <title>Documentation of user libs (user functions) &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="Setting up musrfit on Different Platforms" href="setup-standard.html" /> <link rel="next" title="Setting up musrfit on Different Platforms" href="setup-standard.html" />
<link rel="prev" title="User manual" href="user-manual.html" /> <link rel="prev" title="User manual" href="user-manual.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="user-manual.html" title="User manual" <a href="user-manual.html" title="User manual"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -662,12 +662,12 @@ K(m)&amp;=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
<li class="right" > <li class="right" >
<a href="user-manual.html" title="User manual" <a href="user-manual.html" title="User manual"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

12
doc/html/user-manual.html
View File

@ -6,7 +6,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>User manual &mdash; musrfit 1.4.1 documentation</title> <title>User manual &mdash; musrfit 1.4.2 documentation</title>
<link rel="stylesheet" href="_static/nature.css" type="text/css" /> <link rel="stylesheet" href="_static/nature.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
@ -14,7 +14,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: './', URL_ROOT: './',
VERSION: '1.4.1', VERSION: '1.4.2',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> <script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
<link rel="top" title="musrfit 1.4.1 documentation" href="index.html" /> <link rel="top" title="musrfit 1.4.2 documentation" href="index.html" />
<link rel="next" title="Documentation of user libs (user functions)" href="user-libs.html" /> <link rel="next" title="Documentation of user libs (user functions)" href="user-libs.html" />
<link rel="prev" title="Tutorial for musrfit" href="tutorial.html" /> <link rel="prev" title="Tutorial for musrfit" href="tutorial.html" />
</head> </head>
@ -41,7 +41,7 @@
<li class="right" > <li class="right" >
<a href="tutorial.html" title="Tutorial for musrfit" <a href="tutorial.html" title="Tutorial for musrfit"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
@ -2238,12 +2238,12 @@ In case this cannot be ensured, the parallelization can be disabled by <em>&#821
<li class="right" > <li class="right" >
<a href="tutorial.html" title="Tutorial for musrfit" <a href="tutorial.html" title="Tutorial for musrfit"
>previous</a> |</li> >previous</a> |</li>
<li><a href="index.html">musrfit 1.4.1 documentation</a> &raquo;</li> <li><a href="index.html">musrfit 1.4.2 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<div class="footer"> <div class="footer">
&copy; Copyright 2018, Andreas Suter. &copy; Copyright 2018, Andreas Suter.
Last updated on Jan 21, 2019. Last updated on Mar 08, 2019.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 1.2.3.
</div> </div>
</body> </body>

74
src/Makefile.am
View File

@ -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)

149
src/Makefile.musrfit
View File

@ -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

261
src/classes/Makefile.PMusr
View File

@ -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

99
src/classes/Makefile.PUserFcn
View File

@ -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

58
src/classes/PTheory.cpp
View File

@ -390,7 +390,7 @@ Bool_t PTheory::IsValid()
* \param paramValues vector with the parameters * \param paramValues vector with the parameters
* \param funcValues vector with the functions (i.e. functions of 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 (fMul) {
if (fAdd) { // fMul != 0 && fAdd != 0 if (fAdd) { // fMul != 0 && fAdd != 0
@ -1166,7 +1166,7 @@ Double_t PTheory::Asymmetry(const PDoubleVector& paramValues, const PDoubleVecto
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // expected parameters: lambda [tshift]
@ -1206,7 +1206,7 @@ Double_t PTheory::SimpleExp(register Double_t t, const PDoubleVector& paramValue
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // expected parameters: sigma [tshift]
@ -1294,7 +1294,7 @@ Double_t PTheory::SimpleGauss(register Double_t t, const PDoubleVector& paramVal
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // expected parameters: sigma [tshift]
@ -1336,7 +1336,7 @@ Double_t PTheory::StaticGaussKT(register Double_t t, const PDoubleVector& paramV
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // expected parameters: lambda [tshift]
@ -1566,7 +1566,7 @@ Double_t PTheory::StaticLorentzKT(register Double_t t, const PDoubleVector& para
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // expected parameters: nu lambda [tshift]
@ -1964,7 +1964,7 @@ Double_t PTheory::RandomAnisotropicHyperfine(register Double_t t, const PDoubleV
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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]] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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]] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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]] // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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 ... // 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 paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \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 // check if FUNCTIONS are used
for (UInt_t i=0; i<fUserParam.size(); i++) { for (UInt_t i=0; i<fUserParam.size(); i++) {
@ -2973,7 +2973,7 @@ Double_t PTheory::GetDynKTLFValue(const Double_t t) const
* \param paramValues parameter values * \param paramValues parameter values
* \param funcValues vector with the functions (i.e. functions of the parameters) * \param funcValues vector with the functions (i.e. functions of the parameters)
*/ */
Double_t PTheory::MuMinusExpTF(register Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const Double_t PTheory::MuMinusExpTF(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const
{ {
// expected parameters: N0 tau A lambda phase frequency [tshift] // expected parameters: N0 tau A lambda phase frequency [tshift]

63
src/external/BMWtools/Makefile.am vendored
View File

@ -1,63 +0,0 @@
## Process this file with automake to create Makefile.in
h_sources = \
BMWStartupHandler.h \
TTrimSPDataHandler.h \
BMWIntegrator.h
h_linkdef = \
BMWStartupHandlerLinkDef.h
dict_h_sources = \
BMWStartupHandlerDict.h
cpp_sources = \
BMWStartupHandler.cpp \
TTrimSPDataHandler.cpp \
BMWIntegrator.cpp
dict_cpp_sources = \
BMWStartupHandlerDict.cpp
pcmdir = $(libdir)
pcm_DATA = BMWStartupHandlerDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
AM_CPPFLAGS = -I$(top_srcdir)/src/include $(LEM_CFLAGS) $(PMUSR_CFLAGS) $(CUBA_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 $(INCLUDES) $^
lib_LTLIBRARIES = libBMWtools.la
libBMWtools_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libBMWtools_la_LIBADD = $(CUBA_LIBS) $(ROOT_LIBS)
libBMWtools_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
## For the moment do not build pkgconfig files for musrfit plug-ins...
## pkgconfigdir = $(libdir)/pkgconfig
## 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)/libBMWtools.dylib $(libdir)/libBMWtools.so
uninstall-hook:
rm -f $(libdir)/libBMWtools.so
endif
if IS_CYGWIN
install-exec-hook:
$(LN_S) -f $(bindir)/cygBMWtools-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libBMWtools.so
uninstall-hook:
rm -f $(libdir)/libBMWtools.so
endif

1
src/external/CMakeLists.txt vendored
View File

@ -3,6 +3,7 @@ if (ASlibs)
add_subdirectory(MagProximity) add_subdirectory(MagProximity)
add_subdirectory(libPhotoMeissner) add_subdirectory(libPhotoMeissner)
add_subdirectory(libSpinValve) add_subdirectory(libSpinValve)
add_subdirectory(libGbGLF)
endif (ASlibs) endif (ASlibs)
if (BMWlibs) if (BMWlibs)

69
src/external/MagProximity/Makefile.am vendored
View File

@ -1,69 +0,0 @@
## Process this file with automake to create Makefile.in
h_sources = \
PMagProximityFitter.h \
PMPRgeHandler.h \
PMPStartupHandler.h \
PMagProximity.h
h_linkdef = \
PMagProximityFitterLinkDef.h \
PMPStartupHandlerLinkDef.h
dict_h_sources = \
PMagProximityFitterDict.h \
PMPStartupHandlerDict.h
cpp_sources = \
PMagProximityFitter.cpp \
PMPRgeHandler.cpp \
PMPStartupHandler.cpp
dict_cpp_sources = \
PMagProximityFitterDict.cpp \
PMPStartupHandlerDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PMagProximityFitterDict_rdict.pcm \
PMPStartupHandlerDict_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 = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPMagProximityFitter.la
libPMagProximityFitter_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libPMagProximityFitter_la_LIBADD = $(USERFCN_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS)
libPMagProximityFitter_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 = PMagProximityFitter.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)/libPMagProximityFitter.dylib $(libdir)/libPMagProximityFitter.so
uninstall-hook:
rm -f $(libdir)/libPMagProximityFitter.so
endif
if IS_CYGWIN
install-exec-hook:
$(LN_S) -f $(bindir)/cygPMagProximityFitter-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPMagProximityFitter.so
uninstall-hook:
rm -f $(libdir)/libPMagProximityFitter.so
endif

27
src/external/Makefile.am vendored
View File

@ -1,27 +0,0 @@
if BUILD_ASLIBS
ASDIRS = Nonlocal \
MagProximity \
libSpinValve \
libPhotoMeissner \
libGbGLF
endif
if BUILD_CUBALIB
CUBADIRS = libCuba
endif
if BUILD_BMWLIBS
BMWDIRS = BMWtools \
libFitPofB \
libLFRelaxation \
libZFRelaxation \
libGapIntegrals \
libCalcMeanFieldsLEM
endif
if BUILD_BNMRLIBS
BNMRDIRS = libBNMR
endif
SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS) $(BNMRDIRS)

21
src/external/MuSR_software/Class_MuSR_PSI/Makefile.am vendored
View File

@ -1,21 +0,0 @@
## Process this file with automake to create Makefile.in
h_sources = MuSR_td_PSI_bin.h
cpp_sources = MuSR_td_PSI_bin.cpp
include_HEADERS = MuSR_td_PSI_bin.h
AM_CPPFLAGS = -I.
AM_CXXFLAGS = $(LOCAL_PSIBIN_LIB_CXXFLAGS)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS)
CLEANFILES = *~ core
lib_LTLIBRARIES = libClass_MuSR_PSI.la
libClass_MuSR_PSI_la_SOURCES = $(h_sources) $(cpp_sources)
libClass_MuSR_PSI_la_LDFLAGS = $(AM_LDFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = Class_MuSR_PSI.pc

3
src/external/MuSR_software/Makefile.am vendored
View File

@ -1,3 +0,0 @@
## $Id$
SUBDIRS = Class_MuSR_PSI

42
src/external/MusrRoot/Makefile.am vendored
View File

@ -1,42 +0,0 @@
## Process this file with automake to create Makefile.in
h_sources = \
TMusrRunHeader.h
h_linkdef = \
TMusrRunHeaderLinkDef.h
dict_h_sources = \
TMusrRunHeaderDict.h
cpp_sources = \
TMusrRunHeader.cpp
dict_cpp_sources = \
TMusrRunHeaderDict.cpp
pcmdir = $(libdir)
pcm_DATA = TMusrRunHeaderDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
AM_CPPFLAGS = -I. -I$(ROOTINCDIR)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dist_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 $(INCLUDES) $^
lib_LTLIBRARIES = libTMusrRunHeader.la
libTMusrRunHeader_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libTMusrRunHeader_la_LIBADD = $(ROOT_LIBS)
libTMusrRunHeader_la_LDFLAGS = -version-info $(MUSR_ROOT_LIBRARY_VERSION) -release $(MUSR_ROOT_RELEASE) $(AM_LDFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = TMusrRunHeader.pc

70
src/external/Nonlocal/Makefile.am vendored
View File

@ -1,70 +0,0 @@
## Process this file with automake to create Makefile.in
h_sources = \
PNL_PippardFitter.h \
PNL_RgeHandler.h \
PNL_StartupHandler.h \
PNonlocal.h
h_linkdef = \
PNL_PippardFitterLinkDef.h \
PNL_StartupHandlerLinkDef.h
dict_h_sources = \
PNL_PippardFitterDict.h \
PNL_StartupHandlerDict.h
cpp_sources = \
PNL_PippardFitter.cpp \
PNL_RgeHandler.cpp \
PNL_StartupHandler.cpp
dict_cpp_sources = \
PNL_PippardFitterDict.cpp \
PNL_StartupHandlerDict.cpp
pcmdir = $(libdir)
pcm_DATA = \
PNL_PippardFitterDict_rdict.pcm \
PNL_StartupHandlerDict_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 = *Dict.cpp *Dict.h *Dict* *~ core
%Dict.cpp %Dict.h: %.h %LinkDef.h
@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
lib_LTLIBRARIES = libPNL_PippardFitter.la
libPNL_PippardFitter_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libPNL_PippardFitter_la_LIBADD = $(USERFCN_LIBS) $(FFTW3_LIBS) $(ROOT_LIBS)
libPNL_PippardFitter_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 = PNL_PippardFitter.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)/libPNL_PippardFitter.dylib $(libdir)/libPNL_PippardFitter.so
uninstall-hook:
rm -f $(libdir)/libPNL_PippardFitter.so
endif
if IS_CYGWIN
install-exec-hook:
$(LN_S) -f $(bindir)/cygPNL_PippardFitter-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libPNL_PippardFitter.so
uninstall-hook:
rm -f $(libdir)/libPNL_PippardFitter.so
endif

49
src/external/TLemRunHeader/Makefile.am vendored
View File

@ -1,49 +0,0 @@
## Process this file with automake to create Makefile.in
h_sources = \
TLemStats.h \
TLemRunHeader.h
h_linkdef = \
TLemStatsLinkDef.h \
TLemRunHeaderLinkDef.h
dict_h_sources = \
TLemStatsDict.h \
TLemRunHeaderDict.h
cpp_sources = \
TLemStats.cxx \
TLemRunHeader.cxx
dict_cpp_sources = \
TLemStatsDict.cxx \
TLemRunHeaderDict.cxx
pcmdir = $(libdir)
pcm_DATA = \
TLemStatsDict_rdict.pcm \
TLemRunHeaderDict_rdict.pcm
include_HEADERS = $(h_sources)
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
AM_CPPFLAGS = -I. -I$(ROOTINCDIR)
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
BUILT_SOURCES = $(dict_cpp_sources) $(dist_h_sources)
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core
%Dict.cxx %Dict.h: %.h %LinkDef.h
@ROOTCLING@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^
lib_LTLIBRARIES = libTLemRunHeader.la
libTLemRunHeader_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libTLemRunHeader_la_LIBADD = $(ROOT_LIBS)
libTLemRunHeader_la_LDFLAGS = -version-info $(LEM_LIBRARY_VERSION) -release $(LEM_RELEASE) $(AM_LDFLAGS)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = TLemRunHeader.pc

53
src/external/libBNMR/Makefile.am vendored
View File

@ -1,53 +0,0 @@
## Process this file with automake to create Makefile.in
SUBDIRS = libLineProfile
h_sources = \
TBNMR.h
h_linkdef = \
TBNMRLinkDef.h
dict_h_sources = \
TBNMRDict.h
cpp_sources = \
TBNMR.cpp
dict_cpp_sources = \
TBNMRDict.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 = libBNMR.la
libBNMR_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
libBNMR_la_LIBADD = $(ROOT_LIBS)
libBNMR_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)/libBNMR.dylib $(libdir)/libBNMR.so
uninstall-hook:
rm -f $(libdir)/libBNMR.so
endif
if IS_CYGWIN
install-exec-hook:
$(LN_S) -f $(bindir)/cygBNMR-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libBNMR.so
uninstall-hook:
rm -f $(libdir)/libBNMR.so
endif

60
src/external/libBNMR/Makefile.libBNMR vendored
View File

@ -1,60 +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 += TBNMR.o TlibBNMRDict.o
SHLIB = libBNMR.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 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

52
src/external/libBNMR/libLineProfile/Makefile.am vendored
View File

@ -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

66
src/external/libBNMR/libLineProfile/Makefile.libLineProfile vendored
View File

@ -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"

59
src/external/libCalcMeanFieldsLEM/Makefile.am vendored
View File

@ -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

1
src/external/libCuba/Makefile.am vendored
View File

@ -1 +0,0 @@
SUBDIRS = src

19
src/external/libCuba/src/Makefile.am vendored
View File

@ -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

14
src/external/libCuba/src/common/Makefile.am vendored
View File

@ -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)

12
src/external/libCuba/src/cuhre/Makefile.am vendored
View File

@ -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)

12
src/external/libCuba/src/divonne/Makefile.am vendored
View File

@ -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)

12
src/external/libCuba/src/suave/Makefile.am vendored
View File

@ -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)

12
src/external/libCuba/src/vegas/Makefile.am vendored
View File

@ -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)

1
src/external/libFitPofB/Makefile.am vendored
View File

@ -1 +0,0 @@
SUBDIRS = classes

80
src/external/libFitPofB/classes/Makefile.am vendored
View File

@ -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

2
src/external/libGapIntegrals/INSTALL vendored
View File

@ -4,7 +4,7 @@
Installation of the musrfit-plugin "libGapIntegrals" 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: * The plugin classes can be accessed inside THEORY blocks of musrfit msr files via:

59
src/external/libGapIntegrals/Makefile.am vendored
View File

@ -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

65
src/external/libGbGLF/CMakeLists.txt vendored Normal file
View File

@ -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
$<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
$<BUILD_INTERFACE:${MUSRFIT_INC}>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}>
)
#--- 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

56
src/external/libGbGLF/Makefile.am vendored
View File

@ -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

BIN
src/external/libGbGLF/doc/GbG-LF.pdf vendored
View File

Binary file not shown.

2
src/external/libGbGLF/doc/GbG-LF.tex vendored
View File

@ -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 \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}$. $\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} \begin{equation}
P_{Z,{\rm GbG}}^{\rm LF} = \int_0^\infty d\sigma \left\{ \varrho \cdot P_{Z,{\rm GKT}}^{\rm LF} \right\}. P_{Z,{\rm GbG}}^{\rm LF} = \int_0^\infty d\sigma \left\{ \varrho \cdot P_{Z,{\rm GKT}}^{\rm LF} \right\}.

59
src/external/libLFRelaxation/Makefile.am vendored
View File

@ -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

2
src/external/libLFRelaxation/README vendored
View File

@ -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. 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. 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 TLFStatGssKT 1 2 (frequency rate)
userFcn libLFRelaxation TLFStatExpKT 1 2 (frequency rate) userFcn libLFRelaxation TLFStatExpKT 1 2 (frequency rate)

1
src/external/libPhotoMeissner/Makefile.am vendored
View File

@ -1 +0,0 @@
SUBDIRS = classes

67
src/external/libPhotoMeissner/classes/Makefile.am vendored
View File

@ -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

1
src/external/libSpinValve/Makefile.am vendored
View File

@ -1 +0,0 @@
SUBDIRS = classes

67
src/external/libSpinValve/classes/Makefile.am vendored
View File

@ -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

59
src/external/libZFRelaxation/Makefile.am vendored
View File

@ -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

2
src/external/mud/Makefile.am vendored
View File

@ -1,2 +0,0 @@
SUBDIRS = src

27
src/external/mud/src/Makefile.am vendored
View File

@ -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

25
src/external/nexus/Makefile.am vendored
View File

@ -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

58
src/include/PTheory.h
View File

@ -240,7 +240,7 @@ class PTheory
virtual ~PTheory(); virtual ~PTheory();
virtual Bool_t IsValid(); 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: private:
virtual void CleanUp(PTheory *theo); 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 Constant(const PDoubleVector& paramValues, const PDoubleVector& funcValues) const;
virtual Double_t Asymmetry(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 SimpleExp(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 GeneralExp(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 SimpleGauss(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 StaticGaussKT(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 StaticGaussKTLF(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 DynamicGaussKTLF(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 StaticLorentzKT(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 StaticLorentzKTLF(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 DynamicLorentzKTLF(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 CombiLGKT(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 StrKT(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 SpinGlass(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 RandomAnisotropicHyperfine(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 Abragam(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 TFCos(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 InternalField(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 InternalFieldGK(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 InternalFieldLL(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 Bessel(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 InternalBessel(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 SkewedGauss(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 StaticNKZF(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 StaticNKTF(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 DynamicNKZF(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 DynamicNKTF(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 MuMinusExpTF(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 Polynom(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 UserFcn(Double_t t, const PDoubleVector& paramValues, const PDoubleVector& funcValues) const;
virtual void CalculateGaussLFIntegral(const Double_t *val) const; virtual void CalculateGaussLFIntegral(const Double_t *val) const;
virtual void CalculateLorentzLFIntegral(const Double_t *val) const; virtual void CalculateLorentzLFIntegral(const Double_t *val) const;

5
src/musredit/Makefile.am
View File

@ -1,5 +0,0 @@
## Process this file with automake to create Makefile.in
CLEANFILES = *~ core moc_* ui_*

4
src/musredit_qt5/Makefile.am
View File

@ -1,4 +0,0 @@
## Process this file with automake to create Makefile.in
CLEANFILES = *~ core moc_* ui_*

73
src/musredit_qt5/musredit/PTextEdit.cpp
View File

@ -1061,9 +1061,9 @@ void PTextEdit::fileOpen()
tr( "msr-Files (*.msr);;msr-Files (*.msr *.mlog);;All Files (*)" )); tr( "msr-Files (*.msr);;msr-Files (*.msr *.mlog);;All Files (*)" ));
QStringList::Iterator it = flns.begin(); QStringList::Iterator it = flns.begin();
QFileInfo finfo1, finfo2; QFileInfo finfo1;
QString tabFln;
bool alreadyOpen = false; bool alreadyOpen = false;
int idx;
// if flns are present, keep the corresponding directory // if flns are present, keep the corresponding directory
if (flns.size() > 0) { if (flns.size() > 0) {
@ -1074,20 +1074,14 @@ void PTextEdit::fileOpen()
while( it != flns.end() ) { while( it != flns.end() ) {
// check if the file is not already open // check if the file is not already open
finfo1.setFile(*it); finfo1.setFile(*it);
for (int i=0; i<fTabWidget->count(); i++) { alreadyOpen = fileAlreadyOpen(finfo1, idx);
tabFln = *fFilenames.find( dynamic_cast<PSubTextEdit*>(fTabWidget->widget(i)));
finfo2.setFile(tabFln);
if (finfo1.absoluteFilePath() == finfo2.absoluteFilePath()) {
alreadyOpen = true;
fTabWidget->setCurrentIndex(i);
break;
}
}
if (!alreadyOpen) if (!alreadyOpen) {
load(*it); load(*it);
else } else {
fTabWidget->setCurrentIndex(idx);
fileReload(); fileReload();
}
++it; ++it;
} }
@ -1368,8 +1362,13 @@ void PTextEdit::filePrint()
*/ */
void PTextEdit::fileClose(const bool check) 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 // check if the has modification
int idx = fTabWidget->currentIndex(); int idx = fTabWidget->currentIndex();
if ((fTabWidget->tabText(idx).indexOf("*")>0) && check) { if ((fTabWidget->tabText(idx).indexOf("*")>0) && check) {
int result = QMessageBox::warning(this, "**WARNING**", int result = QMessageBox::warning(this, "**WARNING**",
"Do you really want to close this file.\nChanges will be lost", "Do you really want to close this file.\nChanges will be lost",
@ -2053,7 +2052,6 @@ void PTextEdit::musrMsr2Data()
} }
if (dlg->exec() == QDialog::Accepted) { if (dlg->exec() == QDialog::Accepted) {
QString first, last;
QString runList; QString runList;
QString runListFileName; QString runListFileName;
QFileInfo fi; QFileInfo fi;
@ -2246,6 +2244,9 @@ void PTextEdit::musrMsr2Data()
QString fln; QString fln;
QFile *file; QFile *file;
QTextStream *stream; QTextStream *stream;
QFileInfo finfo;
bool alreadOpen=false;
int idx=0;
if (!fMsr2DataParam->global) { // standard fits if (!fMsr2DataParam->global) { // standard fits
switch(dlg->getRunTag()) { switch(dlg->getRunTag()) {
@ -2264,7 +2265,14 @@ void PTextEdit::musrMsr2Data()
if (fTabWidget->count() != 0) { if (fTabWidget->count() != 0) {
workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(); 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; break;
case 1: // run list file case 1: // run list file
@ -2290,7 +2298,14 @@ void PTextEdit::musrMsr2Data()
if (fTabWidget->count() != 0) { if (fTabWidget->count() != 0) {
workDir = QFileInfo(*fFilenames.find( currentEditor() )).absolutePath(); 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; 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; i<fTabWidget->count(); i++) {
tabFln = *fFilenames.find( dynamic_cast<PSubTextEdit*>(fTabWidget->widget(i)));
finfo2.setFile(tabFln);
if (finfo.absoluteFilePath() == finfo2.absoluteFilePath()) {
result = true;
idx = i;
break;
}
}
return result;
}
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
// END // END
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------

2
src/musredit_qt5/musredit/PTextEdit.h
View File

@ -38,6 +38,7 @@
#include <QString> #include <QString>
#include <QVector> #include <QVector>
#include <QProcess> #include <QProcess>
#include <QFileInfo>
#include <QtDebug> #include <QtDebug>
@ -186,6 +187,7 @@ private:
void getTheme(); void getTheme();
void fillRecentFiles(); void fillRecentFiles();
QStringList getRunList(QString runListStr, bool &ok); QStringList getRunList(QString runListStr, bool &ok);
bool fileAlreadyOpen(QFileInfo &finfo, int &idx);
}; };

5
src/musrgui/Makefile.am
View File

@ -1,5 +0,0 @@
## Process this file with automake to create Makefile.in
CLEANFILES = *~ core