update of the documentation.

2024-04-23 10:50:11 +02:00
parent 92b1aac7a6
commit 4a6885f55b
27 changed files with 171 additions and 498 deletions
--- a/doc/html/setup-standard.html
+++ b/doc/html/setup-standard.html
@ -8,7 +8,7 @@
  
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
  
-  <title>Setting up musrfit on Different Platforms &mdash; musrfit 1.9.1 documentation</title>
+  <title>Setting up musrfit on Different Platforms &mdash; musrfit 1.9.3 documentation</title>
  

  
@ -30,7 +30,9 @@
    <link rel="index" title="Index" href="genindex.html" />
    <link rel="search" title="Search" href="search.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" />
+    <link href="_static/style.css" rel="stylesheet" type="text/css">
+

  
  <script src="_static/js/modernizr.min.js"></script>
@ -404,7 +406,7 @@ $ <span class="c1"># now ROOT is ready to be configured. Below you will find the
 $ <span class="c1"># since we are using cmake build now, first we will need to create the build directory.</span>
 $ mkdir root_build
 $ <span class="nb">cd</span> root_build
-$ cmake ../ -Dgminimal<span class="o">=</span>ON -Dasimage<span class="o">=</span>ON -Dmathmore<span class="o">=</span>On -Dminuit2<span class="o">=</span>ON -Dxml<span class="o">=</span>ON -DCMAKE_INSTALL_PREFIX<span class="o">=</span>../root_exec
+$ cmake ../ -Dgminimal<span class="o">=</span><span class="m">1</span> -Dasimage<span class="o">=</span><span class="m">1</span> -Dmathmore<span class="o">=</span><span class="m">1</span> -Dxml<span class="o">=</span><span class="m">1</span> -DCMAKE_INSTALL_PREFIX<span class="o">=</span>../root_exec
 $ <span class="c1"># next will be the make called via cmake. If running on a multicore CPU you can speed up tremendously by</span>
 $ <span class="c1"># calling it with the option -j &lt;number&gt;, where &lt;number&gt; is the number of threads which you want to give,</span>
 $ <span class="c1"># e.g. cmake --build ./ --clean-first -- -j8</span>
@ -583,8 +585,8 @@ directories like <code class="docutils literal notranslate"><span class="pre">..
 <h2>Mac OS X / macOS<a class="headerlink" href="#mac-os-x-macos" title="Permalink to this headline">¶</a></h2>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
-<p class="last">macOS 13 alias <strong>Ventura</strong>: <code class="docutils literal notranslate"><span class="pre">musrfit</span></code> is ready for <strong>Ventura</strong> on Intel <strong>and</strong> M1 (Apple Silicon) based macs, both running natively.
-The <code class="docutils literal notranslate"><span class="pre">DKS</span></code> version of <code class="docutils literal notranslate"><span class="pre">musrfit</span></code> for macOS <strong>Ventura</strong> is ready as well.</p>
+<p class="last">macOS 14 alias <strong>Sonoma</strong>: <code class="docutils literal notranslate"><span class="pre">musrfit</span></code> is ready for <strong>Sonoma</strong> on Intel <strong>and</strong> Apple Silicon based macs, both running natively.
+The <code class="docutils literal notranslate"><span class="pre">DKS</span></code> version of <code class="docutils literal notranslate"><span class="pre">musrfit</span></code> for macOS <strong>Sonoma</strong> is ready as well.</p>
 </div>
 <div class="admonition note">
 <p class="first admonition-title">Note</p>
@ -655,10 +657,10 @@ add a new line pointing to your local copy, <em>e.g.</em></p>
 </ol>
 <p>Then the MacPorts system should be set up and can be used to install additional software.</p>
 <p>The installation of the software mentioned above is then done in the terminal:</p>
-<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ sudo port -v install pkgconfig autoconf automake libtool cmake fftw-3 fftw-3-single gsl boost libxml2 qt5 qt5-qtsvg
+<div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ sudo port -v install pkgconfig autoconf automake libtool cmake fftw-3 fftw-3-single gsl boost libxml2 qt6 qt6-qtsvg
 </pre></div>
 </div>
-<p>With <code class="docutils literal notranslate"><span class="pre">Qt5</span></code>, <code class="docutils literal notranslate"><span class="pre">musredit</span></code> will be installed. If it happens that you used <code class="docutils literal notranslate"><span class="pre">musrgui</span></code> in the past,
+<p>With <code class="docutils literal notranslate"><span class="pre">Qt6</span></code>, <code class="docutils literal notranslate"><span class="pre">musredit</span></code> will be installed. If it happens that you used <code class="docutils literal notranslate"><span class="pre">musrgui</span></code> in the past,
 please change over to <code class="docutils literal notranslate"><span class="pre">musredit</span></code> since there will be no further development for <code class="docutils literal notranslate"><span class="pre">musrgui</span></code> anymore!</p>
 <div class="section" id="index-22">
 <span id="id6"></span><h4>Installation of NeXus requirements (optional)<a class="headerlink" href="#index-22" title="Permalink to this headline">¶</a></h4>
