diff --git a/ChangeLog b/ChangeLog index 0a0fef6d..e4e38f6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -60,6 +60,7 @@ FIXED 2012-09-23 fixed wrong chisq output in musrview if expected chisq is present. FIXED 2012-05-30 fixed RRF bug in single histo plotting. FIXED 2012-05-18 fixed wrong forward/backward tag for ROOT-PPC (MUSR-215) +CHANGED 2014-10-25 updated docu, since git is now available for ALL users CHANGED 2014-02-12 since we moved to git, I cleaned up the svn prop's from the sources. CHANGED 2013-12-20 upgrade of cuba to version 3.2. Merge in from BMW diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index ffbae1c8..3d22cd59 100644 --- a/doc/html/user/MUSR/BmwLibs.html +++ b/doc/html/user/MUSR/BmwLibs.html @@ -1,6 +1,6 @@ - +
@@ -8,7 +8,7 @@ - + @@ -144,7 +144,7 @@ pre {ROOT system and the NeXus library—should be available from the distributor and could be easily installed in the form of binary packages. If done in this way there should be taken care of installing both, the libraries and the header (dev, devel) files.-yum install boost boost-devel gsl gsl-devel fftw3 fftw3-devel libxml2 libxml2-devel qt qt-devel +yum install git boost-devel gsl-devel fftw-devel libxml2-devel qt-devel qtwebkit-develWhen dealing with a distribution that uses the dpkg/apt package manager like Debian or Ubuntu the installation would look like:
-apt-get install libboost-dev gsl-bin libgsl0-dev fftw3 fftw3-dev libxml2 libxml2-dev libqt3-mt libqt3-mt-dev qt3-dev-tools +apt-get install git libboost-dev libgsl0-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-devEveryone should know best himself which is the way to install distribution software on the chosen distribution
@@ -221,11 +221,13 @@ In order to obtain some information about the possible options for the installat
For any further information on the standard installation of software, please refer to the web search engine of choice and ask for "install software on linux"...
NeXus requirements (optional) musrfit should support reading data files in the NeXus format the further required software has to be set up. The required libraries and header files could either be available through the user's GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on Red Hat-like systems binary packages for MXML, HDF4, and HDF5 might be called mxml, mxml-devel, hdf, hdf-devel, hdf5, hdf5-devel, on Debian-like systems libmxml1, libmxml-dev, libhdf4-0, libhdf4-dev, libhdf5-serial-1.8.4, libhdf5-serial-dev.
+Only if musrfit should support reading data files in the NeXus format the further required software has to be set up. The required libraries and header files could either be available through the user's GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on Red Hat-like systems binary packages for MXML, HDF4, and HDF5 might be called mxml, mxml-devel, hdf, hdf-devel, hdf5, hdf5-devel, on Debian-like systems libmxml1, libmxml-dev, libhdf4-dev, libhdf5-dev.
Even though there might exist binary packages for the NeXus library, it is best to build and install it directly from the source code which can be found here.
ROOT ROOT system may or may not be part of the GNU/Linux distribution. If it is, it should be checked that the provided binaries are of a recent version and then these in principle can be installed using a package manager as described above. ROOT web page and download the packed precompiled binary version matching best the GNU/Linux distribution. Then unpack the bundle to its final destination.
@@ -250,24 +252,28 @@ export PATH=$ROOTSYS/bin:$PATH
musrfit musrfit installation. First, the most recent source code should be downloaded. The preferred way of doing so is to check out directly the subversion repository (if clients of subversion and ssh are installed). Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal
+When all required software has been set up it can be proceeded with the musrfit installation. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal
cd -svn co svn+ssh://svn@savannah.psi.ch/repos/nemu/lem/trunk/analysis/musrfit musrfit +git clone https://bitbucket.org/muonspin/musrfit.git-When asked (twice) for a password, type "svn". -If the repository had been checked out already before, one can update the local copy using: +or
cd -svn up musrfit +git clone git://gitorious.psi.ch/nemu/musrfit.git-As an alternative (if subversion is not available), the source code can also be downloaded and extracted from a tarball. +Note: musrfit has moved from svn to git. In case you still have an old svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link: +Git for Subversion Users - A Cheat Sheet. + +If a local repository clone is already present, one can update it using:
-cd -curl https://savannah01.psi.ch/viewvc/nemu_lem/trunk/analysis/musrfit/?view=tar -k -G | tar xz +cd musrfit +git pull+As an alternative (if git is not available), the source code can also be downloaded from the following web-page: musrfit at bitbucket. + 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:
NeXus requirements (optional) musrfit should support reading data files in the NeXus format the further required software has to be set up. Under Cygwin of all the required libraries only HDF5 is available. The packages hdf5 and libhdf5-devel can be installed through the Cygwin setup. One should also make sure that bison, flex and a package containing sunrpc = 4.0-3, but not sunrpc = 4.0-4) are installed.
-All other libraries have to be built from the sources. The following lines will track the installation of JPEG 6b, MXML 2.8, HDF 4.2.7-patch1, and NeXus 4.2.1. The version numbers and source-code locations might of course change with time but should be easily adjustable.
+All other libraries have to be built from the sources. The following lines will track the installation of JPEG 6b, MXML 2.9, HDF 4.2.7-patch1, and NeXus 4.3.2. The version numbers and source-code locations might of course change with time but should be easily adjustable.
cd mkdir nexus @@ -379,8 +385,8 @@ cd jpeg-6b make make install cd .. -curl www.msweet.org/files/project3/mxml-2.8.tar.gz -G | tar xz -cd mxml-2.8 +curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz +cd mxml-2.9 ./configure --prefix=/usr/local --enable-static make make install @@ -391,8 +397,8 @@ cd hdf-4.2.7-patch1 make make install cd .. -curl http://download.nexusformat.org/kits/nexus-4.2.1.tar.gz -G | tar xz -cd nexus-4.2.1 +curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz +cd nexus-4.3.2-20140413svn1919 ./configure --prefix=/usr/local --with-hdf4=/usr/local --with-hdf5=/usr --with-xml=/usr/local make make install @@ -425,24 +431,28 @@ export MUSRFITPATH=$ROOTSYS/bin Afterwards close the Cygwin shell and reopen it again for the installation ofmusrfit.4.2
-First, the most recent source code should be downloaded. The preferred way of doing so is to check out directly the subversion repository (if clients of subversion and ssh are installed). Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal +First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminalmusrfitcd -svn co svn+ssh://svn@savannah.psi.ch/repos/nemu/lem/trunk/analysis/musrfit musrfit +git clone https://bitbucket.org/muonspin/musrfit.git-When asked (twice) for a password, type "svn". -If the repository had been checked out already before, one can update the local copy using: +orcd -svn up musrfit +git clone git://gitorious.psi.ch/nemu/musrfit.git-As an alternative (if subversion is not available), the source code can also be downloaded and extracted from a tarball. +Note: musrfit has moved from svn to git. In case you still have an old svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link: +Git for Subversion Users - A Cheat Sheet. + +If the repository had been checked out already before, one can update the local copy using:-cd -curl https://savannah01.psi.ch/viewvc/nemu_lem/trunk/analysis/musrfit/?view=tar -k -G | tar xz +cd musrfit +git pull+As an alternative (if git is not available), the source code can also be downloaded from the following web-page: musrfit at bitbucket. + 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. Ifmusrfitshould supportNeXusdata 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:
qt4-mac, musredit will be installed. If it
Only if musrfit should support reading data files in the NeXus format the further required packages are set up:
-sudo port -v install jpeg6b hdf4 hdf5-18 +sudo port -v install jpeg6b hdf4 hdf5-Unfortunately, the
minixml and NeXus libraries have to be compiled and installed directly from the source code. Given the respective version numbers of 2.8 and 4.2.1 (which are subject to change with time) this can be achieved for example by:
+Unfortunately, the minixml and NeXus libraries have to be compiled and installed directly from the source code. Given the respective version numbers of 2.9 and 4.3.2 (which are subject to change with time) this can be achieved for example by:
cd -curl www.msweet.org/files/project3/mxml-2.8.tar.gz -G | tar xz -cd mxml-2.8 +curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz +cd mxml-2.9 ./configure --prefix=/usr/local make sudo make install cd .. -curl http://download.nexusformat.org/kits/nexus-4.2.1.tar.gz -G | tar xz -cd nexus-4.2.1 +curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz +cd nexus-4.3.2-20140413svn1919 ./configure --prefix=/usr/local make sudo make install @@ -658,17 +668,17 @@ where x_yy_z has to be substituted by the correct version numbelibjpeg hdf hdf5-18 hdf5-18-shlibs-Unfortunately, theminixmlandNeXuslibraries have to be compiled and installed directly from the source code. Given the respective version numbers of 2.8 and 4.2.1 (which are subject to change with time) this can be achieved for example by: +Unfortunately, theminixmlandNeXuslibraries have to be compiled and installed directly from the source code. Given the respective version numbers of 2.9 and 4.3.2 (which are subject to change with time) this can be achieved for example by:cd -curl www.msweet.org/files/project3/mxml-2.8.tar.gz -G | tar xz -cd mxml-2.8 +curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz +cd mxml-2.9 ./configure --prefix=/usr/local make sudo make install cd .. -curl http://download.nexusformat.org/kits/nexus-4.2.1.tar.gz -G | tar xz -cd nexus-4.2.1 +curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz +cd nexus-4.3.2-20140413svn1919 ./configure --prefix=/usr/local make sudo make install @@ -712,24 +722,30 @@ export PATH=$ROOTSYS/bin:$QTDIR/bin:$PATH5.3
-First, the most recent source code should be downloaded. The preferred way of doing so is to check out directly the subversion repository (if clients of subversion and ssh are installed). Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal +First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal +musrfitcd -svn co svn+ssh://svn@savannah.psi.ch/repos/nemu/lem/trunk/analysis/musrfit musrfit +git clone https://bitbucket.org/muonspin/musrfit.git-When asked (twice) for a password, type "svn". -If the repository had been checked out already before, one can update the local copy using: +orcd -svn up musrfit +git clone git://gitorious.psi.ch/nemu/musrfit.git-As an alternative (if subversion is not available), the source code can also be downloaded and extracted from a tarball. + +Note: musrfit has moved from svn to git. In case you still have an old svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link: +Git for Subversion Users - A Cheat Sheet. + +If a local repository clone is already present, one can update it using:-cd -curl https://savannah01.psi.ch/viewvc/nemu_lem/trunk/analysis/musrfit/?view=tar -k -G | tar xz +cd musrfit +git pull+As an alternative (if git is not available), the source code can also be downloaded from the following web-page: musrfit at bitbucket. + 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. Ifmusrfitshould supportNeXusdata 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: