Merged muonspin/musrfit:root6 into master

This commit is contained in:
Zaher Salman 2020-07-28 09:33:30 +02:00
commit 7d1cb313f2
23 changed files with 94 additions and 67 deletions

View File

@ -5,7 +5,7 @@ if (CMAKE_VERSION GREATER_EQUAL 3.12)
cmake_policy(SET CMP0075 NEW) cmake_policy(SET CMP0075 NEW)
endif (CMAKE_VERSION GREATER_EQUAL 3.12) endif (CMAKE_VERSION GREATER_EQUAL 3.12)
project(musrfit VERSION 1.6.2 LANGUAGES C CXX) project(musrfit VERSION 1.6.3 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)

View File

@ -12,6 +12,12 @@ or
https://bitbucket.org/muonspin/musrfit/commits/all https://bitbucket.org/muonspin/musrfit/commits/all
Release of V1.6.3, 2020/07/27
=============================
A single asymmetry plot allows to toggle the color of the theory function line
by the key 't'.
Release of V1.6.2, 2020/06/17 Release of V1.6.2, 2020/06/17
============================= =============================

View File

@ -141,6 +141,9 @@ Additionally, some functions can be accessed using *key-shortcuts*:
reset the plotting range to the area given in the msr file ("un-zoom"). reset the plotting range to the area given in the msr file ("un-zoom").
**c** **c**
toggles between normal and cross-hair cursor. toggles between normal and cross-hair cursor.
**t**
a plot of a **single** data set allows to toggle the color of the theory function line.
.. index:: musrFT .. index:: musrFT
.. _musrFT: .. _musrFT:

View File

@ -1,6 +1,6 @@
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'), URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
VERSION: '1.6.2', VERSION: '1.6.3',
LANGUAGE: 'None', LANGUAGE: 'None',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Acknowledgements &#8212; musrfit 1.6.2 documentation</title> <title>Acknowledgements &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -100,12 +100,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>any2many - a Universal μSR-file-format converter &#8212; musrfit 1.6.2 documentation</title> <title>any2many - a Universal μSR-file-format converter &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -90,12 +90,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Bugtracking &#8212; musrfit 1.6.2 documentation</title> <title>Bugtracking &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -26,7 +26,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -81,12 +81,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>How to Cite musrfit? &#8212; musrfit 1.6.2 documentation</title> <title>How to Cite musrfit? &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -102,12 +102,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Index &#8212; musrfit 1.6.2 documentation</title> <title>Index &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -23,7 +23,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -613,12 +613,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Welcome to the musrfit documentation! &#8212; musrfit 1.6.2 documentation</title> <title>Welcome to the musrfit documentation! &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -26,7 +26,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 class="nav-item nav-item-0"><a href="#">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="#">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -168,12 +168,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 class="nav-item nav-item-0"><a href="#">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="#">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>msr2data - A Program for Automatically Processing Multiple musrfit msr Files &#8212; musrfit 1.6.2 documentation</title> <title>msr2data - A Program for Automatically Processing Multiple musrfit msr Files &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -418,12 +418,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>mupp - μSR Parameter Plotter &#8212; musrfit 1.6.2 documentation</title> <title>mupp - μSR Parameter Plotter &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -298,12 +298,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>MusrRoot - an Extensible Open File Format for μSR &#8212; musrfit 1.6.2 documentation</title> <title>MusrRoot - an Extensible Open File Format for μSR &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -910,12 +910,12 @@ the entry has been added. The last token, <code class="docutils literal notransl
<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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>musredit: the GUI Based Interface to musrfit &#8212; musrfit 1.6.2 documentation</title> <title>musredit: the GUI Based Interface to musrfit &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,7 @@
<li class="right" > <li class="right" >
<a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPUs" <a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPUs"
accesskey="P">previous</a> |</li> accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -531,12 +531,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 GPUs" <a href="setup-dks.html" title="Setting up musrfit / DKS: High Speed Fitting with GPUs"
>previous</a> |</li> >previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Search &#8212; musrfit 1.6.2 documentation</title> <title>Search &#8212; musrfit 1.6.3 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" />
@ -27,7 +27,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -75,12 +75,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