@ -720,7 +722,7 @@ $ <span class="c1"># now ROOT is ready to be configured. Below you will find the
 $ <span class="c1"># We will use the cmake out-of-source approach here.</span>
 $ mkdir root_build
 $ <span class="nb">cd</span> root_build
-$ cmake ../ -Dgminimal<span class="o">=</span><span class="m">1</span> -Dasimage<span class="o">=</span><span class="m">1</span> -Dmathmore<span class="o">=</span><span class="m">1</span> -Dminuit2<span class="o">=</span><span class="m">1</span> -Dxml<span class="o">=</span><span class="m">1</span> -Dopengl<span class="o">=</span><span class="m">1</span> -Dbuiltin_glew<span class="o">=</span><span class="m">1</span> -DCMAKE_INSTALL_PREFIX<span class="o">=</span><span class="nv">$HOME</span>/Applications/root/root_exec
+$ cmake ../ -Dgminimal<span class="o">=</span><span class="m">1</span> -Dasimage<span class="o">=</span><span class="m">1</span> -Dmathmore<span class="o">=</span><span class="m">1</span> -Dxml<span class="o">=</span><span class="m">1</span> -Dopengl<span class="o">=</span><span class="m">1</span> -Dbuiltin_glew<span class="o">=</span><span class="m">1</span> -Ddataframe<span class="o">=</span><span class="m">1</span> -DCMAKE_INSTALL_PREFIX<span class="o">=</span><span class="nv">$HOME</span>/Applications/root/root_exec
 $ <span class="c1"># next will be the make. If running on a multicore CPU you can speed up tremendously by calling</span>
 $ <span class="c1"># make with the option -j &lt;number&gt;, where &lt;number&gt; is the number of threads which you want to give,</span>
 $ <span class="c1"># e.g. make -j8</span>
@ -756,11 +758,11 @@ into the file <code class="docutils literal notranslate"><span class="pre">~/.Ma
 </pre></div>
 </div>
 <p><strong>For Mac OS X ≥ 10.8:</strong></p>
-<p>One needs to add some system variables in <code class="docutils literal notranslate"><span class="pre">~/.profile</span></code>:</p>
+<p>One needs to add some system variables in <code class="docutils literal notranslate"><span class="pre">~/.zprofile</span></code>:</p>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nb">export</span> <span class="nv">ROOTSYS</span><span class="o">=</span><span class="nv">$HOME</span>/Applications/root/root_exec
 <span class="nb">export</span> <span class="nv">MUSRFITPATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/bin
 <span class="nb">export</span> <span class="nv">PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/bin:<span class="nv">$QTDIR</span>/bin:<span class="nv">$PATH</span>
-<span class="nb">export</span> <span class="nv">DYLD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/lib:<span class="nv">$DYLD_LIBRARY_PATH</span>
+<span class="nb">export</span> <span class="nv">DYLD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/lib:/usr/local/lib:<span class="nv">$DYLD_LIBRARY_PATH</span>

 launchctl setenv ROOTSYS <span class="nv">$ROOTSYS</span>
 launchctl setenv MUSRFITPATH <span class="nv">$MUSRFITPATH</span>
@ -768,7 +770,7 @@ launchctl setenv PATH <span class="nv">$PATH</span>
 launchctl setenv DYLD_LIBRARY_PATH <span class="nv">$DYLD_LIBRARY_PATH</span>
 </pre></div>
 </div>
-<p>After this you will need to “execute” <code class="docutils literal notranslate"><span class="pre">.profile</span></code> or <code class="docutils literal notranslate"><span class="pre">.zprofile</span></code> before proceeding:</p>
+<p>After this you will need to “execute” <code class="docutils literal notranslate"><span class="pre">.zprofile</span></code> or <code class="docutils literal notranslate"><span class="pre">.profile</span></code> before proceeding:</p>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span>$ <span class="nb">source</span> <span class="nv">$HOME</span>/.profile
 </pre></div>
 </div>
@ -872,7 +874,7 @@ $ <span class="c1"># now ROOT is ready to be configured. Below you will find the
 $ <span class="c1"># We will use the cmake out-of-source approach here.</span>
 $ mkdir root_build
 $ <span class="nb">cd</span> root_build
