diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index 74aa67d2..da714db6 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 {
- Edit | Attach | Print version | PDF | History: r5 < r4 < r3 < r2 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r5 < r4 < r3 < r2 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r5 - 10 Jul 2011, wojek
@@ -195,7 +195,7 @@ pre { - +

diff --git a/doc/html/user/MUSR/LibFitPofB.html b/doc/html/user/MUSR/LibFitPofB.html index 9f3bd3ed..b8f4d32e 100644 --- a/doc/html/user/MUSR/LibFitPofB.html +++ b/doc/html/user/MUSR/LibFitPofB.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -420,7 +420,7 @@ An example XML file looks as follows:
- Edit | Attach | Print version | PDF | History: r16 < r15 < r14 < r13 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r16 < r15 < r14 < r13 | Backlinks | View wiki text | Refresh | More topic actions
Topic revision: r16 - 10 Jul 2011, wojek
@@ -471,7 +471,7 @@ An example XML file looks as follows: - +

diff --git a/doc/html/user/MUSR/LibZFRelaxation.html b/doc/html/user/MUSR/LibZFRelaxation.html index 6b2ed28c..d925d3fe 100644 --- a/doc/html/user/MUSR/LibZFRelaxation.html +++ b/doc/html/user/MUSR/LibZFRelaxation.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -225,7 +225,7 @@ The parameters are:
    - Edit | Attach | Print version | PDF | History: r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions
    Topic revision: r2 - 10 Jul 2011, wojek
    @@ -276,7 +276,7 @@ The parameters are:
      - +

      diff --git a/doc/html/user/MUSR/Msr2Data.html b/doc/html/user/MUSR/Msr2Data.html index dc7fa994..56d49df2 100644 --- a/doc/html/user/MUSR/Msr2Data.html +++ b/doc/html/user/MUSR/Msr2Data.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -349,7 +349,7 @@ For reporting bugs or requesting new features and improvements please use the - @@ -422,7 +422,7 @@ For reporting bugs or requesting new features and improvements please use the - +

      diff --git a/doc/html/user/MUSR/MusrFit.html b/doc/html/user/MUSR/MusrFit.html index e302676d..ff59df34 100644 --- a/doc/html/user/MUSR/MusrFit.html +++ b/doc/html/user/MUSR/MusrFit.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -1453,7 +1453,7 @@ For reporting bugs or requesting new features and improvements please use the       - @@ -1526,7 +1526,7 @@ For reporting bugs or requesting new features and improvements please use the - +

      diff --git a/doc/html/user/MUSR/MusrFitAcknowledgements.html b/doc/html/user/MUSR/MusrFitAcknowledgements.html index 01b28778..799b1590 100644 --- a/doc/html/user/MUSR/MusrFitAcknowledgements.html +++ b/doc/html/user/MUSR/MusrFitAcknowledgements.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -142,7 +142,7 @@ pre {
      - Edit | Attach | Print version | PDF | History: r4 < r3 < r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions + Edit | Attach | Print version | PDF | History: r4 < r3 < r2 < r1 | Backlinks | View wiki text | Refresh | More topic actions
      Topic revision: r4 - 10 Jul 2011, wojek
      @@ -193,7 +193,7 @@ pre { - +

      diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html index 49866b82..6a2ee75e 100644 --- a/doc/html/user/MUSR/MusrFitSetup.html +++ b/doc/html/user/MUSR/MusrFitSetup.html @@ -1,6 +1,6 @@ - + @@ -8,7 +8,7 @@ - + @@ -368,7 +368,7 @@ where x_yy_z has to be substituted by the correct version numbe

      4.1.2 Installation of NeXus requirements (optional)

      Only if musrfit should support reading data files in the NeXus format the further required software has to be set up. Under Cygwin of all the required libraries only HDF5 is available. The packages hdf5 and libhdf5-devel can be installed through the Cygwin setup. One should also make sure that bison, flex and a package containing /usr/lib/librpc.a (e.g. 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.5, 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.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. 
       cd
 mkdir nexus
@@ -379,8 +379,8 @@ cd jpeg-6b
 make
 make install
 cd ..
-curl http://ftp.easysw.com/pub/mxml/2.5/mxml-2.5.tar.gz -G | tar xz
-cd mxml-2.5
+curl www.msweet.org/files/project3/mxml-2.8.tar.gz -G | tar xz
+cd mxml-2.8
 ./configure --prefix=/usr/local --enable-static
 make
 make install
@@ -518,7 +518,6 @@ C:\cygwin\bin\ash.exe /bin/rebaseall
 If this does not resolve the problem, try to change the compatibility settings of C:\cygwin\bin\sh.exe and C:\cygwin\bin\bash.exe so that they are executed with administrator privileges.
 
      
 
       5  Mac OS X 
      
-ALERT! Currently there is a problem with Mac OS X 10.9 (Mavericks) in conjunction with CERN/ROOT and musrfit!! Investigations to fix it are underway. ALERT!
 
      
 With Mac OS X the situation is up to some extent similar like on MS Windows but still different since Mac OS X is a UNIX system. The similarity is that also on OS X a helping framework—either MacPorts or Fink—which provides open-source software is employed to fulfill the basic software requirements of musrfit. In the following, both possibilities (using MacPorts or Fink) are described but it is emphasized here that it should be followed only one of the possible routes.
 
      
@@ -526,7 +525,7 @@ With Mac OS X the situation is up to some extent similar like on MS Windows but
 
       5.1.1  Everything but ROOT and NeXus 
      
 Before proceeding with the usage of the MacPorts system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed: 
      
 
       Xcode tools 
       Useful developer tools including for instance the GNU compiler collection. Starting from XCode >= 4.3 the command line tools need to be installed manually.
-
       
       X11 
       The X-window system (automatically installed on 10.5 Leopard and 10.6 Snow Leopard)
+
       
       X11 
       The X-window system (automatically installed on 10.5 Leopard and 10.6 Snow Leopard). For 10.7 and higher you also will need to install XQuartz 
 
       
 
      
 After installing the Xcode tools go to the MacPorts install page, download the installer for your system and follow the installation instructions on the page. By default the MacPorts system will be installed in /opt/local.
      
@@ -551,9 +550,9 @@ sudo port -v -d sync
 Then the MacPorts system should be set up and can be used to install additional software.
      
 The installation of the software mentioned above is then done in the terminal:
 
      -sudo port -v install pkgconfig autoconf automake libtool fftw-3 fftw-3-single gsl boost libxml2 qt3-mac
+sudo port -v install pkgconfig autoconf automake libtool fftw-3 fftw-3-single gsl boost libxml2 qt4-mac
 
      
-Under OS X 10.6 Snow Leopard it will not be possible to install qt3-mac since the system is by default a 64-bit system and the old qt3-mac depends on software which is only available for 32-bit systems. It is suggested to install qt4-mac instead and use musredit. (It would also be possible to install the qt3 port instead; the disadvantage is that the qt3 version does not support Apple's aqua style and a great deal of additional software has to be installed to meet its dependencies. At the moment this seems to be the only possibility to get musrgui running on OS X 10.6.)
+With qt4-mac, musredit will be installed. If it happens that you used musrgui in the past, please change over to musredit since there will be no further development for musrgui anymore!
 
      
 
       5.1.2  Installation of NeXus requirements (optional) 
      
 
      
@@ -561,11 +560,11 @@ Under OS X 10.6 Snow Leopard it will not be possible to install qt3-mac
 
       sudo port -v install jpeg6b hdf4 hdf5-18
 
      
-Unfortunately, the minixml and NeXus libraries have to be compiled and installed directly from the source code. Given the respective version numbers of 2.5 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.8 and 4.2.1 (which are subject to change with time) this can be achieved for example by:
 
       cd
-curl http://ftp.easysw.com/pub/mxml/2.5/mxml-2.5.tar.gz -G | tar xz
-cd mxml-2.5
+curl www.msweet.org/files/project3/mxml-2.8.tar.gz -G | tar xz
+cd mxml-2.8
 ./configure --prefix=/usr/local
 make
 sudo make install
@@ -584,10 +583,14 @@ For installing the ROOT system there are two independent and for Mac OS X 10.9 (Mavericks) for now (beginning 2014, subject to be changed hopefully soon): 
      +cd /opt/root-system
+./configure --gminimal --enable-builtin-freetype --enable-fink --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
+make
 
      
- 
    1.  In case you are just migrating to the latest Mac OS X version (e.g. from 10.7 to 10.8.1) often for a period of a few weeks it is necessary to work with the SVN trunk version of ROOT, i.e. that you have to checkout ROOT via svn: 
      -svn co https://root.cern.ch/svn/root/trunk root
-
       For details see ROOT: How to's.
+
      2.  
    2.  In case you are just migrating to the latest Mac OS X version (e.g. from 10.7 to 10.8.1) often for a period of a few weeks it is necessary to work with the GIT trunk version of ROOT, i.e. that you have to checkout ROOT via git: 
      +git clone http://root.cern.ch/git/root.git
+
       For details see Installing ROOT from Source.
 
      3.  
 
      
 In order to finalize the ROOT installation and to prepare already the installation of musrfit and musrgui / musredit this is a good time for setting necessary environment variables for the use in Mac OS X. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file ~/.MacOSX/environment.plist and re-login:
      
@@ -655,11 +658,11 @@ where x_yy_z has to be substituted by the correct version numbe
 
      
 libjpeg hdf hdf5-18 hdf5-18-shlibs
 
      
-Unfortunately, the minixml and NeXus libraries have to be compiled and installed directly from the source code. Given the respective version numbers of 2.5 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.8 and 4.2.1 (which are subject to change with time) this can be achieved for example by:
 
       cd
-curl http://ftp.easysw.com/pub/mxml/2.5/mxml-2.5.tar.gz -G | tar xz
-cd mxml-2.5
+curl www.msweet.org/files/project3/mxml-2.8.tar.gz -G | tar xz
+cd mxml-2.8
 ./configure --prefix=/usr/local
 make
 sudo make install
@@ -678,6 +681,10 @@ For installing the ROOT system there are some independent and for Mac OS X 10.9 (Mavericks) for now (beginning 2014, subject to be changed hopefully soon): 
      +cd /opt/root-system
+./configure --gminimal --enable-builtin-freetype --enable-fink --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
+make
 
      
  
    3.  ROOT is also available through the FinkCommander! Install root5 or root5-devel. However, this versions also have to be compiled locally since there are no binary packages. The manual installation mentioned right above should be preferred in this case.
 
      4.  
@@ -823,9 +830,9 @@ musrview test-histo-ROOT-NPP.msr
 
      
 
   
      
-	 Edit | Attach | Print version | PDF | History: r54 < r53 < r52 < r51 | Backlinks | View wiki text | Refresh | More topic actions
+	 Edit | Attach | Print version | PDF | History: r55 < r54 < r53 < r52 | Backlinks | View wiki text | Refresh | More topic actions
   
      
-
      Topic revision: r54 - 12 Nov 2013, AndreasSuter
      
+
      Topic revision: r55 - 08 Jan 2014, AndreasSuter
      
 
 
      
 
      
@@ -874,7 +881,7 @@ musrview test-histo-ROOT-NPP.msr
 
      
 
      
 
-
+
 
 
 
      
diff --git a/doc/html/user/MUSR/MusrGui.html b/doc/html/user/MUSR/MusrGui.html
index fc624bfd..47d0eaab 100644
--- a/doc/html/user/MUSR/MusrGui.html
+++ b/doc/html/user/MUSR/MusrGui.html
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -324,7 +324,7 @@ For reporting bugs or requesting new features and improvements please use the 
 
 
-
@@ -397,7 +397,7 @@ For reporting bugs or requesting new features and improvements please use the 
 
 
-
+
 
 
 
      
diff --git a/doc/html/user/MUSR/QuickStart.html b/doc/html/user/MUSR/QuickStart.html
index c7345134..4d7a6476 100644
--- a/doc/html/user/MUSR/QuickStart.html
+++ b/doc/html/user/MUSR/QuickStart.html
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -280,7 +280,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP   (name beamline institute dat
 
      
 
   
      
-	 Edit | Attach | Print version | PDF | History: r7 < r6 < r5 < r4 | Backlinks | View wiki text | Refresh | More topic actions
+	 Edit | Attach | Print version | PDF | History: r7 < r6 < r5 < r4 | Backlinks | View wiki text | Refresh | More topic actions
   
      
 
      Topic revision: r7 - 10 Jul 2011, wojek
      
 
@@ -331,7 +331,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP   (name beamline institute dat
 
 
 
-
+
 
 
 
      
diff --git a/doc/html/user/MUSR/TutorialSingleHisto.html b/doc/html/user/MUSR/TutorialSingleHisto.html
index 3d8ff698..6f8fa25c 100644
--- a/doc/html/user/MUSR/TutorialSingleHisto.html
+++ b/doc/html/user/MUSR/TutorialSingleHisto.html
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -281,7 +281,7 @@ This page only summarizes the very basic features and options of the programs co
 
 
 
-
      
+
      
 
      Attachments (6)
      
 
      
   
       
      
@@ -303,7 +303,7 @@ This page only summarizes the very basic features and options of the programs co
 
      
 
   
      
-	 Edit | Attach | Print version | PDF | History: r9 < r8 < r7 < r6 | Backlinks | View wiki text | Refresh | More topic actions
+	 Edit | Attach | Print version | PDF | History: r9 < r8 < r7 < r6 | Backlinks | View wiki text | Refresh | More topic actions
   
      
 
      Topic revision: r9 - 02 Sep 2011, wojek
      
 
      
@@ -354,7 +354,7 @@ This page only summarizes the very basic features and options of the programs co
 
      
 
 
-
+
 
 
 
      
diff --git a/doc/html/user/MUSR/WebHome.html b/doc/html/user/MUSR/WebHome.html
index 773c4030..4acba704 100644
--- a/doc/html/user/MUSR/WebHome.html
+++ b/doc/html/user/MUSR/WebHome.html
@@ -1,6 +1,6 @@
 
 
-
+
 
 
 
@@ -8,7 +8,7 @@
 
 
 
-
+
 
 
 
@@ -134,7 +134,7 @@ pre {
  
    4.  Acknowledgements
 
      5.  
 
      
---  AS & (BMW) - last update Nov 12, 2013 
+--  AS & (BMW) - last update Jan 8, 2014 
 
      
 
 
@@ -156,9 +156,9 @@ pre {
 
      
 
   
      
-	 Edit | Attach | Print version | PDF | History: r41 < r40 < r39 < r38 | Backlinks | View wiki text | Refresh | More topic actions
+	 Edit | Attach | Print version | PDF | History: r42 < r41 < r40 < r39 | Backlinks | View wiki text | Refresh | More topic actions
   
      
-
      Topic revision: r41 - 12 Nov 2013, AndreasSuter
      
+
      Topic revision: r42 - 08 Jan 2014, AndreasSuter
      
 
 
      
 
      
@@ -207,7 +207,7 @@ pre {
 
      
 
      
 
-
+