File diff suppressed because one or more lines are too long

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Setting up musrfit / DKS: High Speed Fitting with GPUs &#8212; musrfit 1.6.2 documentation</title> <title>Setting up musrfit / DKS: High Speed Fitting with GPUs &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -309,12 +309,12 @@ The only thing you need <code class="docutils literal notranslate"><span class="
<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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Setting up musrfit on Different Platforms &#8212; musrfit 1.6.2 documentation</title> <title>Setting up musrfit on Different Platforms &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -1293,12 +1293,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Tutorial for musrfit &#8212; musrfit 1.6.2 documentation</title> <title>Tutorial for musrfit &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -431,12 +431,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Documentation of user libs (user functions) &#8212; musrfit 1.6.2 documentation</title> <title>Documentation of user libs (user functions) &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -647,12 +647,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -4,7 +4,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"> <html xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>User manual &#8212; musrfit 1.6.2 documentation</title> <title>User manual &#8212; musrfit 1.6.3 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" />
<script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script> <script type="text/javascript" id="documentation_options" data-url_root="./" src="_static/documentation_options.js"></script>
@ -30,7 +30,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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
@ -148,6 +148,8 @@ Supported values for <code class="docutils literal notranslate"><span class="pre
</dd> </dd>
<dt><strong>c</strong></dt><dd><p>toggles between normal and cross-hair cursor.</p> <dt><strong>c</strong></dt><dd><p>toggles between normal and cross-hair cursor.</p>
</dd> </dd>
<dt><strong>t</strong></dt><dd><p>a plot of a <strong>single</strong> data set allows to toggle the color of the theory function line.</p>
</dd>
</dl> </dl>
</div> </div>
</div> </div>
@ -2465,12 +2467,12 @@ In case this cannot be ensured, the parallelization can be disabled by <em>di
<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 class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> &#187;</li> <li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.3 documentation</a> &#187;</li>
</ul> </ul>
</div> </div>
<div class="footer" role="contentinfo"> <div class="footer" role="contentinfo">
&#169; Copyright 2020, Andreas Suter. &#169; Copyright 2020, Andreas Suter.
Last updated on Jun 17, 2020. Last updated on Jul 27, 2020.
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2. Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
</div> </div>
</body> </body>

View File

@ -125,6 +125,7 @@ PMusrCanvas::PMusrCanvas()
fValid = false; fValid = false;
fAveragedView = false; fAveragedView = false;
fDifferenceView = false; fDifferenceView = false;
fToggleColor = false;
fCurrentPlotView = PV_DATA; fCurrentPlotView = PV_DATA;
fPreviousPlotView = PV_DATA; fPreviousPlotView = PV_DATA;
fPlotType = -1; fPlotType = -1;
@ -1182,6 +1183,19 @@ void PMusrCanvas::HandleCmdKey(Int_t event, Int_t x, Int_t y, TObject *selected)
fDataTheoryPad->SetCrosshair(0); fDataTheoryPad->SetCrosshair(0);
} }
fMainCanvas->Update(); fMainCanvas->Update();
} else if (x == 't') { // toggle theory color
if (fData.size() == 1) { // only do something if there is a single data set
fToggleColor = !fToggleColor;
if (fToggleColor) {
fData[0].theory->SetLineColor(kRed);
fData[0].theory->SetLineWidth(2);
} else {
fData[0].theory->SetLineColor(fColorList[0]);
fData[0].theory->SetLineWidth(1);
}
fDataTheoryPad->Modified();
fMainCanvas->Update();
}
} else { } else {
fMainCanvas->Update(); fMainCanvas->Update();
} }
@ -2384,6 +2398,7 @@ void PMusrCanvas::InitMusrCanvas(const Char_t* title, Int_t wtopx, Int_t wtopy,
fValid = false; fValid = false;
fAveragedView = false; fAveragedView = false;
fDifferenceView = false; fDifferenceView = false;
fToggleColor = false;
fCurrentPlotView = PV_DATA; fCurrentPlotView = PV_DATA;
fPreviousPlotView = PV_DATA; fPreviousPlotView = PV_DATA;
fPlotType = -1; fPlotType = -1;

View File

@ -244,6 +244,7 @@ class PMusrCanvas : public TObject, public TQObject
Bool_t fValid; ///< if true, everything looks OK Bool_t fValid; ///< if true, everything looks OK
Bool_t fAveragedView; ///< tag showing that the averaged view or normal view should be presented. Bool_t fAveragedView; ///< tag showing that the averaged view or normal view should be presented.
Bool_t fDifferenceView; ///< tag showing that the shown data, fourier, are the difference between data and theory Bool_t fDifferenceView; ///< tag showing that the shown data, fourier, are the difference between data and theory
Bool_t fToggleColor; ///< tag showing if a single histo theory is color toggled
Int_t fCurrentPlotView; ///< tag showing what the current plot view is: data, fourier, ... Int_t fCurrentPlotView; ///< tag showing what the current plot view is: data, fourier, ...
Int_t fPreviousPlotView; ///< tag showing the previous plot view Int_t fPreviousPlotView; ///< tag showing the previous plot view
Int_t fPlotType; ///< plot type tag: -1 == undefined, MSR_PLOT_SINGLE_HISTO == single histogram, MSR_PLOT_ASYM == asymmetry, MSR_PLOT_BNMR == beta-NMR asymmetry, MSR_PLOT_MU_MINUS == mu minus (not yet implemented), MSR_PLOT_NON_MUSR == non-muSR Int_t fPlotType; ///< plot type tag: -1 == undefined, MSR_PLOT_SINGLE_HISTO == single histogram, MSR_PLOT_ASYM == asymmetry, MSR_PLOT_BNMR == beta-NMR asymmetry, MSR_PLOT_MU_MINUS == mu minus (not yet implemented), MSR_PLOT_NON_MUSR == non-muSR