-$ cmake ../ -Dgminimal<span class="o">=</span><span class="m">1</span> -Dasimage<span class="o">=</span><span class="m">1</span> -Dmathmore<span class="o">=</span><span class="m">1</span> -Dminuit2<span class="o">=</span><span class="m">1</span> -Dxml<span class="o">=</span><span class="m">1</span> -Dopengl<span class="o">=</span><span class="m">1</span> -Dbuiltin_glew<span class="o">=</span><span class="m">1</span> -DCMAKE_INSTALL_PREFIX<span class="o">=</span><span class="nv">$HOME</span>/Applications/root/root_exec
+$ cmake ../ -Dgminimal<span class="o">=</span><span class="m">1</span> -Dasimage<span class="o">=</span><span class="m">1</span> -Dmathmore<span class="o">=</span><span class="m">1</span> -Dxml<span class="o">=</span><span class="m">1</span> -Dopengl<span class="o">=</span><span class="m">1</span> -Dbuiltin_glew<span class="o">=</span><span class="m">1</span> -Ddataframe<span class="o">=</span><span class="m">1</span> -DCMAKE_INSTALL_PREFIX<span class="o">=</span><span class="nv">$HOME</span>/Applications/root/root_exec
 $ <span class="c1"># next will be the make. If running on a multicore CPU you can speed up tremendously by calling</span>
 $ <span class="c1"># make with the option -j &lt;number&gt;, where &lt;number&gt; is the number of threads which you want to give,</span>
 $ <span class="c1"># e.g. make -j8</span>
@ -908,12 +910,12 @@ into the file <code class="docutils literal notranslate"><span class="pre">~/.Ma
 </pre></div>
 </div>
 <p><strong>For Mac OS X ≥ 10.8:</strong></p>
-<p>One needs to add some system variables in <code class="docutils literal notranslate"><span class="pre">~/.profile</span></code>:</p>
+<p>One needs to add some system variables in <code class="docutils literal notranslate"><span class="pre">~/.zprofile</span></code>:</p>
 <p>If <code class="docutils literal notranslate"><span class="pre">ROOT</span></code> has been installed via Homebrew:</p>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nb">export</span> <span class="nv">ROOTSYS</span><span class="o">=</span>/usr/local
 <span class="nb">export</span> <span class="nv">MUSRFITPATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/bin
 <span class="nb">export</span> <span class="nv">PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/bin:<span class="nv">$QTDIR</span>/bin:<span class="nv">$PATH</span>
-<span class="nb">export</span> <span class="nv">DYLD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/lib/root:<span class="nv">$DYLD_LIBRARY_PATH</span>
+<span class="nb">export</span> <span class="nv">DYLD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/lib/root:/usr/local/lib:<span class="nv">$DYLD_LIBRARY_PATH</span>

 launchctl setenv ROOTSYS <span class="nv">$ROOTSYS</span>
 launchctl setenv MUSRFITPATH <span class="nv">$MUSRFITPATH</span>
@ -925,7 +927,7 @@ launchctl setenv DYLD_LIBRARY_PATH <span class="nv">$DYLD_LIBRARY_PATH</span>
 <div class="highlight-bash notranslate"><div class="highlight"><pre><span></span><span class="nb">export</span> <span class="nv">ROOTSYS</span><span class="o">=</span><span class="nv">$HOME</span>/Applications/root/root_exec
 <span class="nb">export</span> <span class="nv">MUSRFITPATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/bin
 <span class="nb">export</span> <span class="nv">PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/bin:<span class="nv">$QTDIR</span>/bin:<span class="nv">$PATH</span>
-<span class="nb">export</span> <span class="nv">LD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/lib:<span class="nv">$LD_LIBRARY_PATH</span>
+<span class="nb">export</span> <span class="nv">LD_LIBRARY_PATH</span><span class="o">=</span><span class="nv">$ROOTSYS</span>/lib:/usr/local/lib:<span class="nv">$LD_LIBRARY_PATH</span>

 launchctl setenv ROOTSYS <span class="nv">$ROOTSYS</span>
 launchctl setenv MUSRFITPATH <span class="nv">$MUSRFITPATH</span>
@ -1093,7 +1095,7 @@ $ musrview test-histo-ROOT-NPP.msr
  <div role="contentinfo">
    <p>
        &copy; Copyright 2023, Andreas Suter.
-      Last updated on Aug 17, 2023.
+      Last updated on Apr 23, 2024.

    </p>
  </div>
@ -1115,7 +1117,7 @@ $ musrview test-histo-ROOT-NPP.msr
    <script type="text/javascript">
        var DOCUMENTATION_OPTIONS = {
            URL_ROOT:'./',
-            VERSION:'1.9.1',
+            VERSION:'1.9.3',
            LANGUAGE:'None',
            COLLAPSE_INDEX:false,
            FILE_SUFFIX:'.html',