Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 420b301ac5 | |||
| 5d9eb0dcec | |||
| 905dfde5c7 | |||
| 05a732c9ec | |||
| bace23b97e | |||
| f7620445dc | |||
| 3457ff9d25 | |||
| da6eea271d | |||
| abe47395cd | |||
| a9140ecd74 |
@ -1,7 +1,7 @@
|
||||
# - musrfit
|
||||
cmake_minimum_required(VERSION 3.17)
|
||||
|
||||
project(musrfit VERSION 1.9.0 LANGUAGES C CXX)
|
||||
project(musrfit VERSION 1.9.1 LANGUAGES C CXX)
|
||||
|
||||
#--- musrfit specific options -------------------------------------------------
|
||||
option(nexus "build optional NeXus support. Needed for ISIS" OFF)
|
||||
|
||||
@ -12,6 +12,13 @@ or
|
||||
|
||||
https://bitbucket.org/muonspin/musrfit/commits/all
|
||||
|
||||
Release of V1.9.1, 2023/05/16
|
||||
=============================
|
||||
|
||||
add option [-c, --count] to dump_header which will dump the number of counts
|
||||
per detector and the total number of counts. Currently for MusrRoot data format
|
||||
only. For the other data formats it will be implement asap
|
||||
|
||||
Release of V1.9.0, 2023/02/17
|
||||
=============================
|
||||
|
||||
|
||||
@ -75,7 +75,7 @@ endfunction()
|
||||
#as35 endif()
|
||||
|
||||
find_path(FFTW3_INCLUDE NAMES fftw3.h
|
||||
HINTS "/usr/include" "/opt/local/include"
|
||||
HINTS "/usr/include" "/opt/local/include" "/app/include"
|
||||
)
|
||||
|
||||
find_library(FFTW3_LIBRARY fftw3)
|
||||
|
||||
@ -1,35 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<nonlocal xmlns="http://nemu.web.psi.ch/musrfit/nonlocal">
|
||||
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
|
||||
<comment>
|
||||
TrimSp information
|
||||
</comment>
|
||||
<trim_sp>
|
||||
<data_path>./TRIMSP/</data_path>
|
||||
<rge_fln_pre>SiC_1300x_52nm_48nm_E</rge_fln_pre>
|
||||
<energy_list>
|
||||
<energy>1000</energy>
|
||||
<energy>2000</energy>
|
||||
<energy>3000</energy>
|
||||
<energy>4000</energy>
|
||||
<energy>5000</energy>
|
||||
<energy>6000</energy>
|
||||
<energy>7000</energy>
|
||||
<energy>8000</energy>
|
||||
<energy>9000</energy>
|
||||
<energy>10000</energy>
|
||||
<energy>11000</energy>
|
||||
<energy>12000</energy>
|
||||
<energy>13000</energy>
|
||||
<energy>14000</energy>
|
||||
<energy>15000</energy>
|
||||
<energy>16000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>18000</energy>
|
||||
<energy>19000</energy>
|
||||
<energy>20000</energy>
|
||||
<energy>21000</energy>
|
||||
<energy>22000</energy>
|
||||
</energy_list>
|
||||
<energy_vect start="1000" stop="22000" step="1000"/>
|
||||
</trim_sp>
|
||||
</nonlocal>
|
||||
</depthProf>
|
||||
|
||||
@ -1,35 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<nonlocal xmlns="http://nemu.web.psi.ch/musrfit/nonlocal">
|
||||
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
|
||||
<comment>
|
||||
TrimSp information
|
||||
</comment>
|
||||
<trim_sp>
|
||||
<data_path>./TRIMSP/</data_path>
|
||||
<rge_fln_pre>SiC_1300x_52nm_48nm_E</rge_fln_pre>
|
||||
<energy_list>
|
||||
<energy>1000</energy>
|
||||
<energy>2000</energy>
|
||||
<energy>3000</energy>
|
||||
<energy>4000</energy>
|
||||
<energy>5000</energy>
|
||||
<energy>6000</energy>
|
||||
<energy>7000</energy>
|
||||
<energy>8000</energy>
|
||||
<energy>9000</energy>
|
||||
<energy>10000</energy>
|
||||
<energy>11000</energy>
|
||||
<energy>12000</energy>
|
||||
<energy>13000</energy>
|
||||
<energy>14000</energy>
|
||||
<energy>15000</energy>
|
||||
<energy>16000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>18000</energy>
|
||||
<energy>19000</energy>
|
||||
<energy>20000</energy>
|
||||
<energy>21000</energy>
|
||||
<energy>22000</energy>
|
||||
</energy_list>
|
||||
<energy_vect start="1000" stop="22000" step="1000"/>
|
||||
</trim_sp>
|
||||
</nonlocal>
|
||||
</depthProf>
|
||||
|
||||
@ -1,35 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<nonlocal xmlns="http://nemu.web.psi.ch/musrfit/nonlocal">
|
||||
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
|
||||
<comment>
|
||||
TrimSp information
|
||||
</comment>
|
||||
<trim_sp>
|
||||
<data_path>./TRIMSP/</data_path>
|
||||
<rge_fln_pre>Si10_2.0_E</rge_fln_pre>
|
||||
<energy_list>
|
||||
<energy>1000</energy>
|
||||
<energy>2000</energy>
|
||||
<energy>3000</energy>
|
||||
<energy>4000</energy>
|
||||
<energy>5000</energy>
|
||||
<energy>6000</energy>
|
||||
<energy>7000</energy>
|
||||
<energy>8000</energy>
|
||||
<energy>9000</energy>
|
||||
<energy>10000</energy>
|
||||
<energy>11000</energy>
|
||||
<energy>12000</energy>
|
||||
<energy>13000</energy>
|
||||
<energy>14000</energy>
|
||||
<energy>15000</energy>
|
||||
<energy>16000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>18000</energy>
|
||||
<energy>19000</energy>
|
||||
<energy>20000</energy>
|
||||
<energy>21000</energy>
|
||||
<energy>22000</energy>
|
||||
</energy_list>
|
||||
<energy_vect start="1000" stop="22000" step="1000"/>
|
||||
</trim_sp>
|
||||
</nonlocal>
|
||||
</depthProf>
|
||||
|
||||
@ -1,35 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<nonlocal xmlns="http://nemu.web.psi.ch/musrfit/nonlocal">
|
||||
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
|
||||
<comment>
|
||||
TrimSp information
|
||||
</comment>
|
||||
<trim_sp>
|
||||
<data_path>./TRIMSP/</data_path>
|
||||
<rge_fln_pre>SiO2_70nm2.0_30nm2.2_SiC_E</rge_fln_pre>
|
||||
<energy_list>
|
||||
<energy>1000</energy>
|
||||
<energy>2000</energy>
|
||||
<energy>3000</energy>
|
||||
<energy>4000</energy>
|
||||
<energy>5000</energy>
|
||||
<energy>6000</energy>
|
||||
<energy>7000</energy>
|
||||
<energy>8000</energy>
|
||||
<energy>9000</energy>
|
||||
<energy>10000</energy>
|
||||
<energy>11000</energy>
|
||||
<energy>12000</energy>
|
||||
<energy>13000</energy>
|
||||
<energy>14000</energy>
|
||||
<energy>15000</energy>
|
||||
<energy>16000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>17000</energy>
|
||||
<energy>18000</energy>
|
||||
<energy>19000</energy>
|
||||
<energy>20000</energy>
|
||||
<energy>21000</energy>
|
||||
<energy>22000</energy>
|
||||
</energy_list>
|
||||
<energy_vect start="1000" stop="22000" step="1000"/>
|
||||
</trim_sp>
|
||||
</nonlocal>
|
||||
</depthProf>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Sphinx build info version 1
|
||||
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
|
||||
config: 429dcaf60d751fc64b55c07d7174ea6f
|
||||
config: ea8ddbeaec87fd554dad49f5d0917959
|
||||
tags: 645f666f9bcd5a90fca523b33c5a78b7
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,6 +1,6 @@
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
|
||||
VERSION: '1.8.2',
|
||||
VERSION: '1.9.0',
|
||||
LANGUAGE: 'None',
|
||||
COLLAPSE_INDEX: false,
|
||||
FILE_SUFFIX: '.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Acknowledgements — musrfit 1.8.2 documentation</title>
|
||||
<title>Acknowledgements — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -193,8 +197,8 @@ extremely competent way to deal with his projects as well as to deal with the ch
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -216,7 +220,7 @@ extremely competent way to deal with his projects as well as to deal with the ch
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>any2many - a Universal μSR-file-format converter — musrfit 1.8.2 documentation</title>
|
||||
<title>any2many - a Universal μSR-file-format converter — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -183,8 +187,8 @@ For a detailed description see <a class="reference internal" href="user-manual.h
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -206,7 +210,7 @@ For a detailed description see <a class="reference internal" href="user-manual.h
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Bugtracking — musrfit 1.8.2 documentation</title>
|
||||
<title>Bugtracking — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -57,6 +57,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -181,8 +185,8 @@ or send an e-mail to A. Suter at PSI.</p>
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -204,7 +208,7 @@ or send an e-mail to A. Suter at PSI.</p>
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>How to Cite musrfit? — musrfit 1.8.2 documentation</title>
|
||||
<title>How to Cite musrfit? — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -195,8 +199,8 @@
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -218,7 +222,7 @@
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Index — musrfit 1.8.2 documentation</title>
|
||||
<title>Index — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -57,6 +57,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -235,7 +239,7 @@
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-74">bnmr-asymmetry-fit</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-14">BNMR-libs</a>
|
||||
<li><a href="user-libs.html#index-16">BNMR-libs</a>
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-2">boost-c++</a>
|
||||
</li>
|
||||
@ -262,6 +266,8 @@
|
||||
<li><a href="user-manual.html#index-33">data-asymmetry</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-32">data-single-histo</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-15">DepthProf-lib</a>
|
||||
</li>
|
||||
<li><a href="setup-dks.html#index-0">dks</a>
|
||||
</li>
|
||||
@ -285,7 +291,7 @@
|
||||
<h2 id="E">E</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-17">ExpRlx</a>
|
||||
<li><a href="user-libs.html#index-19">ExpRlx</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -357,11 +363,11 @@
|
||||
<h2 id="I">I</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-21">Ianiso</a>
|
||||
<li><a href="user-libs.html#index-23">Ianiso</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-20">Iax</a>
|
||||
<li><a href="user-libs.html#index-22">Iax</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -369,11 +375,11 @@
|
||||
<h2 id="L">L</h2>
|
||||
<table style="width: 100%" class="indextable genindextable"><tr>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-15">libBNMR</a>
|
||||
<li><a href="user-libs.html#index-17">libBNMR</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-2">libFitPofB</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-19">libLineProfile</a>
|
||||
<li><a href="user-libs.html#index-21">libLineProfile</a>
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-6">libxml2</a>
|
||||
</li>
|
||||
@ -381,15 +387,15 @@
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-22">LineGauss</a>
|
||||
<li><a href="user-libs.html#index-24">LineGauss</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-24">LineLaplace</a>
|
||||
<li><a href="user-libs.html#index-26">LineLaplace</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-23">LineLorentzian</a>
|
||||
<li><a href="user-libs.html#index-25">LineLorentzian</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-25">LineSkewLorentzian</a>
|
||||
<li><a href="user-libs.html#index-27">LineSkewLorentzian</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-26">LineSkewLorentzian2</a>
|
||||
<li><a href="user-libs.html#index-28">LineSkewLorentzian2</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -547,13 +553,15 @@
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-25">nexus-build-homebrew</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="setup-standard.html#index-15">nexus-build-linux</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="setup-standard.html#index-22">nexus-build-macports</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-75">non-musr-fit</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-14">nonlocal-libs</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-23">norm</a>
|
||||
</li>
|
||||
@ -573,15 +581,15 @@
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-40">packing</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-30">PowderLineAsymGss</a>
|
||||
<li><a href="user-libs.html#index-32">PowderLineAsymGss</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-libs.html#index-29">PowderLineAsymLor</a>
|
||||
<li><a href="user-libs.html#index-31">PowderLineAsymLor</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-28">PowderLineAxialGss</a>
|
||||
<li><a href="user-libs.html#index-30">PowderLineAxialGss</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-27">PowderLineAxialLor</a>
|
||||
<li><a href="user-libs.html#index-29">PowderLineAxialLor</a>
|
||||
</li>
|
||||
</ul></td>
|
||||
</tr></table>
|
||||
@ -617,7 +625,7 @@
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="setup-standard.html#index-0">setup</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-18">SExpRlx</a>
|
||||
<li><a href="user-libs.html#index-20">SExpRlx</a>
|
||||
</li>
|
||||
<li><a href="user-manual.html#index-69">single-histogram-fit</a>
|
||||
</li>
|
||||
@ -625,7 +633,7 @@
|
||||
<td style="width: 33%; vertical-align: top;"><ul>
|
||||
<li><a href="user-manual.html#index-70">single-histogram-rrf-fit</a>
|
||||
</li>
|
||||
<li><a href="user-libs.html#index-16">SLR</a>
|
||||
<li><a href="user-libs.html#index-18">SLR</a>
|
||||
</li>
|
||||
<li><a href="setup-standard.html#index-1">supported-operating-systems</a>
|
||||
</li>
|
||||
@ -712,8 +720,8 @@
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -735,7 +743,7 @@
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Welcome to the musrfit documentation! — musrfit 1.8.2 documentation</title>
|
||||
<title>Welcome to the musrfit documentation! — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -57,6 +57,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -178,6 +182,7 @@
|
||||
<li class="toctree-l1"><a class="reference internal" href="user-libs.html">Documentation of user libs (user functions)</a><ul>
|
||||
<li class="toctree-l2"><a class="reference internal" href="user-libs.html#meissner-profiles-vortex-lattice-related-functions-bmw-libs">Meissner-Profiles / Vortex-Lattice related functions (BMW libs)</a></li>
|
||||
<li class="toctree-l2"><a class="reference internal" href="user-libs.html#nonlocal-superconductivity-related-meissner-screening-functions-as-libs">Nonlocal superconductivity related Meissner screening functions (AS libs)</a></li>
|
||||
<li class="toctree-l2"><a class="reference internal" href="user-libs.html#depth-resolved-information-as-libs">Depth resolved information (AS libs)</a></li>
|
||||
<li class="toctree-l2"><a class="reference internal" href="user-libs.html#functions-to-analyze-bgr-nmr-data-bnmr-libs">Functions to analyze β-NMR data (BNMR libs)</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
@ -262,8 +267,8 @@
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -285,7 +290,7 @@
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>msr2data - A Program for Automatically Processing Multiple musrfit msr Files — musrfit 1.8.2 documentation</title>
|
||||
<title>msr2data - A Program for Automatically Processing Multiple musrfit msr Files — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -510,8 +514,8 @@ fit serves as template for the second and so on. The template field stays empty
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -533,7 +537,7 @@ fit serves as template for the second and so on. The template field stays empty
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>mupp - μSR Parameter Plotter — musrfit 1.8.2 documentation</title>
|
||||
<title>mupp - μSR Parameter Plotter — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -400,8 +404,8 @@ SCRIPT COMMANDS:
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -423,7 +427,7 @@ SCRIPT COMMANDS:
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>MusrRoot - an Extensible Open File Format for μSR — musrfit 1.8.2 documentation</title>
|
||||
<title>MusrRoot - an Extensible Open File Format for μSR — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -999,8 +1003,8 @@ the entry has been added. The last token, <code class="docutils literal notransl
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -1022,7 +1026,7 @@ the entry has been added. The last token, <code class="docutils literal notransl
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>musredit: the GUI Based Interface to musrfit — musrfit 1.8.2 documentation</title>
|
||||
<title>musredit: the GUI Based Interface to musrfit — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -626,8 +630,8 @@ the corresponding fit parameter value, except the phases where the step will be
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -649,7 +653,7 @@ the corresponding fit parameter value, except the phases where the step will be
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
Binary file not shown.
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Search — musrfit 1.8.2 documentation</title>
|
||||
<title>Search — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -56,6 +56,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -177,8 +181,8 @@
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -200,7 +204,7 @@
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Setting up musrfit / DKS: High Speed Fitting with GPU’s — musrfit 1.8.2 documentation</title>
|
||||
<title>Setting up musrfit / DKS: High Speed Fitting with GPU’s — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -400,8 +404,8 @@ The only thing you need <code class="docutils literal notranslate"><span class="
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -423,7 +427,7 @@ The only thing you need <code class="docutils literal notranslate"><span class="
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Setting up musrfit on Different Platforms — musrfit 1.8.2 documentation</title>
|
||||
<title>Setting up musrfit on Different Platforms — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1087,8 +1091,8 @@ $ musrview test-histo-ROOT-NPP.msr
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -1110,7 +1114,7 @@ $ musrview test-histo-ROOT-NPP.msr
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Tutorial for musrfit — musrfit 1.8.2 documentation</title>
|
||||
<title>Tutorial for musrfit — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -519,8 +523,8 @@ For a complete description please refer to the manuals of <a class="reference in
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -542,7 +546,7 @@ For a complete description please refer to the manuals of <a class="reference in
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>Documentation of user libs (user functions) — musrfit 1.8.2 documentation</title>
|
||||
<title>Documentation of user libs (user functions) — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -95,6 +99,7 @@
|
||||
</ul>
|
||||
</li>
|
||||
<li class="toctree-l2"><a class="reference internal" href="#nonlocal-superconductivity-related-meissner-screening-functions-as-libs">Nonlocal superconductivity related Meissner screening functions (AS libs)</a></li>
|
||||
<li class="toctree-l2"><a class="reference internal" href="#depth-resolved-information-as-libs">Depth resolved information (AS libs)</a></li>
|
||||
<li class="toctree-l2"><a class="reference internal" href="#functions-to-analyze-bgr-nmr-data-bnmr-libs">Functions to analyze β-NMR data (BNMR libs)</a><ul>
|
||||
<li class="toctree-l3"><a class="reference internal" href="#libbnmr">libBNMR</a><ul>
|
||||
<li class="toctree-l4"><a class="reference internal" href="#functions">Functions</a></li>
|
||||
@ -498,11 +503,120 @@ The expected name of the <code class="docutils literal notranslate"><span class=
|
||||
</div>
|
||||
</div>
|
||||
<div class="section" id="nonlocal-superconductivity-related-meissner-screening-functions-as-libs">
|
||||
<h2>Nonlocal superconductivity related Meissner screening functions (AS libs)<a class="headerlink" href="#nonlocal-superconductivity-related-meissner-screening-functions-as-libs" title="Permalink to this headline">¶</a></h2>
|
||||
<p>To be written yet …</p>
|
||||
<span id="nonlocal-libs"></span><span id="index-14"></span><h2>Nonlocal superconductivity related Meissner screening functions (AS libs)<a class="headerlink" href="#nonlocal-superconductivity-related-meissner-screening-functions-as-libs" title="Permalink to this headline">¶</a></h2>
|
||||
<p>This library allows to calculate the magnetic field profile <span class="math notranslate nohighlight">\(B(z)\)</span> for nonlocal superconductors.
|
||||
For details see <a class="reference external" href="http://dx.doi.org/10.1103/PhysRevLett.95.197201">A. Suter, et al., PRB 72, 024506 (2005)</a>, and references therein.</p>
|
||||
<p>The provided function calculates the muon spin polarization</p>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[P(t, E) = \int n(z, E)\, \cos(\gamma_\mu B(z) t + \phi) \, dz,\]</div>
|
||||
<p>where <span class="math notranslate nohighlight">\(B(z)\)</span> is calculated in the limit of specular reflection.
|
||||
The corresponding user function is called as</p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libPNL_PippardFitter</span> <span class="n">PNL_PippardFitter</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span> <span class="mi">4</span> <span class="mi">5</span> <span class="mi">6</span> <span class="mi">7</span> <span class="mi">8</span> <span class="mi">9</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
<p>with the parameters</p>
|
||||
<ol class="arabic simple">
|
||||
<li>implantation energy in (keV).</li>
|
||||
<li>reduced temperature <span class="math notranslate nohighlight">\(t=T/T_c\)</span>.</li>
|
||||
<li>thickness in (nm).</li>
|
||||
<li>electron mean path, <span class="math notranslate nohighlight">\(\ell\)</span> in (nm).</li>
|
||||
<li>superconducting coherence length, <span class="math notranslate nohighlight">\(\xi\)</span> in (nm).</li>
|
||||
<li>London penetration length, <span class="math notranslate nohighlight">\(\lambda_{\rm L}\)</span> in (nm).</li>
|
||||
<li>external magnetic field strength in (G).</li>
|
||||
<li>the effective detector phase, <span class="math notranslate nohighlight">\(\varphi\)</span> in <span class="math notranslate nohighlight">\((^\circ)\)</span>.</li>
|
||||
<li>a “dead layer” thickness in (nm).</li>
|
||||
</ol>
|
||||
<p>Typically this function needs to be multiplied by a Gaussian in order to take into account: nuclear dipole broadening, partial trapped flux, etc.</p>
|
||||
<p>In order to find the muon stopping profile, <span class="math notranslate nohighlight">\(n(z,E)\)</span>, needed for the calculation, the library needs to find the corresponding trimsp
|
||||
rge-files (muon stoppping profiles). For this the library reads at start-up the following xml-file (example):</p>
|
||||
<div class="highlight-xml notranslate"><div class="highlight"><pre><span></span><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
|
||||
<span class="nt"><nonlocal</span> <span class="na">xmlns=</span><span class="s">"http://nemu.web.psi.ch/musrfit/nonlocal"</span><span class="nt">></span>
|
||||
<span class="nt"><comment></span>
|
||||
nonlocal_startup.xml
|
||||
<span class="nt"></comment></span>
|
||||
<span class="nt"><nonlocal_par></span>
|
||||
<span class="nt"><fourier_points></span>262144<span class="nt"></fourier_points></span>
|
||||
<span class="nt"></nonlocal_par></span>
|
||||
<span class="nt"><trim_sp></span>
|
||||
<span class="nt"><data_path></span>./profiles/<span class="nt"></data_path></span>
|
||||
<span class="nt"><rge_fln_pre></span>Sn_E<span class="nt"></rge_fln_pre></span>
|
||||
<span class="nt"><energy_list></span>
|
||||
<span class="nt"><energy></span>1000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>2000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>4000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>6000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>8000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>10000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>12000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>14100<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>18000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>22000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>25000<span class="nt"></energy></span>
|
||||
<span class="nt"><energy></span>27300<span class="nt"></energy></span>
|
||||
<span class="nt"></energy_list></span>
|
||||
<span class="nt"></trim_sp></span>
|
||||
<span class="nt"></nonlocal></span>
|
||||
</pre></div>
|
||||
</div>
|
||||
<p>Here the number of Fourier points needed in the calculation can be defined (<code class="docutils literal notranslate"><span class="pre">fourier_points</span></code>). The <code class="docutils literal notranslate"><span class="pre">trim_sp</span></code> section
|
||||
contains all the information needed to load the proper muon stopping profiles. <code class="docutils literal notranslate"><span class="pre">data_path</span></code> is the path to the needed rge-files.
|
||||
<code class="docutils literal notranslate"><span class="pre">rge_fln_pre</span></code> is the rge-file prefix, and <code class="docutils literal notranslate"><span class="pre">energy</span></code> are all the energy tags. E.g. <code class="docutils literal notranslate"><span class="pre">./profile/Sn_E1000.rge</span></code> would be the first
|
||||
muon stopping profile for an energy of <span class="math notranslate nohighlight">\(E=1000\)</span> (eV).</p>
|
||||
<p>The name of the xml-file has to be <code class="docutils literal notranslate"><span class="pre">nonlocal_startup.xml</span></code> and needs to be placed in the directory where the analysis takes place, i.e.
|
||||
in the directory of all the msr-files.</p>
|
||||
</div>
|
||||
<div class="section" id="depth-resolved-information-as-libs">
|
||||
<span id="depthprof-lib"></span><span id="index-15"></span><h2>Depth resolved information (AS libs)<a class="headerlink" href="#depth-resolved-information-as-libs" title="Permalink to this headline">¶</a></h2>
|
||||
<p>A method to extract depth-resolved information from the implantation energy dependence of the experimental parameters in a low-energy
|
||||
muon spin spectroscopy experiment. For details see <a class="reference external" href="https://doi.org/10.1063/1.5126529">A. F. A. Simões, et al. Review of Scientific Instruments. 2020; 91(2): 023906 (7 pp.)</a>.</p>
|
||||
<p>If you have a layered material (e.g. <span class="math notranslate nohighlight">\(N\)</span> layers), properties like the asymmetry might depend on the layer in which the muons are stopped.
|
||||
For instance there might be different probabilities for muonium formation depending on the material, charge transfer layers, etc.</p>
|
||||
<p>Since the muon stopping distribution, <span class="math notranslate nohighlight">\(n(z)\)</span>, has some finite range, these properties will be smeared out. For the following we define
|
||||
the stopping probability, <span class="math notranslate nohighlight">\(p_{i}(E)\)</span> for a finite slice <span class="math notranslate nohighlight">\(i\)</span>, ranging from <span class="math notranslate nohighlight">\(z \in [a, b]\)</span> as</p>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[p_{i}(E) = \int_a^b n(z,E) \, dz\]</div>
|
||||
<p>Furthermore it is assumes that there is a sharp transition between the layers of the property of interest, e.g. the diamagnetic fraction, <span class="math notranslate nohighlight">\(f_i\)</span>.
|
||||
Hence the measured property as function of energy is</p>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[f(E) = \sum_{i=1}^N p_{i}(E) \cdot f_i.\]</div>
|
||||
<div class="admonition note">
|
||||
<p class="first admonition-title">Note</p>
|
||||
<p class="last">Currently it is recommended to read in the data in ASCII or DAT format as a non-μSR fit <a class="reference internal" href="user-manual.html#non-musr-fit"><span class="std std-ref">(fit type 8)</span></a>.</p>
|
||||
</div>
|
||||
<p>The user library for the depth profile analysis looks for a <strong>3 layer material</strong>, assuming one is looking for the diamagnetic fraction, like</p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="c1">###############################################################</span>
|
||||
<span class="n">FITPARAMETER</span>
|
||||
<span class="c1"># Nr. Name Value Step Pos_Error Boundaries</span>
|
||||
<span class="mi">1</span> <span class="n">f1</span> <span class="mf">0.54540</span> <span class="mf">0.00072</span> <span class="n">none</span> <span class="mi">0</span> <span class="mi">1</span>
|
||||
<span class="mi">2</span> <span class="n">f2</span> <span class="mf">0.23957</span> <span class="mf">0.00048</span> <span class="n">none</span>
|
||||
<span class="mi">3</span> <span class="n">f3</span> <span class="mf">0.05615</span> <span class="mf">0.00047</span> <span class="n">none</span> <span class="mi">0</span> <span class="mi">1</span>
|
||||
<span class="mi">4</span> <span class="n">x1</span> <span class="mf">63.5000</span> <span class="mf">0.0014</span> <span class="n">none</span>
|
||||
<span class="mi">5</span> <span class="n">x2</span> <span class="mf">101.5001</span> <span class="mf">0.0044</span> <span class="n">none</span>
|
||||
|
||||
<span class="c1">###############################################################</span>
|
||||
<span class="n">THEORY</span>
|
||||
<span class="n">userFcn</span> <span class="n">libPDepthProfile</span> <span class="n">PDepthProfile</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span> <span class="mi">4</span> <span class="mi">5</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
<p>Here, <span class="math notranslate nohighlight">\(f1\)</span> is the diamagnetic fraction of the first layer, etc. <span class="math notranslate nohighlight">\(x1\)</span> is the thickness of the first layer, etc.</p>
|
||||
<p>In order to find the muon stopping profile, <span class="math notranslate nohighlight">\(n(z,E)\)</span>, needed for the calculation, the library needs to find the corresponding trimsp
|
||||
rge-files (muon stoppping profiles). For this the library reads at start-up the following xml-file (example):</p>
|
||||
<div class="highlight-xml notranslate"><div class="highlight"><pre><span></span><span class="cp"><?xml version="1.0" encoding="UTF-8"?></span>
|
||||
<span class="nt"><depthProf</span> <span class="na">xmlns=</span><span class="s">"http://nemu.web.psi.ch/musrfit/depthProf"</span><span class="nt">></span>
|
||||
<span class="nt"><comment></span>
|
||||
TrimSp information
|
||||
<span class="nt"></comment></span>
|
||||
<span class="nt"><trim_sp></span>
|
||||
<span class="nt"><data_path></span>./TRIMSP/<span class="nt"></data_path></span>
|
||||
<span class="nt"><rge_fln_pre></span>SiO2_70nm2.0_30nm2.2_SiC_E<span class="nt"></rge_fln_pre></span>
|
||||
<span class="nt"><energy_vect</span> <span class="na">start=</span><span class="s">"1000"</span> <span class="na">stop=</span><span class="s">"22000"</span> <span class="na">step=</span><span class="s">"1000"</span><span class="nt">/></span>
|
||||
<span class="nt"></trim_sp></span>
|
||||
<span class="nt"></depthProf></span>
|
||||
</pre></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="section" id="functions-to-analyze-bgr-nmr-data-bnmr-libs">
|
||||
<span id="bnmr-libs"></span><span id="index-14"></span><h2>Functions to analyze β-NMR data (BNMR libs)<a class="headerlink" href="#functions-to-analyze-bgr-nmr-data-bnmr-libs" title="Permalink to this headline">¶</a></h2>
|
||||
<span id="bnmr-libs"></span><span id="index-16"></span><h2>Functions to analyze β-NMR data (BNMR libs)<a class="headerlink" href="#functions-to-analyze-bgr-nmr-data-bnmr-libs" title="Permalink to this headline">¶</a></h2>
|
||||
<p>This is a collection of <code class="docutils literal notranslate"><span class="pre">C++</span></code> classes using the <code class="docutils literal notranslate"><span class="pre">musrfit</span></code> <a class="reference internal" href="user-manual.html#id38"><span class="std std-ref">user-functions</span></a>
|
||||
interface in order to facilitate the usage in conjunction with <code class="docutils literal notranslate"><span class="pre">musrfit</span></code>. It consists of two libraries:</p>
|
||||
<ul class="simple">
|
||||
@ -514,11 +628,11 @@ interface in order to facilitate the usage in conjunction with <code class="docu
|
||||
<p class="last">Currently it is recommended to read in the data in ASCII format as a non-μSR fit <a class="reference internal" href="user-manual.html#non-musr-fit"><span class="std std-ref">(fit type 8)</span></a>.</p>
|
||||
</div>
|
||||
<div class="section" id="libbnmr">
|
||||
<span id="index-15"></span><h3>libBNMR<a class="headerlink" href="#libbnmr" title="Permalink to this headline">¶</a></h3>
|
||||
<span id="index-17"></span><h3>libBNMR<a class="headerlink" href="#libbnmr" title="Permalink to this headline">¶</a></h3>
|
||||
<p>In β-NMR the SLR is usually measured by implanting a pulse of <span class="math notranslate nohighlight">\(^8\)</span>Li with a length <span class="math notranslate nohighlight">\(t_0\)</span> into the sample.
|
||||
The asymmetry is measured both during the pulse and afterwards. For a a general spin relaxation function <span class="math notranslate nohighlight">\(f(t)\)</span> the time evolution of the asymmetry is then given by [<a class="reference external" href="http://dx.doi.org/10.1103/PhysRevLett.96.147601">Z. Salman, et al., PRL 96, 147601 (2006)</a>]:</p>
|
||||
<div class="math notranslate nohighlight" id="slr">
|
||||
<span id="index-16"></span>\[\begin{split}P(t) = \left\{\begin{matrix}
|
||||
<span id="index-18"></span>\[\begin{split}P(t) = \left\{\begin{matrix}
|
||||
\frac{\int_0^t e^{-(t-t')/\tau_{\mathrm{Li}}}f(t-t')dt'}{\int_0^t e^{-t'/\tau_{\mathrm{Li}}}dt' } & t\leq t_0\\[6pt]
|
||||
\frac{\int_0^{t_0}e^{-(t_0-t')/\tau_{\mathrm{Li}}}f(t-t')dt'}{\int_0^{t_0}e^{-t'/\tau_{\mathrm{Li}}}dt'} & t> t_0,
|
||||
\end{matrix}\right.\end{split}\]</div>
|
||||
@ -526,7 +640,7 @@ The asymmetry is measured both during the pulse and afterwards. For a a general
|
||||
<div class="section" id="functions">
|
||||
<h4>Functions<a class="headerlink" href="#functions" title="Permalink to this headline">¶</a></h4>
|
||||
<p>The <code class="docutils literal notranslate"><span class="pre">libBNMR</span></code> library currently contains the following functions:</p>
|
||||
<p id="index-17"><strong>Exponential relaxation</strong></p>
|
||||
<p id="index-19"><strong>Exponential relaxation</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libBNMR</span> <span class="n">ExpRlx</span> <span class="mi">1</span> <span class="mi">2</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -536,7 +650,7 @@ The asymmetry is measured both during the pulse and afterwards. For a a general
|
||||
<li>relaxation rate <span class="math notranslate nohighlight">\(\lambda\)</span> (s<span class="math notranslate nohighlight">\(^{-1}\)</span>)</li>
|
||||
</ol>
|
||||
<p>This function implements <span class="math notranslate nohighlight">\(f(t)=e^{-\lambda t}\)</span>.</p>
|
||||
<p id="index-18"><strong>Stretched exponential relaxation</strong></p>
|
||||
<p id="index-20"><strong>Stretched exponential relaxation</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libBNMR</span> <span class="n">SExpRlx</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -550,19 +664,19 @@ The asymmetry is measured both during the pulse and afterwards. For a a general
|
||||
</div>
|
||||
</div>
|
||||
<div class="section" id="liblineprofile">
|
||||
<span id="index-19"></span><h3>libLineProfile<a class="headerlink" href="#liblineprofile" title="Permalink to this headline">¶</a></h3>
|
||||
<span id="index-21"></span><h3>libLineProfile<a class="headerlink" href="#liblineprofile" title="Permalink to this headline">¶</a></h3>
|
||||
<p>In addition to some simple line shapes <code class="docutils literal notranslate"><span class="pre">libLineProfile</span></code> contains functions to fit chemical shift anisotropies in the powder average.
|
||||
Their functional form can be found in <a class="reference external" href="http://dx.doi.org/10.1007/978-3-642-68756-3_2">M. Mehring, Principles of High Resolution NMR in Solids (Springer 1983)</a>.</p>
|
||||
<p>For an axially symmetric interaction it is given by:</p>
|
||||
<div class="math notranslate nohighlight" id="iax">
|
||||
<span id="index-20"></span>\[\begin{split}I_{\mathrm ax}(f)=\left\{\begin{matrix} \frac{1}{2\sqrt{(f_\parallel-f_\perp)(f-f_\perp)}}& f\in(f_\perp,f_\parallel)\cup(f_\parallel,f_\perp)\\[6pt] 0 & \text{otherwise}\end{matrix} \right.\end{split}\]</div>
|
||||
<span id="index-22"></span>\[\begin{split}I_{\mathrm ax}(f)=\left\{\begin{matrix} \frac{1}{2\sqrt{(f_\parallel-f_\perp)(f-f_\perp)}}& f\in(f_\perp,f_\parallel)\cup(f_\parallel,f_\perp)\\[6pt] 0 & \text{otherwise}\end{matrix} \right.\end{split}\]</div>
|
||||
<p>where <span class="math notranslate nohighlight">\(f_\parallel\)</span> and <span class="math notranslate nohighlight">\(f_\perp\)</span> are the frequencies that would be observed if the field is oriented paralell or perpendicular to the symmetry axis, respectively.</p>
|
||||
<div class="line-block">
|
||||
<div class="line">In case of a completely anisotropic interaction, the powder average can be described by the frequencies along the three principle axis <span class="math notranslate nohighlight">\(f_1,f_2,f_3\)</span>.</div>
|
||||
<div class="line">Assume without loss of generality that <span class="math notranslate nohighlight">\(f_1<f_2<f_3\)</span>, then</div>
|
||||
</div>
|
||||
<div class="math notranslate nohighlight" id="ianiso">
|
||||
<span id="index-21"></span>\[\begin{split}I(f)&=\left\{\begin{matrix}
|
||||
<span id="index-23"></span>\[\begin{split}I(f)&=\left\{\begin{matrix}
|
||||
\frac{K(m)}{\pi\sqrt{(f-f_1)(f_3-f_2)}},& f_3\geq f>f_2 \\[9pt]
|
||||
\frac{K(m)}{\pi\sqrt{(f_3-f)(f_2-f_1)}},& f_2>f\geq f_1\\[9pt]
|
||||
0 & \text{otherwise}
|
||||
@ -578,7 +692,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
<div class="section" id="id1">
|
||||
<h4>Functions<a class="headerlink" href="#id1" title="Permalink to this headline">¶</a></h4>
|
||||
<p>The <code class="docutils literal notranslate"><span class="pre">libLineProfile</span></code> library currently contains the following functions:</p>
|
||||
<p id="index-22"><strong>Gaussian</strong></p>
|
||||
<p id="index-24"><strong>Gaussian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">LineGauss</span> <span class="mi">1</span> <span class="mi">2</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -593,7 +707,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
</div>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)=e^{-\frac{4\ln 2 (f-f_0)^2}{ \sigma^2}}\]</div>
|
||||
<p id="index-23"><strong>Lorentzian</strong></p>
|
||||
<p id="index-25"><strong>Lorentzian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">LineLorentzian</span> <span class="mi">1</span> <span class="mi">2</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -608,7 +722,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
</div>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)= \frac{w^2}{4(f-f_0)^2+w^2}\]</div>
|
||||
<p id="index-24"><strong>Laplacian</strong></p>
|
||||
<p id="index-26"><strong>Laplacian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">LineLaplace</span> <span class="mi">1</span> <span class="mi">2</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -623,7 +737,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
</div>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)=e^{-2\ln 2 \left|\frac{f-f_0}{w}\right|}\]</div>
|
||||
<p id="index-25"><strong>Skewed Lorentzian</strong></p>
|
||||
<p id="index-27"><strong>Skewed Lorentzian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">LineSkewLorentzian</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -639,7 +753,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
</div>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)= \frac{w w_a}{4(f-f_0)^2+w_a^2}, \quad w_a=\frac{2w}{1+e^{a(f-f_0)}}\]</div>
|
||||
<p id="index-26"><strong>Skewed Lorentzian 2</strong></p>
|
||||
<p id="index-28"><strong>Skewed Lorentzian 2</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">LineSkewLorentzian2</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -655,7 +769,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
</div>
|
||||
<div class="math notranslate nohighlight">
|
||||
\[\begin{split}A(f)= \left\{\begin{matrix}\frac{{w_1}^2}{4{(f-f_0)}^2+{w_1}^2},&f\leq f_0\\[9pt] \frac{{w_2}^2}{4{(f-f_0)}^2+{w_2}^2},&f>f_0\end{matrix}\right.\end{split}\]</div>
|
||||
<p id="index-27"><strong>Powder average of an axially symmetric interaction convoluted with a Lorentzian</strong></p>
|
||||
<p id="index-29"><strong>Powder average of an axially symmetric interaction convoluted with a Lorentzian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">PowderLineAxialLor</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -672,7 +786,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)= I_{\mathrm ax}(f)\circledast\left( \frac{w^2}{4f^2+w^2} \right)\]</div>
|
||||
<p>with <span class="math notranslate nohighlight">\(I_{\mathrm ax}(f)\)</span> defined <a class="reference internal" href="#iax"><span class="std std-ref">above</span></a>.</p>
|
||||
<p id="index-28"><strong>Powder average of an axially symmetric interaction convoluted with a Gaussian</strong></p>
|
||||
<p id="index-30"><strong>Powder average of an axially symmetric interaction convoluted with a Gaussian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">PowderLineAxialGss</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -689,7 +803,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)= I_{\mathrm ax}(f)\circledast\left( e^{-\frac{4\ln 2 (f-f_0)^2}{ \sigma^2}} \right)\]</div>
|
||||
<p>with <span class="math notranslate nohighlight">\(I_{\mathrm ax}(f)\)</span> defined <a class="reference internal" href="#iax"><span class="std std-ref">above</span></a>.</p>
|
||||
<p id="index-29"><strong>Powder average of an anisotropic interaction convoluted with a Lorentzian</strong></p>
|
||||
<p id="index-31"><strong>Powder average of an anisotropic interaction convoluted with a Lorentzian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">PowderLineAsymLor</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span> <span class="mi">4</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -707,7 +821,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
<div class="math notranslate nohighlight">
|
||||
\[A(f)= I(f)\circledast\left( \frac{w^2}{4f^2+w^2} \right)\]</div>
|
||||
<p>with <span class="math notranslate nohighlight">\(I(f)\)</span> defined <a class="reference internal" href="#ianiso"><span class="std std-ref">above</span></a>. Note that <span class="math notranslate nohighlight">\(f_1<f_2<f_3\)</span> is not required by the code.</p>
|
||||
<p id="index-30"><strong>Powder average of an anisotropic interaction convoluted with a Gaussian</strong></p>
|
||||
<p id="index-32"><strong>Powder average of an anisotropic interaction convoluted with a Gaussian</strong></p>
|
||||
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">userFcn</span> <span class="n">libLineProfile</span> <span class="n">PowderLineAsymGss</span> <span class="mi">1</span> <span class="mi">2</span> <span class="mi">3</span> <span class="mi">4</span>
|
||||
</pre></div>
|
||||
</div>
|
||||
@ -750,8 +864,8 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -773,7 +887,7 @@ K(m)&=\int_0^{\pi/2}\frac{\mathrm d\varphi}{\sqrt{1-m^2\sin^2{\varphi}}},\en
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
|
||||
<title>User manual — musrfit 1.8.2 documentation</title>
|
||||
<title>User manual — musrfit 1.9.0 documentation</title>
|
||||
|
||||
|
||||
|
||||
@ -58,6 +58,10 @@
|
||||
|
||||
|
||||
|
||||
<div class="version">
|
||||
1.9
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -2866,8 +2870,8 @@ The syntax here is attribute driven</li>
|
||||
|
||||
<div role="contentinfo">
|
||||
<p>
|
||||
© Copyright 2022, Andreas Suter.
|
||||
Last updated on Dec 12, 2022.
|
||||
© Copyright 2023, Andreas Suter.
|
||||
Last updated on Feb 17, 2023.
|
||||
|
||||
</p>
|
||||
</div>
|
||||
@ -2889,7 +2893,7 @@ The syntax here is attribute driven</li>
|
||||
<script type="text/javascript">
|
||||
var DOCUMENTATION_OPTIONS = {
|
||||
URL_ROOT:'./',
|
||||
VERSION:'1.8.2',
|
||||
VERSION:'1.9.0',
|
||||
LANGUAGE:'None',
|
||||
COLLAPSE_INDEX:false,
|
||||
FILE_SUFFIX:'.html',
|
||||
@ -2916,4 +2920,4 @@ The syntax here is attribute driven</li>
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
@ -6,6 +6,7 @@ set(MUSRFIT_INC ${CMAKE_SOURCE_DIR}/src/include)
|
||||
# Hence, target_include_directories cannot be used here because, targets are
|
||||
# setup only afterwards.
|
||||
include_directories(${MUSRFIT_INC})
|
||||
include_directories(${FFTW3_INCLUDE})
|
||||
|
||||
root_generate_dictionary(
|
||||
PFourierCanvasDict
|
||||
|
||||
@ -2530,7 +2530,7 @@ Bool_t PFitter::ExecuteSave(Bool_t firstSave)
|
||||
fitStartTime = run->at(0).GetFitRange(0);
|
||||
fitEndTime = run->at(0).GetFitRange(1);
|
||||
}
|
||||
fout.setf(std::ios::floatfield);
|
||||
fout.setf(std::ios::fixed, std::ios::floatfield);
|
||||
fout << std::endl << " Time Range: " << fitStartTime << ", " << fitEndTime << std::endl;
|
||||
if (fUseChi2) {
|
||||
fout.setf(std::ios::fixed, std::ios::floatfield);
|
||||
|
||||
@ -213,11 +213,12 @@ int PMsr2Data::DetermineRunNumberDigits(unsigned int runNo, bool normalMode) con
|
||||
*/
|
||||
int PMsr2Data::CheckRunNumbersInRange() const
|
||||
{
|
||||
double max(pow(static_cast<double>(10), static_cast<int>(fRunNumberDigits)) - 1.0);
|
||||
// since 2023, we encounter in LEM run numbers > 9999, hence this check has been loosened
|
||||
// by replacing static_cast<int>(fRunNumberDigits)) by static_cast<int>(fRunNumberDigits+1)).
|
||||
double max(pow(static_cast<double>(10), static_cast<int>(fRunNumberDigits+1)) - 1.0);
|
||||
unsigned int max_UInt;
|
||||
max > static_cast<double>(std::numeric_limits<unsigned int>::max()) ? max_UInt = std::numeric_limits<unsigned int>::max()
|
||||
: max_UInt = static_cast<unsigned int>(max);
|
||||
|
||||
for (std::vector<unsigned int>::const_iterator iter(fRunVector.begin()); iter != fRunVector.end(); ++iter) {
|
||||
if (*iter > max_UInt) {
|
||||
return -1;
|
||||
|
||||
@ -703,6 +703,8 @@ Bool_t PStartupHandler::WriteDefaultStartupFile()
|
||||
fout << " <!-- LEM/PSI -->" << std::endl;
|
||||
fout << " <run_name_template inst=\"lem\">%yyyy%/lem%yy%_his_%rrrr%.root</run_name_template>" << std::endl;
|
||||
fout << " <run_name_template inst=\"lem\">d%yyyy%/tdc/lem%yy%_his_%rrrr%.root</run_name_template>" << std::endl;
|
||||
fout << " <run_name_template inst=\"lem\">%yyyy%/lem%yy%_his_%rrrrr%.root</run_name_template>" << std::endl;
|
||||
fout << " <run_name_template inst=\"lem\">d%yyyy%/tdc/lem%yy%_his_%rrrrr%.root</run_name_template>" << std::endl;
|
||||
fout << " <fourier_settings>" << std::endl;
|
||||
fout << " <units>Gauss</units>" << std::endl;
|
||||
fout << " <fourier_power>0</fourier_power>" << std::endl;
|
||||
|
||||
@ -52,6 +52,8 @@
|
||||
#include <TFile.h>
|
||||
#include <TFolder.h>
|
||||
#include <TString.h>
|
||||
#include <TFolder.h>
|
||||
#include <TH1F.h>
|
||||
|
||||
#ifdef HAVE_GIT_REV_H
|
||||
#include "git-revision.h"
|
||||
@ -78,7 +80,8 @@
|
||||
void dump_header_syntax()
|
||||
{
|
||||
std::cout << std::endl << "usage: dump_header [-rn <runNo> | -fn <fileName>] [-ff, --fileFormat <fileFormat>]";
|
||||
std::cout << std::endl << " [-y, --year <year>] [-s, --summary] [--psi-bulk <opt>] |";
|
||||
std::cout << std::endl << " [-y, --year <year>] [-s, --summary] [-i, --instrument <inst>]";
|
||||
std::cout << std::endl << " [-c, --counts] | ";
|
||||
std::cout << std::endl << " --help | --version";
|
||||
std::cout << std::endl;
|
||||
std::cout << std::endl << " Dumps the header information of a given muSR data file onto the standard output.";
|
||||
@ -97,6 +100,7 @@ void dump_header_syntax()
|
||||
std::cout << std::endl << " to the header information, print the summary file content.";
|
||||
std::cout << std::endl << " -i, --instrument <inst> : where <inst> is the requested instrument:";
|
||||
std::cout << std::endl << " lem (default) | gps | ltf | dolly | gpd | hifi.";
|
||||
std::cout << std::endl << " -c, --counts : will show detector counts as well.";
|
||||
std::cout << std::endl << " -h, --help : will show this help";
|
||||
std::cout << std::endl << " -v, --version : will show the current version.";
|
||||
std::cout << std::endl << std::endl;
|
||||
@ -108,10 +112,11 @@ void dump_header_syntax()
|
||||
*
|
||||
* @param fileName file name of the ROOT file
|
||||
* @param summary bool, if true dump the summary
|
||||
* @param counts bool, if true dump detector counts
|
||||
*
|
||||
* @return 0 on success, otherwise 1.
|
||||
*/
|
||||
int dump_header_root(const std::string fileName, const bool summary)
|
||||
int dump_header_root(const std::string fileName, const bool summary, const bool counts)
|
||||
{
|
||||
TFile f(fileName.c_str());
|
||||
if (f.IsZombie()) {
|
||||
@ -122,6 +127,8 @@ int dump_header_root(const std::string fileName, const bool summary)
|
||||
}
|
||||
|
||||
UInt_t fileType = DH_MUSR_ROOT;
|
||||
UInt_t noOfHistos{0};
|
||||
PIntVector redGreenOffset;
|
||||
|
||||
TFolder *folder;
|
||||
f.GetObject("RunInfo", folder); // try first LEM-ROOT style file (used until 2011).
|
||||
@ -208,6 +215,18 @@ int dump_header_root(const std::string fileName, const bool summary)
|
||||
|
||||
header->DumpHeader();
|
||||
|
||||
if (counts) {
|
||||
bool ok;
|
||||
Int_t ival;
|
||||
PIntVector ivec;
|
||||
header->Get("RunInfo/No of Histos", ival, ok);
|
||||
if (ok)
|
||||
noOfHistos = ival;
|
||||
header->Get("RunInfo/RedGreen Offsets", ivec, ok);
|
||||
if (ok)
|
||||
redGreenOffset = ivec;
|
||||
}
|
||||
|
||||
delete header;
|
||||
}
|
||||
|
||||
@ -232,6 +251,38 @@ int dump_header_root(const std::string fileName, const bool summary)
|
||||
}
|
||||
}
|
||||
|
||||
// detector counts as well?
|
||||
if (counts && (fileType == DH_MUSR_ROOT)) {
|
||||
// dump the detector counts
|
||||
std::cout << "Detector counts" << std::endl;
|
||||
f.GetObject("histos", folder);
|
||||
if (folder != nullptr) {
|
||||
char detectorLabel[64];
|
||||
TH1F *histo{nullptr};
|
||||
UInt_t total{0};
|
||||
for (UInt_t i=0; i<redGreenOffset.size(); i++) {
|
||||
std::cout << " Group " << i+1 << " (Offset=" << redGreenOffset[i] << ") : " << std::endl;
|
||||
total = 0;
|
||||
for (UInt_t j=0; j<noOfHistos; j++) {
|
||||
snprintf(detectorLabel, sizeof(detectorLabel), "hDecay%03d", redGreenOffset[i]+j+1);
|
||||
histo = (TH1F*) folder->FindObjectAny(detectorLabel);
|
||||
if (histo != nullptr) {
|
||||
std::cout << " " << histo->GetTitle() << ":\t " << histo->GetEntries() << std::endl;
|
||||
total += histo->GetEntries();
|
||||
}
|
||||
}
|
||||
if (i % 2 == 0)
|
||||
std::cout << " total counts of group " << i+1 << ":\t\t\t " << total << std::endl;
|
||||
else
|
||||
std::cout << " total counts of group " << i+1 << ":\t\t\t\t\t " << total << std::endl;
|
||||
}
|
||||
} else {
|
||||
std::cout << "Sorry, no histos folder found" << std::endl;
|
||||
f.Close();
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
f.Close();
|
||||
|
||||
return 0;
|
||||
@ -723,6 +774,7 @@ int main(int argc, char *argv[])
|
||||
std::string year("");
|
||||
std::string instrument("lem");
|
||||
bool summary(false);
|
||||
bool counts(false);
|
||||
|
||||
for (int i=1; i<argc; i++) {
|
||||
if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h")) {
|
||||
@ -812,6 +864,8 @@ int main(int argc, char *argv[])
|
||||
i++;
|
||||
} else if (!strcmp(argv[i], "-s") || !strcmp(argv[i], "--summary")) {
|
||||
summary = true;
|
||||
} else if (!strcmp(argv[i], "-c") || !strcmp(argv[i], "--counts")) {
|
||||
counts = true;
|
||||
} else if (!strcmp(argv[i], "-i") || !strcmp(argv[i], "--instrument")) {
|
||||
if (i+1 >= argc) {
|
||||
std::cerr << std::endl << "**ERROR** found option --instrument without <instrument> input!" << std::endl;
|
||||
@ -929,7 +983,7 @@ int main(int argc, char *argv[])
|
||||
boost::to_lower(fileFormat);
|
||||
|
||||
if (boost::iequals(fileFormat, "MusrRoot") || boost::iequals(fileFormat, "ROOT")) {
|
||||
dump_header_root(pathFln, summary);
|
||||
dump_header_root(pathFln, summary, counts);
|
||||
} else if (boost::iequals(fileFormat, "NeXus")) {
|
||||
#ifdef PNEXUS_ENABLED
|
||||
dump_header_nexus(pathFln);
|
||||
|
||||
5
src/external/DepthProfile/src/CMakeLists.txt
vendored
5
src/external/DepthProfile/src/CMakeLists.txt
vendored
@ -6,6 +6,7 @@ set(DEPTH_PROFILE_INC ${CMAKE_CURRENT_SOURCE_DIR}/../inc)
|
||||
# ROOT requires that the dictonary header files are found at configuration time.
|
||||
# Hence, target_include_directories cannot be used here because, targets are
|
||||
# setup only afterwards.
|
||||
include_directories(${FFTW3_INCLUDE})
|
||||
include_directories(${MUSRFIT_INC})
|
||||
include_directories(${DEPTH_PROFILE_INC})
|
||||
|
||||
@ -13,7 +14,7 @@ root_generate_dictionary(
|
||||
PDepthProfileDict
|
||||
PDepthProfile.h
|
||||
OPTIONS
|
||||
-I${FFTW3_INCLUDE_DIR}
|
||||
-I${FFTW3_INCLUDE}
|
||||
-I${MUSRFIT_INC}
|
||||
-I${DEPTH_PROFILE_INC}
|
||||
-inlineInputHeader
|
||||
@ -45,7 +46,7 @@ set_target_properties(PDepthProfile
|
||||
#--- make sure that the include directory is found ----------------------------
|
||||
target_include_directories(
|
||||
PDepthProfile BEFORE PRIVATE
|
||||
$<BUILD_INTERFACE:${FFTW3_INCLUDE_DIR}>
|
||||
$<BUILD_INTERFACE:${FFTW3_INCLUDE}>
|
||||
$<BUILD_INTERFACE:${MUSRFIT_INC}>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../inc>
|
||||
)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<nonlocal xmlns="http://nemu.web.psi.ch/musrfit/nonlocal">
|
||||
<depthProf xmlns="http://nemu.web.psi.ch/musrfit/depthProf">
|
||||
<comment>
|
||||
TrimSp information
|
||||
</comment>
|
||||
@ -31,5 +31,7 @@
|
||||
<energy>21000</energy>
|
||||
<energy>22000</energy>
|
||||
</energy_list>
|
||||
<!-- <energy_vect start="1000" stop="22000" step="1000"/>
|
||||
-->
|
||||
</trim_sp>
|
||||
</nonlocal>
|
||||
</depthProf>
|
||||
|
||||
Reference in New Issue
Block a user