resolve merge conflict: update of the docu
This commit is contained in:
@ -5,7 +5,7 @@
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
<meta charset="utf-8" />
|
||||
<title>Index — musrfit 1.6.1 documentation</title>
|
||||
<title>Index — musrfit 1.6.2 documentation</title>
|
||||
<link rel="stylesheet" href="_static/nature.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>
|
||||
@ -23,7 +23,7 @@
|
||||
<li class="right" style="margin-right: 10px">
|
||||
<a href="#" title="General Index"
|
||||
accesskey="I">index</a></li>
|
||||
<li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.1 documentation</a> »</li>
|
||||
<li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> »</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -73,21 +73,21 @@
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="acknowledgement.html#index-0">acknowledgment</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-18">addrun</a>
|
||||
<li><a href="user-manual.html#index-19">addrun</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-35">addt0-asymmetry</a>
|
||||
<li><a href="user-manual.html#index-36">addt0-asymmetry</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-34">addt0-single-histo</a>
|
||||
<li><a href="user-manual.html#index-35">addt0-single-histo</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-20">alpha-beta</a>
|
||||
<li><a href="user-manual.html#index-21">alpha-beta</a>
|
||||
</li>
|
||||
<li><a href="any2many.html#index-0">any2many</a>, <a href="user-manual.html#index-8">[1]</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-69">asymmetry-fit</a>
|
||||
<li><a href="user-manual.html#index-70">asymmetry-fit</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-70">asymmetry-rrf-fit</a>
|
||||
<li><a href="user-manual.html#index-71">asymmetry-rrf-fit</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -95,13 +95,13 @@
|
||||
<h2 id="B">B</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-22">backgr.fit</a>
|
||||
<li><a href="user-manual.html#index-23">backgr.fit</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-27">backgr.fix</a>
|
||||
<li><a href="user-manual.html#index-28">backgr.fix</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-29">background-asymmetry</a>
|
||||
<li><a href="user-manual.html#index-30">background-asymmetry</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-28">background-single-histo</a>
|
||||
<li><a href="user-manual.html#index-29">background-single-histo</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-1">BMW-libs</a>
|
||||
</li>
|
||||
@ -109,7 +109,7 @@
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-13">BMWlibs-XML</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-72">bnmr-asymmetry-fit</a>
|
||||
<li><a href="user-manual.html#index-73">bnmr-asymmetry-fit</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-14">BNMR-libs</a>
|
||||
</li>
|
||||
@ -137,13 +137,13 @@
|
||||
<h2 id="D">D</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-31">data-asymmetry</a>
|
||||
<li><a href="user-manual.html#index-32">data-asymmetry</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-30">data-single-histo</a>
|
||||
<li><a href="user-manual.html#index-31">data-single-histo</a>
|
||||
</li>
|
||||
<li><a href="setup-dks.html#index-0">dks</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-41">dks-command-overview</a>
|
||||
<li><a href="user-manual.html#index-42">dks-command-overview</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
@ -175,33 +175,33 @@
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-30">fink</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-37">fit</a>
|
||||
<li><a href="user-manual.html#index-38">fit</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-66">fit-types</a>
|
||||
<li><a href="user-manual.html#index-67">fit-types</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-19">fittype</a>
|
||||
<li><a href="user-manual.html#index-20">fittype</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-25">forward</a>
|
||||
<li><a href="user-manual.html#index-26">forward</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-26">forward-backward</a>
|
||||
<li><a href="user-manual.html#index-27">forward-backward</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-48">fourier-block-apodization</a>
|
||||
<li><a href="user-manual.html#index-49">fourier-block-apodization</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-47">fourier-block-dc-corrected</a>
|
||||
<li><a href="user-manual.html#index-48">fourier-block-dc-corrected</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-46">fourier-block-fourier_power</a>
|
||||
<li><a href="user-manual.html#index-47">fourier-block-fourier_power</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-50">fourier-block-phase</a>
|
||||
<li><a href="user-manual.html#index-51">fourier-block-phase</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-49">fourier-block-plot</a>
|
||||
<li><a href="user-manual.html#index-50">fourier-block-plot</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-52">fourier-block-range</a>
|
||||
<li><a href="user-manual.html#index-53">fourier-block-range</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-51">fourier-block-range_for_phase_correction</a>
|
||||
<li><a href="user-manual.html#index-52">fourier-block-range_for_phase_correction</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-45">fourier-block-units</a>
|
||||
<li><a href="user-manual.html#index-46">fourier-block-units</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -255,7 +255,7 @@
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-6">libxml2</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-23">lifetime</a>
|
||||
<li><a href="user-manual.html#index-24">lifetime</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
@ -277,53 +277,55 @@
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="setup-standard.html#index-27">macports</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-24">map</a>
|
||||
<li><a href="user-manual.html#index-25">map</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-16">meta-information</a>
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-9">minixml</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-40">minuit2-command-overview</a>
|
||||
<li><a href="user-manual.html#index-41">minuit2-command-overview</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-39">msr-commands-block</a>
|
||||
<li><a href="user-manual.html#index-40">msr-commands-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-43">msr-commands-block-dks</a>
|
||||
<li><a href="user-manual.html#index-44">msr-commands-block-dks</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-11">msr-file-format</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-13">msr-fitparameter-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-44">msr-fourier-block</a>
|
||||
<li><a href="user-manual.html#index-45">msr-fourier-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-15">msr-functions-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-16">msr-global-block</a>
|
||||
<li><a href="user-manual.html#index-17">msr-global-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-53">msr-plot-block</a>
|
||||
<li><a href="user-manual.html#index-54">msr-plot-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-54">msr-plot-block-lifetimecorrection</a>
|
||||
<li><a href="user-manual.html#index-55">msr-plot-block-lifetimecorrection</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-60">msr-plot-block-logx</a>
|
||||
<li><a href="user-manual.html#index-61">msr-plot-block-logx</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-61">msr-plot-block-logy</a>
|
||||
<li><a href="user-manual.html#index-62">msr-plot-block-logy</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-56">msr-plot-block-range</a>
|
||||
<li><a href="user-manual.html#index-57">msr-plot-block-range</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-63">msr-plot-block-rrf_freq</a>
|
||||
<li><a href="user-manual.html#index-64">msr-plot-block-rrf_freq</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-62">msr-plot-block-rrf_packing</a>
|
||||
<li><a href="user-manual.html#index-63">msr-plot-block-rrf_packing</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-64">msr-plot-block-rrf_phase</a>
|
||||
<li><a href="user-manual.html#index-65">msr-plot-block-rrf_phase</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-55">msr-plot-block-runs</a>
|
||||
<li><a href="user-manual.html#index-56">msr-plot-block-runs</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-57">msr-plot-block-sub_ranges</a>
|
||||
<li><a href="user-manual.html#index-58">msr-plot-block-sub_ranges</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-58">msr-plot-block-use_fit_ranges</a>
|
||||
<li><a href="user-manual.html#index-59">msr-plot-block-use_fit_ranges</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-59">msr-plot-block-view_packing</a>
|
||||
<li><a href="user-manual.html#index-60">msr-plot-block-view_packing</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-17">msr-run-block</a>
|
||||
<li><a href="user-manual.html#index-18">msr-run-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-65">msr-statistc-block</a>
|
||||
<li><a href="user-manual.html#index-66">msr-statistc-block</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-14">msr-theory-block</a>
|
||||
</li>
|
||||
@ -342,11 +344,11 @@
|
||||
<li><a href="mupp.html#index-0">mupp</a>
|
||||
</li>
|
||||
<li><a href="mupp.html#index-1">mupp-gui</a>
|
||||
</li>
|
||||
<li><a href="mupp.html#index-2">mupp-scripting</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="mupp.html#index-2">mupp-scripting</a>
|
||||
</li>
|
||||
<li><a href="mupp.html#index-3">mupp-usage</a>
|
||||
</li>
|
||||
<li><a href="musredit.html#index-0">musredit</a>
|
||||
@ -375,7 +377,7 @@
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-24">musrfit-build-windows</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-42">musrfit-command-block-details</a>
|
||||
<li><a href="user-manual.html#index-43">musrfit-command-block-details</a>
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-19">musrfit-post-install-linux</a>
|
||||
</li>
|
||||
@ -423,7 +425,7 @@
|
||||
<h2 id="N">N</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-71">negative-muon-musr-fit</a>
|
||||
<li><a href="user-manual.html#index-72">negative-muon-musr-fit</a>
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-10">nexus</a>
|
||||
</li>
|
||||
@ -437,9 +439,9 @@
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-22">nexus-build-windows</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-73">non-musr-fit</a>
|
||||
<li><a href="user-manual.html#index-74">non-musr-fit</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-21">norm</a>
|
||||
<li><a href="user-manual.html#index-22">norm</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -455,7 +457,7 @@
|
||||
<h2 id="P">P</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-38">packing</a>
|
||||
<li><a href="user-manual.html#index-39">packing</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-30">PowderLineAsymGss</a>
|
||||
</li>
|
||||
@ -503,11 +505,11 @@
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-18">SExpRlx</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-67">single-histogram-fit</a>
|
||||
<li><a href="user-manual.html#index-68">single-histogram-fit</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-68">single-histogram-rrf-fit</a>
|
||||
<li><a href="user-manual.html#index-69">single-histogram-rrf-fit</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-16">SLR</a>
|
||||
</li>
|
||||
@ -519,11 +521,11 @@
|
||||
<h2 id="T">T</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-33">t0-asymmetry</a>
|
||||
<li><a href="user-manual.html#index-34">t0-asymmetry</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-32">t0-single-histo</a>
|
||||
<li><a href="user-manual.html#index-33">t0-single-histo</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-77">technical-musrfit</a>
|
||||
<li><a href="user-manual.html#index-78">technical-musrfit</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-5">TLondon1D1L</a>
|
||||
</li>
|
||||
@ -543,13 +545,13 @@
|
||||
<h2 id="U">U</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-74">user-functions</a>
|
||||
<li><a href="user-manual.html#index-75">user-functions</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-76">user-functions-with-global-part</a>
|
||||
<li><a href="user-manual.html#index-77">user-functions-with-global-part</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-75">user-functions-without-global-part</a>
|
||||
<li><a href="user-manual.html#index-76">user-functions-without-global-part</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-0">user-libs</a>
|
||||
</li>
|
||||
@ -579,7 +581,7 @@
|
||||
<h2 id="X">X</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-36">xy-data</a>
|
||||
<li><a href="user-manual.html#index-37">xy-data</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -611,12 +613,12 @@
|
||||
<li class="right" style="margin-right: 10px">
|
||||
<a href="#" title="General Index"
|
||||
>index</a></li>
|
||||
<li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.1 documentation</a> »</li>
|
||||
<li class="nav-item nav-item-0"><a href="index.html">musrfit 1.6.2 documentation</a> »</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="footer" role="contentinfo">
|
||||
© Copyright 2020, Andreas Suter.
|
||||
Last updated on May 25, 2020.
|
||||
Last updated on Jun 17, 2020.
|
||||
Created using <a href="http://sphinx-doc.org/">Sphinx</a> 2.2.2.
|
||||
</div>
|
||||
</body>
|
||||
|
||||
Reference in New Issue
Block a user