update of the docu.
This commit is contained in:
parent
dcced32d27
commit
6883249117
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:10 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:27 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,14 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1494785300" type="application/x-wiki" title="edit BmwLibs" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1528465298" type="application/x-wiki" title="edit BmwLibs" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -106,10 +106,10 @@
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
@ -149,5 +149,5 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:10 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:27 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,14 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1494785299" type="application/x-wiki" title="edit CiteMusrFit" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1528465297" type="application/x-wiki" title="edit CiteMusrFit" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -105,8 +105,8 @@
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
@ -123,13 +123,19 @@
|
||||
<p></p>
|
||||
Since quite some effort is going into the development and maintenance of the <code>musrfit</code> package, you should at least acknowledge it in your publication if you have used it to analyze your data. Even better of course is to cite it properly by the reference given beneath
|
||||
<p></p> <ul>
|
||||
<li> <a href="http://dx.doi.org/10.1016/j.phpro.2012.04.042">A. Suter, B.M. Wojek, "Musrfit: A Free Platform-Independent Framework for μSR Data Analysis", Physics Procedia 30, 69 (2012).</a>
|
||||
<li> <a href="http://dx.doi.org/10.1016/j.phpro.2012.04.042">A. Suter, B.M. Wojek, "Musrfit: A Free Platform-Independent Framework for μSR Data Analysis", Physics Procedia <strong>30</strong>, 69 (2012).</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
The GPU high speed <code>musrfit</code> version is utilizing <code>DKS</code>. In case you are using this version, please also add the following citations
|
||||
<p></p> <ul>
|
||||
<li> <a href="https://doi.org/10.1016/j.cpc.2016.05.013">A. Adelmann, U. Locans, A. Suter, "The Dynamic Kernel Scheduler—Part 1", Computer Physics Communications <strong>207</strong>, 83 (2016).</a>
|
||||
</li> <li> <a href="https://doi.org/10.1016/j.cpc.2017.02.007">U. Locans, <strong><em>et al.</em></strong>, "Real-time computation of parameter fitting and image reconstruction using graphical processing units", Computer Physics Communications <strong>215</strong>, 71 (2017).</a>
|
||||
</li></ul> </div>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'> > </span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a><span class='foswikiSeparator'> > </span>CiteMusrFit <br />
|
||||
Topic revision: <span class='patternRevInfo'>19 Jun 2012, suter_a</span></div>
|
||||
Topic revision: <span class='patternRevInfo'>22 Aug 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -147,5 +153,5 @@ Topic revision: <span class='patternRevInfo'>19 Jun 2012, suter_a</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:04 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:21 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,13 +14,13 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1494785299" type="application/x-wiki" title="edit LibFitPofB" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1528465298" type="application/x-wiki" title="edit LibFitPofB" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@ -101,17 +101,17 @@
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
@ -428,5 +428,5 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:10 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:26 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:26 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:45 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,14 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1494785294" type="application/x-wiki" title="edit LibZFRelaxation" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1528465295" type="application/x-wiki" title="edit LibZFRelaxation" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -104,13 +104,13 @@
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
@ -233,5 +233,5 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:30 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:47 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,13 +14,11 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1494785299" type="application/x-wiki" title="edit Msr2Data" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1528465298" type="application/x-wiki" title="edit Msr2Data" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
|
||||
<style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
<base /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
body .foswikiTable {border-width:1px}
|
||||
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
|
||||
body .foswikiTable td {border-style:solid none; vertical-align:top}
|
||||
@ -52,10 +50,12 @@ body .foswikiTable#tableMsr2Data1 th.foswikiSortedCol {background-color:#eeeeee}
|
||||
body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
|
||||
body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
|
||||
</style><!--TABLEPLUGIN_specific-->
|
||||
<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -135,18 +135,18 @@ body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JQUERYPLUGIN::TWISTY-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::TWISTY-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
@ -435,5 +435,5 @@ Topic revision: <span class='patternRevInfo'>28 Apr 2016, <a href="https://intr
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:39 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,11 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1494785298" type="application/x-wiki" title="edit MusrFit" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1528465297" type="application/x-wiki" title="edit MusrFit" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
<base /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
body .foswikiTable {border-width:1px}
|
||||
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
|
||||
body .foswikiTable td {border-style:solid none; vertical-align:top}
|
||||
@ -35,8 +32,11 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
|
||||
</style><!--TABLEPLUGIN_default-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -116,17 +116,17 @@ body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-col
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
@ -165,7 +165,9 @@ body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-col
|
||||
</li> <li> <a href="MusrFit.html#A_4.4_The_FUNCTIONS_Block"> 4.4 The FUNCTIONS Block </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4.5_The_GLOBAL_Block"> 4.5 The GLOBAL Block </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4.6_The_RUN_Block"> 4.6 The RUN Block </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4.7_The_COMMANDS_Block"> 4.7 The COMMANDS Block </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4.7_The_COMMANDS_Block"> 4.7 The COMMANDS Block </a> <ul>
|
||||
<li> <a href="MusrFit.html#A_4.7.1_DKS_extensions_of_the_COMMANDS_block_enabling_GPU_and_general_OpenCL_support"> 4.7.1 DKS extensions of the COMMANDS block enabling GPU and general OpenCL support </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFit.html#A_4.8_The_FOURIER_Block"> 4.8 The FOURIER Block </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4.9_The_PLOT_Block"> 4.9 The PLOT Block </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4.10_The_STATISTIC_Block"> 4.10 The STATISTIC Block </a>
|
||||
@ -554,6 +556,8 @@ Notes
|
||||
<h2 id="A_4.3_The_THEORY_Block"> 4.3 The THEORY Block </h2>
|
||||
The THEORY block is used to define the fit function. There is a set of predefined functions available. It is also possible to use externally defined functions. How to use them will be explained afterwards, here only the predefined functions are described.
|
||||
<p></p>
|
||||
Theory functions which show a <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> are not yet DKS ready, i.e. cannot be run on the GPU if the <code>musrfit</code> / DKS version is installed.
|
||||
<p></p>
|
||||
<span id="TheoryTable"></span>
|
||||
<table border="1" class="foswikiTable" rules="none">
|
||||
<thead>
|
||||
@ -608,14 +612,14 @@ The THEORY block is used to define the fit function. There is a set of predefine
|
||||
<td class="foswikiTableCol1"> sgktlf </td>
|
||||
<td class="foswikiTableCol2"> <img alt="\nu\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_7188605a647615e4fb92cc89274b22a0.png" />, <img alt="\sigma\,(\mu\text{s}^{-1})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_6b6bbc4add4da0bde8220c54594658f3.png" /> </td>
|
||||
<td class="foswikiTableCol3"> <img alt="G_{\mathrm{G,LF}}(t) \equiv 1-\frac{2\sigma^2}{(2\pi\nu)^2}\left[1-\exp\left(-\frac{1}{2}\sigma^2t^2\right)\cos(2\pi\nu t)\right]+\frac{2\sigma^4}{(2\pi\nu)^3}\int^t_0 \exp\left(-\frac{1}{2}\sigma^2\tau^2\right)\sin(2\pi\nu\tau)\mathrm{d}\tau" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_e9a0c0aa5d84cb4ea67265a3b06b9af5.png" /> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote3text"></a><span class="FootNoteTextLink" title=" R. S. Hayano _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.20.850][Phys. Rev. B *20* (1979) 850]] "><a class="foswikiCurrentTopicLink" href="#FootNote3note">(4)</a></span> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote3text"></a><span class="FootNoteTextLink" title=" R. S. Hayano _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.20.850][Phys. Rev. B *20* (1979) 850]] "><a class="foswikiCurrentTopicLink" href="#FootNote3note">(4)</a></span> <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableOdd foswikiTableRowdataBgSorted1 foswikiTableRowdataBg1">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> dynGssKTLF </td>
|
||||
<td class="foswikiTableCol1"> dgktlf </td>
|
||||
<td class="foswikiTableCol2"> <img alt="\nu\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_7188605a647615e4fb92cc89274b22a0.png" />, <img alt="\sigma\,(\mu\text{s}^{-1})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_6b6bbc4add4da0bde8220c54594658f3.png" />, <img alt="\Gamma\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_f87b1352f663a35bf263bc7e9a214ca3.png" /> </td>
|
||||
<td class="foswikiTableCol3"> <img alt="\frac{1}{2\pi \imath}\int_{\gamma-\imath\infty}^{\gamma+\imath\infty} \frac{f_{\mathrm{G}}(s+\Gamma)}{1-\Gamma f_{\mathrm{G}}(s+\Gamma)} \exp(s t) \mathrm{d}s,\mathrm{where}\,f_{\mathrm{G}}(s)\equiv \int_0^{\infty}G_{\mathrm{G,LF}}(t)\exp(-s t) \mathrm{d}t" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_cb688f85a062f09bfaff5cf9144860a9.png" /> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote4text"></a><span class="FootNoteTextLink" title=" R. S. Hayano _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.20.850][Phys. Rev. B *20* (1979) 850]]; P. Dalmas de R&eacute;otier and A. Yaouanc, [[http://dx.doi.org/10.1088/0953-8984/4/18/020][J. Phys.: Condens. Matter *4* (1992) 4533]]; A. Keren, [[http://link.aps.org/doi/10.1103/PhysRevB.50.10039][Phys. Rev. B *50* (1994) 10039]] "><a class="foswikiCurrentTopicLink" href="#FootNote4note">(5)</a></span> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote4text"></a><span class="FootNoteTextLink" title=" R. S. Hayano _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.20.850][Phys. Rev. B *20* (1979) 850]]; P. Dalmas de R&eacute;otier and A. Yaouanc, [[http://dx.doi.org/10.1088/0953-8984/4/18/020][J. Phys.: Condens. Matter *4* (1992) 4533]]; A. Keren, [[http://link.aps.org/doi/10.1103/PhysRevB.50.10039][Phys. Rev. B *50* (1994) 10039]] "><a class="foswikiCurrentTopicLink" href="#FootNote4note">(5)</a></span> <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableEven foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> statExpKT </td>
|
||||
@ -629,14 +633,14 @@ The THEORY block is used to define the fit function. There is a set of predefine
|
||||
<td class="foswikiTableCol1"> sektlf </td>
|
||||
<td class="foswikiTableCol2"> <img alt="\nu\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_7188605a647615e4fb92cc89274b22a0.png" />, <img alt="a\,(\mu\text{s}^{-1})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_26a5ae8799badcc3bcbe1823265a9053.png" /> </td>
|
||||
<td class="foswikiTableCol3"> <img alt="1-\frac{a}{2\pi\nu}j_1(2\pi\nu t)\exp\left(-at\right)-\left(\frac{a}{2\pi\nu}\right)^2 \left[j_0(2\pi\nu t)\exp\left(-at\right)-1\right]-a\left[1+\left(\frac{a}{2\pi\nu}\right)^2\right]\int^t_0 \exp\left(-a\tau\right)j_0(2\pi\nu\tau)\mathrm{d}\tau \equiv G_{\mathrm{L,LF}}(t)" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_df4770dd7b14577f14410b4f7ab59721.png" /> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote6text"></a><span class="FootNoteTextLink" title=" Y. J. Uemura _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.31.546][Phys. Rev. B *31* (1985) 546]] "><a class="foswikiCurrentTopicLink" href="#FootNote6note">(7)</a></span> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote6text"></a><span class="FootNoteTextLink" title=" Y. J. Uemura _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.31.546][Phys. Rev. B *31* (1985) 546]] "><a class="foswikiCurrentTopicLink" href="#FootNote6note">(7)</a></span> <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableEven foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> dynExpKTLF </td>
|
||||
<td class="foswikiTableCol1"> dektlf </td>
|
||||
<td class="foswikiTableCol2"> <img alt="\nu\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_7188605a647615e4fb92cc89274b22a0.png" />, <img alt="a\,(\mu\text{s}^{-1})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_26a5ae8799badcc3bcbe1823265a9053.png" />, <img alt="\Gamma\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_f87b1352f663a35bf263bc7e9a214ca3.png" /> </td>
|
||||
<td class="foswikiTableCol3"> <img alt="\frac{1}{2\pi \imath}\int_{\gamma-\imath\infty}^{\gamma+\imath\infty} \frac{f_{\mathrm{L}}(s+\Gamma)}{1-\Gamma f_{\mathrm{L}}(s+\Gamma)} \exp(s t) \mathrm{d}s,\mathrm{where}\,f_{\mathrm{L}}(s)\equiv \int_0^{\infty}G_{\mathrm{L,LF}}(t)\exp(-s t) \mathrm{d}t" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_c5c6dea10611dae1d470a5615869073a.png" /> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote7text"></a><span class="FootNoteTextLink" title=" R. S. Hayano _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.20.850][Phys. Rev. B *20* (1979) 850]]; P. Dalmas de R&eacute;otier and A. Yaouanc, [[http://dx.doi.org/10.1088/0953-8984/4/18/020][J. Phys.: Condens. Matter *4* (1992) 4533]] "><a class="foswikiCurrentTopicLink" href="#FootNote7note">(8)</a></span> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a name="FootNote7text"></a><span class="FootNoteTextLink" title=" R. S. Hayano _et al._, [[http://link.aps.org/doi/10.1103/PhysRevB.20.850][Phys. Rev. B *20* (1979) 850]]; P. Dalmas de R&eacute;otier and A. Yaouanc, [[http://dx.doi.org/10.1088/0953-8984/4/18/020][J. Phys.: Condens. Matter *4* (1992) 4533]] "><a class="foswikiCurrentTopicLink" href="#FootNote7note">(8)</a></span> <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableOdd foswikiTableRowdataBgSorted1 foswikiTableRowdataBg1">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> combiLGKT </td>
|
||||
@ -706,7 +710,7 @@ The THEORY block is used to define the fit function. There is a set of predefine
|
||||
<td class="foswikiTableCol1"> skg </td>
|
||||
<td class="foswikiTableCol2"> <img alt="\varphi\,(^{\circ})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_61136f20673ad20f955c43e43b8cec9d.png" />, <img alt="\nu\,(\mathrm{MHz})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_7188605a647615e4fb92cc89274b22a0.png" />, <img alt="\sigma_{-}\,(\mu\text{s}^{-1})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_bd5c765027d46aa1433dda03f540c17e.png" />, <img alt="\sigma_{+}\,(\mu\text{s}^{-1})" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_82adbab00b6a057f04037b44746e33eb.png" /> </td>
|
||||
<td class="foswikiTableCol3"> <img alt="\frac{\sigma_{-}}{\sigma_{+}+\sigma_{-}}\exp\left[-\frac{\sigma_{-}^2t^2}{2}\right]\left\lbrace\cos\left(2\pi\nu t+\frac{\pi\varphi}{180}\right)+\sin\left(2\pi\nu t+\frac{\pi\varphi}{180}\right)\mathrm{Erfi}\left(\frac{\sigma_{-}t}{\sqrt{2}}\right)\right\rbrace+ \frac{\sigma_{+}}{\sigma_{+}+\sigma_{-}}\exp\left[-\frac{\sigma_{+}^2t^2}{2}\right]\left\lbrace\cos\left(2\pi\nu t+\frac{\pi\varphi}{180}\right)-\sin\left(2\pi\nu t+\frac{\pi\varphi}{180}\right)\mathrm{Erfi}\left(\frac{\sigma_{+}t}{\sqrt{2}}\right)\right\rbrace" class="mmpImage" src="../pub/MUSR/MusrFit/_MathModePlugin_7f4cd42199fbf712ad5a86f9d94bd698.png" /> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a href="http://lmu.web.psi.ch/musrfit/memos/skewedGaussian.pdf">memo</a> <span class='foswikiIcon'><img src='../pub/System/DocumentGraphics/pdf.png' width='16' height='16' alt='pdf' /></span> </td>
|
||||
<td class="foswikiTableCol4 foswikiLastCol"> <a href="http://lmu.web.psi.ch/musrfit/memos/skewedGaussian.pdf">memo</a> <span class='foswikiIcon'><img src='../pub/System/DocumentGraphics/pdf.png' width='16' height='16' alt='pdf' /></span> <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableOdd foswikiTableRowdataBgSorted1 foswikiTableRowdataBg1">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> staticNKZF </td>
|
||||
@ -1243,6 +1247,41 @@ For debug purposes it is possible to force MINUIT2 to print out additional infor
|
||||
</pre>
|
||||
Here the <code>MINOS</code> command will print out lot of additional information to the standard output. Notice there are 2 <code>SAVE</code> commands here. This will write the result of <code>MIGRAD</code> to the <code>MINUIT2.OUTPUT</code> file and at the end <em>append</em> the <code>MINOS</code> results to this file.
|
||||
<p></p>
|
||||
<h3 id="A_4.7.1_DKS_extensions_of_the_COMMANDS_block_enabling_GPU_and_general_OpenCL_support"> 4.7.1 DKS extensions of the COMMANDS block enabling GPU and general OpenCL support </h3>
|
||||
<p></p>
|
||||
In case you are running the <code>musrfit</code> / DKS version, there are a couple commands which allow you to control the way how the fit shall be performed. These commands are:
|
||||
<span class='foswikiMaroonFG'>
|
||||
<table border="1" class="foswikiTable" rules="none">
|
||||
<thead>
|
||||
<tr class="foswikiTableOdd foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
|
||||
<th class="foswikiTableCol0 foswikiFirstCol"> <a href="https://intranet.psi.ch/MUSR/MusrFit?cover=print;sortcol=0;table=3;up=0#sorted_table" rel="nofollow" title="Sort by this column">Command</a> </th>
|
||||
<th class="foswikiTableCol1 foswikiLastCol"> <a href="https://intranet.psi.ch/MUSR/MusrFit?cover=print;sortcol=1;table=3;up=0#sorted_table" rel="nofollow" title="Sort by this column">Purpose</a> </th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="foswikiTableEven foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> OpenMP </td>
|
||||
<td class="foswikiTableCol1 foswikiLastCol"> tries to run multi-threading via OpenMP if available </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableOdd foswikiTableRowdataBgSorted1 foswikiTableRowdataBg1">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> CUDA </td>
|
||||
<td class="foswikiTableCol1 foswikiLastCol"> tries to run the fit on a NVIDIA card as the Tesla K40c </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableEven foswikiTableRowdataBgSorted0 foswikiTableRowdataBg0">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol"> OpenCL-CPU </td>
|
||||
<td class="foswikiTableCol1 foswikiLastCol"> tries to run multi-threading via OpenCL on the CPU. This is useful for macOS </td>
|
||||
</tr>
|
||||
<tr class="foswikiTableOdd foswikiTableRowdataBgSorted1 foswikiTableRowdataBg1">
|
||||
<td class="foswikiTableCol0 foswikiFirstCol foswikiLast"> OpenCL-GPU </td>
|
||||
<td class="foswikiTableCol1 foswikiLastCol foswikiLast"> tries to run multi-threading via OpenCL on the GPU. This is used for AMD cards, but also works for NVIDIA </td>
|
||||
</tr>
|
||||
</tbody></table>
|
||||
<p></p>
|
||||
OpenMP is the default if none of these tags are found in the COMMANDS block.
|
||||
</span>
|
||||
<p></p>
|
||||
In case the defined THEORY is <strong>not</strong> ready to run on the accelerator, <code>musrfit</code> will fall back to the default behaviour. In the <a class="foswikiCurrentTopicLink" href="#TheoryTable">THEORY table</a> all the functions which are currently <strong>not</strong> GPU ready are marked by <img class='smily' src='../pub/Main/SmiliesPluginPSI/no.gif' alt='no' title='no' /> in the reference column.
|
||||
<p></p>
|
||||
<span id="TheFourierBlock"></span>
|
||||
<h2 id="A_4.8_The_FOURIER_Block"> 4.8 The FOURIER Block </h2>
|
||||
The Fourier transform is done and the results are plotted within <code>musrview</code> —as input data the actual data shown in <code>musrview</code> is used. In the FOURIER block of the msr file all necessary parameters for calculating and presenting the Fourier transform of the data specified in the <a class="foswikiCurrentTopicLink" href="#ThePlotBlock">PLOT block</a> is given. If the FOURIER block is not present in the msr file, either the parameters set in the <a class="foswikiCurrentTopicLink" href="#MusrfitStartupXml">XML startup file</a> or the system defaults are taken when the Fourier transform is performed. The block starts with the FOURIER keyword and may contain the following entries on the successive lines: <dl>
|
||||
@ -1713,7 +1752,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'> > </span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a><span class='foswikiSeparator'> > </span>MusrFit <br />
|
||||
Topic revision: <span class='patternRevInfo'>30 Apr 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
Topic revision: <span class='patternRevInfo'>23 Aug 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1731,5 +1770,5 @@ Topic revision: <span class='patternRevInfo'>30 Apr 2017, <a href="https://intr
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:39 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,14 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1494785298" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1528465297" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -102,14 +102,14 @@
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
@ -122,12 +122,15 @@
|
||||
<div class="patternContent"><div class="foswikiTopic"> <h1 id="Acknowledgements_45_61_61musrfit_61_61"> Acknowledgements - <code><b>musrfit</b></code> </h1>
|
||||
<p></p> <dl>
|
||||
<dt> Bastian M. Wojek </dt><dd> I am very much indebted to <a href="http://www.fsf.org/register_form?referrer=8369">BMW</a> for his rigorous testing of <code><a href="MusrFit.html">musrfit</a></code>, his many useful suggestions, contributions, and for the largest part of the <a class="foswikiCurrentWebHomeLink" href="WebHome.html">user manual of <code>musrfit</code></a> which makes it accessible to a broader audience! Many thanks Bastian!
|
||||
</dd></dl>
|
||||
<p></p> <dl>
|
||||
<dt> Uldis Locans </dt><dd> I am very much indebted to Uldis work on <a href="CiteMusrFit.html">DKS</a> enabling the GPU support for <code><a href="MusrFit.html">musrfit</a></code>. His kind, calm, and extremely competent way to deal with his projects as well as to deal with the chaos of physicists way to think is admirable. Many thanks Uldis!
|
||||
</dd></dl> </div>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'> > </span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a> > <a href="MusrFit.html">MusrFit</a><span class='foswikiSeparator'> > </span>MusrFitAcknowledgements <br />
|
||||
Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
|
||||
Topic revision: <span class='patternRevInfo'>23 Aug 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -145,5 +148,5 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:39 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:39 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,7 +14,7 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1494785297" type="application/x-wiki" title="edit MusrFitSetup" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1528465297" type="application/x-wiki" title="edit MusrFitSetup" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
@ -101,17 +101,17 @@
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
@ -134,9 +134,13 @@
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 3.1.2 Installation of NeXus requirements (optional) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.1.3_61_61ROOT_61_61"> 3.1.3 ROOT </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.2_61_61musrfit_61_61"> 3.2 musrfit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.2_61_61musrfit_61_61"> 3.2 musrfit </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_3.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 3.2.1 musrfit build with automake </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 3.2.2 musrfit build with cmake </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 3.2.3 musrfit last step of the installation </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.3_61_61musredit_61_61"> 3.3 musredit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.4_61_61musrgui_61_61"> 3.4 musrgui </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.4_61_61musrgui_61_61_40obsolete_41"> 3.4 musrgui (obsolete) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_3.5_Check_of_the_installation"> 3.5 Check of the installation </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4_MS_Windows"> 4 MS Windows </a> <ul>
|
||||
@ -145,24 +149,40 @@
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 4.1.2 Installation of NeXus requirements (optional) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.1.3_61_61ROOT_61_61"> 4.1.3 ROOT </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.2_61_61musrfit_61_61"> 4.2 musrfit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.2_61_61musrfit_61_61"> 4.2 musrfit </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_4.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 4.2.1 musrfit build with automake </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 4.2.2 musrfit build with cmake </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 4.2.3 musrfit last step of the installation </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.3_61_61musredit_61_61"> 4.3 musredit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.4_61_61musrgui_61_61"> 4.4 musrgui </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.5_Check_of_the_installation"> 4.5 Check of the installation </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_4.6_Possible_problems"> 4.6 Possible problems </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5_Mac_OS_X"> 5 Mac OS X </a> <ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5_Mac_OS_X_47_macOS"> 5 Mac OS X / macOS </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_5.1_Requirements_40_61_61MacPorts_61_61_41"> 5.1 Requirements (MacPorts) </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_5.1.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"> 5.1.1 Everything but ROOT and NeXus </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 5.1.2 Installation of NeXus requirements (optional) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.1.3_61_61ROOT_61_61"> 5.1.3 ROOT </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.1.3_61_61ROOT_61_61"> 5.1.3 ROOT </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_5.1.3.1_61_61ROOT_61_61_installed_via_package_installer"> 5.1.3.1 ROOT installed via package installer </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.1.3.2_61_61ROOT_61_61_installed_from_source"> 5.1.3.2 ROOT installed from source </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.1.3.3_Setting_up_Environment_Variables_for_61_61ROOT_61_61_and_61_61musrfit_61_61"> 5.1.3.3 Setting up Environment Variables for ROOT and musrfit </a>
|
||||
</li></ul>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.2_Requirements_40_61_61Fink_61_61_41"> 5.2 Requirements (Fink) </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_5.2.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"> 5.2.1 Everything but ROOT and NeXus </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.2.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 5.2.2 Installation of NeXus requirements (optional) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.2.3_61_61ROOT_61_61"> 5.2.3 ROOT </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.2.3_61_61ROOT_61_61"> 5.2.3 ROOT </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_5.2.3.1_61_61ROOT_61_61_installed_via_package_installer"> 5.2.3.1 ROOT installed via package installer </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.2.3.2_61_61ROOT_61_61_installed_from_source"> 5.2.3.2 ROOT installed from source </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.2.3.3_Setting_up_Environment_Variables_for_61_61ROOT_61_61_and_61_61musrfit_61_61"> 5.2.3.3 Setting up Environment Variables for ROOT and musrfit </a>
|
||||
</li></ul>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.3_61_61musrfit_61_61"> 5.3 musrfit </a> <ul>
|
||||
<li> <a href="MusrFitSetup.html#A_5.3.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 5.3.1 musrfit build with automake </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.3.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 5.3.2 musrfit build with cmake </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.3.3_61_61musrfit_61_61_last_step_of_the_installation"> 5.3.3 musrfit last step of the installation </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.3_61_61musrfit_61_61"> 5.3 musrfit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.4_61_61musredit_61_61"> 5.4 musredit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.5_61_61musrgui_61_61_40obsolete_41"> 5.5 musrgui (obsolete) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.6_Check_of_the_installation"> 5.6 Check of the installation </a>
|
||||
@ -175,22 +195,25 @@
|
||||
This page is intended to demonstrate for the interested user which steps are necessary to set up the <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a> μSR data analysis framework <code><a href="MusrFit.html">musrfit</a></code>. While the preferred way is to run the software on <strong>GNU/Linux</strong> or <strong>MacOS X</strong>, with some restrictions it can also be set up under <strong>MS Windows</strong> (cygwin, only for the very brave, probably it is easier for most MS Windows users to install a Virtual Machine running Linux). <span class='foswikiRedFG'>In case <code>musrfit</code> should be installed according to the description found on this page, the user is strongly encouraged to <em>read completely</em> each section dealing with the present installation step <em>before</em> starting the installation process!</span>
|
||||
<p></p>
|
||||
<span id="ReqSw"></span>
|
||||
Apart from <a href="http://gcc.gnu.org/">GCC, the GNU Compiler Collection</a> (gcc, g++), the GNU build tools <a href="http://www.gnu.org/software/autoconf/">autoconf</a>, <a href="http://www.gnu.org/software/automake/">automake</a> and <a href="http://www.gnu.org/software/libtool/">libtool</a> as well as the helper tool <a href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a> <code>musrfit</code> requires the installation of a few open-source libraries and programs including their header packages:
|
||||
$ <a href="http://www.boost.org/">boost C++ libraries</a>: The powerful <code>Spirit</code> parser framework used by <code>musrfit</code> is included in that collection of libraries. <em>Required version ≥ 1.33</em>
|
||||
$ <a href="http://www.gnu.org/software/gsl/">GNU Scientific Library</a>: A numerical <code>C</code> and <code>C++</code> library which provides efficient implementations of various mathematical routines. <em>Required version ≥ 1.9</em>
|
||||
$ <a href="http://www.fftw.org/">FFTW</a>: A <code>C</code> implementation for the fast computation of discrete Fourier transforms. <em>Required version ≥ 3.1</em>
|
||||
$ <a href="http://root.cern.ch/">ROOT</a>: A <code>C++</code> data analysis framework developed at <a href="http://www.cern.ch/">CERN</a>. <em>Required version ≥ 5.22</em>
|
||||
$ <a href="http://xmlsoft.org/">libxml2</a>: The <code>XML</code> <code>C</code> parser and toolkit of <a href="http://www.gnome.org/">Gnome</a>. <em>Required version ≥ 2.0</em>
|
||||
Apart from <a href="http://gcc.gnu.org/">GCC, the GNU Compiler Collection</a> (gcc, g++), the GNU build tools <a href="http://www.gnu.org/software/autoconf/">autoconf</a>, <a href="http://www.gnu.org/software/automake/">automake</a> and <a href="http://www.gnu.org/software/libtool/">libtool</a> are needed if you want to build <code>musrfit</code> via the automake toolchain, or <a href="https://cmake.org/">cmake</a> if you plan to use the cmake toolchain. Furthermore the helper tool <a href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a> is needed and <code>musrfit</code> requires the installation of a few open-source libraries and programs including their header packages:
|
||||
<p></p> <dl>
|
||||
<dt> boost C++ libraries </dt><dd> The powerful <code>Spirit</code> parser framework used by <code>musrfit</code> is included in that collection of libraries. <em>Required version ≥ 1.33</em> (see <a href="http://www.boost.org/">boost C++ libraries</a>)
|
||||
</dd> <dt> GNU Scientific Library </dt><dd> A numerical <code>C</code> and <code>C++</code> library which provides efficient implementations of various mathematical routines. <em>Required version ≥ 1.9</em> (see <a href="http://www.gnu.org/software/gsl/">GNU Scientific Library</a>)
|
||||
</dd> <dt> FFTW </dt><dd> A <code>C</code> implementation for the fast computation of discrete Fourier transforms. <em>Required version ≥ 3.1</em> $ <a href="http://root.cern.ch/">ROOT</a>: A <code>C++</code> data analysis framework developed at <a href="http://www.cern.ch/">CERN</a>. <em>Required version ≥ 5.22</em> (see <a href="http://www.fftw.org/">FFTW</a>)
|
||||
</dd> <dt> libxml2 </dt><dd> The <code>XML</code> <code>C</code> parser and toolkit of <a href="http://www.gnome.org/">Gnome</a>. <em>Required version ≥ 2.0</em> (see <a href="http://xmlsoft.org/">libxml2</a>)
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
<span id="ReqSwNeXus"></span>
|
||||
Additionally, <span class='foswikiRedFG'>only if</span> <code>musrfit</code> should support reading of data files in the <code>NeXus</code> format the following libraries are needed:
|
||||
$ <a href="http://www.hdfgroup.org/products/hdf4/">HDF4</a>: A library and multi-object file format for storing and managing data.
|
||||
$ <a href="http://www.hdfgroup.org/HDF5/">HDF5</a>: A data model, library, and file format for storing and managing data.
|
||||
$ <a href="http://www.minixml.org/">minixml</a>: A small <code>XML</code> library that can be used to read and write <code>XML</code> and <code>XML</code> -like data files. <em>Required version ≥ 2.2</em>
|
||||
$ <a href="http://www.nexusformat.org/">NeXus</a>: A common data format for neutron, x-ray, and muon science. <em>Required version ≥ 4.4</em>
|
||||
Additionally, <span class='foswikiRedFG'>only if</span> <code>musrfit</code> should support reading of data files in the <code>NeXus</code> format the following libraries are needed: <dl>
|
||||
<dt> HDF4 </dt><dd> A library and multi-object file format for storing and managing data (see <a href="http://www.hdfgroup.org/products/hdf4/">HDF4</a>). HDF4 is "outdated" and its support will soon be dropped.
|
||||
</dd> <dt> HDF5 </dt><dd> A data model, library, and file format for storing and managing data (see <a href="http://www.hdfgroup.org/HDF5/">HDF5</a>).
|
||||
</dd> <dt> minixml </dt><dd> A small <code>XML</code> library that can be used to read and write <code>XML</code> and <code>XML</code> -like data files. <em>Required version ≥ 2.2</em> (see <a href="http://www.minixml.org/">minixml</a>).
|
||||
</dd> <dt> NeXus </dt><dd> A common data format for neutron, x-ray, and muon science. <em>Required version ≥ 4.4</em> (see <a href="http://www.nexusformat.org/">NeXus</a>).
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
If optionally the editor and graphical user interface <code><a href="MusrGui.html">musrgui</a></code> / <code><a href="MusrGui.html">musredit</a></code> is going to be installed there is one further requirement:
|
||||
$ <a href="http://qt.nokia.com/">Qt</a>: A cross-platform application and user interface framework. <em>Required version ≥ 3.3 & ≪ 4.0 (<code>musrgui</code>) <strong>OR</strong> ≥ 4.6 (<code>musredit</code>)</em>
|
||||
If optionally the editor and graphical user interface <code><a href="MusrGui.html">musrgui</a></code> / <code><a href="MusrGui.html">musredit</a></code> is going to be installed there is one further requirement: <dl>
|
||||
<dt> Qt </dt><dd> A cross-platform application and user interface framework. ≥ 4.6 (<code>musredit</code>) (see <a href="http://qt.io/">Qt</a>).
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Each of the following sections focusing on the installation of <code>musrfit</code> on the different operating systems will also give a brief introduction on the installation of the requirements before the actual <code>musrfit</code> installation is described.
|
||||
<p></p>
|
||||
@ -224,28 +247,27 @@ When dealing with a distribution that uses the dpkg/apt package manager like <a
|
||||
<p></p>
|
||||
For <strong>Qt4</strong>:
|
||||
<pre class="bash">
|
||||
$ apt-get install git cmake libboost-dev libgsl0-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-dev
|
||||
$ apt-get install git cmake libboost-dev libgsl-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-dev
|
||||
</pre>
|
||||
<p></p>
|
||||
For <strong>Qt5</strong>:
|
||||
<pre class="bash">
|
||||
$ apt-get install git cmake libboost-dev libgsl0-dev libfftw3-dev libxml2-dev qt5-default qtbase5-dev libqt5svg5-dev libqt5webkit5-dev
|
||||
$ apt-get install git cmake libboost-dev libgsl-dev libfftw3-dev libxml2-dev qt5-default qtbase5-dev libqt5svg5-dev libqt5webkit5-dev
|
||||
</pre>
|
||||
<p></p>
|
||||
Everyone should know best himself which is the way to install distribution software on the chosen distribution <img class='smily' src='../pub/Main/SmiliesPluginPSI/wink.gif' alt='wink' title='wink' />
|
||||
<p></p>
|
||||
In case the distribution does not include the required software it has to be compiled from the source files which normally means to download the source code from the corresponding website, to unpack the source tree and call the following from the shell:
|
||||
<pre class="bash">
|
||||
$ ./configure
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
In order to obtain some information about the possible options for the installation, calling <code>./configure --help</code> might give some useful hints. <br>
|
||||
In case the distribution does not include the required software it has to be compiled from the source files.
|
||||
This means either to download the source code from the corresponding website, or to clone the git repo. If you
|
||||
need to follow this line, please check the install details of the corresponding package.
|
||||
<p></p>
|
||||
For any further information on the standard installation of software, please refer to the web search engine of choice and ask for "install software on linux"...
|
||||
<p></p>
|
||||
<h3 id="A_3.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 3.1.2 Installation of <code><b>NeXus</b></code> requirements (optional) </h3>
|
||||
<span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading/writing data files in the <code>NeXus</code> format the further <a class="foswikiCurrentTopicLink" href="#ReqSwNeXus">required</a> software has to be set up. The required libraries and header files could either be available through the user's GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on Red Hat-like systems binary packages for <code>MXML</code>, <code>HDF4</code>, and <code>HDF5</code> might be called <code><b>mxml, mxml-devel, hdf, hdf-devel, hdf5, hdf5-devel</b></code>, on Debian-like systems <code><b>libmxml1, libmxml-dev, libhdf4-dev, libhdf5-dev</b></code>.
|
||||
<p></p>
|
||||
<strong>Note:</strong> <strong>HDF4</strong> support within <code>NeXus</code> will be dropped by <code>musrfit</code> in the near future. If you not urgently need to read old <code>ISIS</code> <code>NeXus</code> files, you safely can drop it.
|
||||
<p></p>
|
||||
<strong>Only <code><b>NeXus</b></code> Version >= 4.4 is support!</strong>
|
||||
<p></p>
|
||||
Even though there might exist binary packages for the <code>NeXus</code> library, it is best to build and install it directly from the source code which can be found <a href="https://github.com/nexusformat/code">here</a>.
|
||||
@ -262,8 +284,11 @@ A brief instruction how to get <code>NeXus</code> compiled from source:
|
||||
$ # next we will build NeXus out-of-source
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
# The next line only if HDF4 support is needed
|
||||
$ cmake -DENABLE_HDF5=1 -DENABLE_HDF4=1 -DENABLE_MXML=1 ../code
|
||||
$ make
|
||||
# The next line if HDF4 support is NOT needed
|
||||
$ cmake -DENABLE_HDF5=1 -DENABLE_MXML=1 ../code
|
||||
$ cmake --build ./ --clean-first
|
||||
$ # make install needs either to be carried out as root or sudo depending on your linux flavour.
|
||||
$ sudo make install
|
||||
</pre>
|
||||
@ -277,9 +302,9 @@ For RPM based systems (RedHat, Fedora, etc) this will likely to be <strong>libX1
|
||||
$ yum install libX11-devel libXft-devel libXpm-devel libXext-devel
|
||||
</pre>
|
||||
<p></p>
|
||||
For a dpkg/apt based system (Debian, Ubuntu, etc) this will likely to be <strong>libX11-dev</strong>, <strong>libxft-dev</strong>, <strong>libxpm-dev</strong>, and <strong>libxext-dev</strong>:
|
||||
For a dpkg/apt based system (Debian, Ubuntu, etc) this will likely to be <strong>libx11-dev</strong>, <strong>libxft-dev</strong>, <strong>libxpm-dev</strong>, and <strong>libxext-dev</strong>:
|
||||
<pre class="bash">
|
||||
$ apt-get install libX11-dev libxft-dev libxpm-dev libxext-dev
|
||||
$ apt-get install libx11-dev libxft-dev libxpm-dev libxext-dev
|
||||
</pre>
|
||||
<p></p>
|
||||
Also make sure that you have installed all required packages listed under <a class="foswikiCurrentTopicLink" href="#ReqSw">Required Software</a> (e.g. fftw, gsl, etc).
|
||||
@ -300,10 +325,10 @@ For the following it is assumed that <code>ROOT</code> shall be installed under
|
||||
$ mkdir root_build
|
||||
$ cd root_build
|
||||
$ cmake ../ -Dgminimal=ON -Dasimage=ON -Dmathmore=On -Dminuit2=ON -Dxml=ON -DCMAKE_INSTALL_PREFIX=../root_exec
|
||||
$ # next will be the make. If running on a multicore CPU you can speed up tremendously by calling
|
||||
$ # make with the option -j <number>, where <number> is the number of threads which you want to give,
|
||||
$ # e.g. make -j8
|
||||
$ make
|
||||
$ # next will be the make called via cmake. If running on a multicore CPU you can speed up tremendously by calling
|
||||
$ # it with the option -j <number>, where <number> is the number of threads which you want to give,
|
||||
$ # e.g. cmake --build ./ --clean-first -- -j8
|
||||
$ cmake --build ./ --clean-first
|
||||
$ # as a last step of the ROOT build process we need to install it
|
||||
$ make install
|
||||
</pre>
|
||||
@ -323,7 +348,7 @@ If an update of <code>ROOT</code> is needed, simple do the following:<pre class=
|
||||
$ cd $HOME/Apps/root
|
||||
$ git pull
|
||||
$ cd root_build
|
||||
$ make
|
||||
$ cmake --build ./ --clean-first
|
||||
</pre>
|
||||
<p></p>
|
||||
<span id="MusrFitInstallation"></span>
|
||||
@ -346,23 +371,42 @@ or
|
||||
<strong>Note 1:</strong> <code>musrfit</code> has moved from svn to git. In case you still have an <em>old</em> svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link:
|
||||
<a href="http://www.git-tower.com/blog/git-for-subversion-users-cheat-sheet/">Git for Subversion Users - A Cheat Sheet</a>.
|
||||
<p></p>
|
||||
<strong>Note 2:</strong> after cloning the <code>musrfit</code> repo you will automatically be on the root6 branch. If you want to get legacy ROOT 5.34.xx support, you will needed to switch branches first.
|
||||
<strong>Note 2:</strong> after cloning the <code>musrfit</code> repo you will automatically be on the <strong>root6</strong> branch. If you want to get legacy ROOT 5.34.xx support, you will needed to switch branches first.
|
||||
<p></p>
|
||||
<strong>Update:</strong>
|
||||
If a local repository clone is already present (it needs to be newer than Dec. 2016), one can update it using:
|
||||
<pre class="bash">
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ git pull
|
||||
$ # the new version now needs to be compiled and installed
|
||||
</pre>
|
||||
Now, depending whether you follow the automake or cmake tool chain you do
|
||||
<p></p>
|
||||
<strong>automake toolchain</strong>:
|
||||
<pre class="bash">
|
||||
$ make uninstall
|
||||
$ make clean
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
<p></p>
|
||||
or
|
||||
<p></p>
|
||||
<strong>cmake toolchain</strong>:
|
||||
<pre class="bash">
|
||||
$ cd build
|
||||
$ xargs rm < install_manifest.txt
|
||||
$ cmake --build ./ --clean-first
|
||||
$ make install
|
||||
</pre>
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.
|
||||
<p></p>
|
||||
<h3 id="A_3.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 3.2.1 <code><b>musrfit</b></code> build with <code><b>automake</b></code> </h3>
|
||||
<p></p>
|
||||
After the source-code extraction the <strong>autogen.sh</strong> script is called to prepare the build environment. If it has been executed successfully the <strong>configure</strong> script should be ready to collect all the information needed to create the Makefiles. <span class='foswikiRedFG'>If <code>musrfit</code> should support <code>NeXus</code> data files this has to be enabled by specifying the <strong>--enable-NeXus</strong> switch when calling <strong>configure</strong>.</span> For an overview of all available options just call <code>./configure --help</code>. Besides the standard options there are a few special options which should be mentioned here:
|
||||
<p></p> <dl>
|
||||
<dt> --prefix </dt><dd> Specify the installation prefix, e.g. /opt/root-system (<em>by default: /usr/local</em>)
|
||||
</dd> <dt> --with-rootsys </dt><dd> Specify the top of the <code>ROOT</code> installation directory, e.g. /opt/root-system
|
||||
<dt> --prefix </dt><dd> Specify the installation prefix, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
|
||||
</dd> <dt> --with-rootsys </dt><dd> Specify the top of the <code>ROOT</code> installation directory, e.g. $ROOTSYS if already defined
|
||||
</dd> <dt> --with-fftw3 </dt><dd> Specify the prefix of the <code>FFTW3</code> installation. e.g. /usr/local or /usr
|
||||
</dd> <dt> --with-gsl </dt><dd> Set the prefix of the <code>GSL</code> installation, e.g. /usr/local or /usr
|
||||
</dd> <dt> --with-boostinc </dt><dd> Set the path to the header files of the <code>Boost</code> installation, e.g. /usr/local/include or /usr/include
|
||||
@ -387,19 +431,50 @@ When the <strong>configure</strong> script has been called successfully everythi
|
||||
$ make install
|
||||
$ /sbin/ldconfig # (as superuser)
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3 id="A_3.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 3.2.2 <code><b>musrfit</b></code> build with <code><b>cmake</b></code> </h3>
|
||||
<p></p>
|
||||
Currently the following configuration switches for <code>musrfit</code> are available:
|
||||
<p></p> <dl>
|
||||
<dt> -DCMAKE_INSTALL_PREFIX=<prefix-path> </dt><dd> Specify the installation prefix, i.e. the place where <code>musrfit</code> shall be installed, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
|
||||
</dd> <dt> -Dnexus=<value> </dt><dd> enable/disable the support of <code>NeXus</code> data files (<em>requires the <code>HDF4</code>, <code>HDF5</code> and <code>NeXus</code> libraries to be installed</em>). <value>=1 enables <code>NeXus</code>, <value>=0 disables <code>NeXus</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>NeXus</code> support is <strong>disabled</strong>.
|
||||
</dd> <dt> -DASlibs=<value> </dt><dd> enable/disable the <code>ASlibs</code>. <value>=1 enables the <code>ASlibs</code>, <value>=0 disables the <code>ASlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>ASlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
|
||||
</dd> <dt> -DBMWlibs=<value> </dt><dd> enable/disable the <code>BMWlibs</code>. <value>=1 enables the <code>BMWlibs</code>, <value>=0 disables the <code>BMWlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BMWlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
|
||||
</dd> <dt> -DBNMRlibs=<value> </dt><dd> enable/disable the <code>BNMRlibs</code>. <value>=1 enables the <code>BNMRlibs</code>, <value>=0 disables the <code>BNMRlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BNMRlibs</code> support is <strong>disabled</strong>.
|
||||
</dd> <dt> -Dqt_based_tools=<value> </dt><dd> Will try to get musredit, musrWiz, musrStep, and mupp installed, if <code>Qt</code> is found. By default this is <strong>enabled</strong>. Again <value>=0 means disabled, <value>=1 enabled.
|
||||
</dd> <dt> -Dqt_version=<value> </dt><dd> Allows to specify which <code>Qt</code> version shall be tried. <value> can take the values: <code>AUTO</code>, 3, 4, 5. If the value is set to <code>AUTO</code>, this highest installed version is chosen, otherwise the specified version is used.
|
||||
</dd> <dt> -Dtry_OpenMP=<value> </dt><dd> Will check if <code>OpenMP</code> support is possible, and if yes use it. The default is <strong>enabled</strong>
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>-DCMAKE_INSTALL_PREFIX</strong>. <code>musrfit</code> build with <code>cmake</code> takes the out-of-source approach. Therefore a typical configuration / make / install process including <code>NeXus</code> support would look like
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
$ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -Dnexus=1
|
||||
# below it is assumed that multiple cores are present, hence the -j8 option
|
||||
$ cmake --build ./ --clean-first -- -j8
|
||||
$ make install
|
||||
$ /sbin/ldconfig # (as superuser)
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3 id="A_3.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 3.2.3 <code><b>musrfit</b></code> last step of the installation </h3>
|
||||
<p></p>
|
||||
In order to finish the installation of <code>musrfit</code> two more things should be done: <ul>
|
||||
<li> Define the <strong>MUSRFITPATH</strong> environment variable containing the path to the <code>musrfit</code> executables and XML files. E.g. if the location of the example above is used append the following line to the <strong>~/.bashrc</strong> and <strong>~/.bash_profile</strong> (and then either restart the shell or call the same commands once more from the shell): <pre class="bash">
|
||||
export MUSRFITPATH=/opt/root-system/bin
|
||||
export MUSRFITPATH=$ROOTSYS/bin
|
||||
</pre>
|
||||
</li> <li> Adjust the paths where <code>musrfit</code> will search for data files in the installed <strong>musrfit_startup.xml</strong>. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<span id="MusrGuiInstallLinux"></span>
|
||||
<h2 id="A_3.3_61_61musredit_61_61"> 3.3 <code><b>musredit</b></code> </h2>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically if <code>Qt4.6</code> or higher is set up on the machine. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:</span>
|
||||
<p></p>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically the highest available Qt version. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt5" option or install this editor separately:</span>
|
||||
<pre class="bash">
|
||||
$ cd $HOME/Apps/musrfit/src/musredit
|
||||
$ # for some distributions you will need qmake-qt4 for the next command
|
||||
$ cd $HOME/Apps/musrfit/src/musredit_qt5
|
||||
$ # for some distributions you will need qmake-qt5 for the next command
|
||||
$ qmake musredit.pro
|
||||
</pre>
|
||||
If everything went fine <code>musredit</code> can be compiled and installed:
|
||||
@ -410,7 +485,7 @@ If everything went fine <code>musredit</code> can be compiled and installed:
|
||||
In case one does not like the executable <strong>musredit</strong> to be copied to the default installation directory $ROOTSYS/bin the last "make install" can be skipped and the executable can be copied somewhere else instead. However, the <strong>musredit_startup.xml</strong> should go to the installation directory <strong>MUSRFITPATH</strong> of the <code>musrfit</code> executables.
|
||||
Eventually, in the installed <strong>musredit_startup.xml</strong> the path specifications should be adjusted to match the local <code>musrfit</code> installation. For detailed information on this XML file refer to the <a href="MusrGui.html#MusrguiStartupXml">manual</a>.
|
||||
<p></p>
|
||||
<h2 id="A_3.4_61_61musrgui_61_61"> 3.4 <code><b>musrgui</b></code> </h2>
|
||||
<h2 id="A_3.4_61_61musrgui_61_61_40obsolete_41"> 3.4 <code><b>musrgui</b></code> (obsolete) </h2>
|
||||
If <code>Qt4.6</code> or higher is not available but <code>Qt3</code> is set up <code>musrgui</code> can be installed. For this please follow the instructions for the <a class="foswikiCurrentTopicLink" href="#MusrGuiInstallLinux">musredit installation</a> where simply every <code>musredit</code> occurrence has to be replaced by <code>musrgui</code>.<br>
|
||||
If there are problems during the <code>qmake</code> step, e.g. "uic: File generated with too old version of Qt Designer", this most probably means the <code>Qt4</code> version of qmake is being used. In order to use the <code>Qt3</code> version it should be enough to specify the full path to its location when calling it. Within the most GNU/Linux distributions this location will be something like /usr/lib/qt-3.3/bin/qmake.
|
||||
<p></p>
|
||||
@ -550,6 +625,8 @@ If the repository had been checked out already before, one can update the local
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.
|
||||
<p></p>
|
||||
<h3 id="A_4.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 4.2.1 <code><b>musrfit</b></code> build with <code><b>automake</b></code> </h3>
|
||||
<p></p>
|
||||
After the source-code extraction the <strong>autogen.sh</strong> script is called to prepare the build environment. If it has been executed successfully the <strong>configure</strong> script should be ready to collect all the information needed to create the Makefiles. <span class='foswikiRedFG'>If <code>musrfit</code> should support <code>NeXus</code> data files this has to be enabled by specifying the <nobr><b>--enable-static</b></nobr> <nobr><b>--enable-NeXus</b></nobr> switches when calling <strong>configure</strong>.</span> For an overview of all available options just call <code>./configure --help</code>. Besides the standard options there are a few special options which should be mentioned here:
|
||||
<p></p> <dl>
|
||||
<dt> --prefix </dt><dd> Specify the installation prefix, e.g. /opt/root-system (<em>by default: /usr/local</em>)
|
||||
@ -577,7 +654,37 @@ When the <strong>configure</strong> script has been called successfully everythi
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> (/cygdrive/c/root/bin/musrfit_startup.xml or C:\root\bin\musrfit_startup.xml). The paths have to obey the <code>POSIX</code> naming convention. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
<p></p>
|
||||
<h3 id="A_4.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 4.2.2 <code><b>musrfit</b></code> build with <code><b>cmake</b></code> </h3>
|
||||
<p></p>
|
||||
Currently the following configuration switches for <code>musrfit</code> are available:
|
||||
<p></p> <dl>
|
||||
<dt> -DCMAKE_INSTALL_PREFIX=<prefix-path> </dt><dd> Specify the installation prefix, i.e. the place where <code>musrfit</code> shall be installed, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
|
||||
</dd> <dt> -Dnexus=<value> </dt><dd> enable/disable the support of <code>NeXus</code> data files (<em>requires the <code>HDF4</code>, <code>HDF5</code> and <code>NeXus</code> libraries to be installed</em>). <value>=1 enables <code>NeXus</code>, <value>=0 disables <code>NeXus</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>NeXus</code> support is <strong>disabled</strong>.
|
||||
</dd> <dt> -DASlibs=<value> </dt><dd> enable/disable the <code>ASlibs</code>. <value>=1 enables the <code>ASlibs</code>, <value>=0 disables the <code>ASlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>ASlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
|
||||
</dd> <dt> -DBMWlibs=<value> </dt><dd> enable/disable the <code>BMWlibs</code>. <value>=1 enables the <code>BMWlibs</code>, <value>=0 disables the <code>BMWlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BMWlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
|
||||
</dd> <dt> -DBNMRlibs=<value> </dt><dd> enable/disable the <code>BNMRlibs</code>. <value>=1 enables the <code>BNMRlibs</code>, <value>=0 disables the <code>BNMRlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BNMRlibs</code> support is <strong>disabled</strong>.
|
||||
</dd> <dt> -Dqt_based_tools=<value> </dt><dd> Will try to get musredit, musrWiz, musrStep, and mupp installed, if <code>Qt</code> is found. By default this is <strong>enabled</strong>. Again <value>=0 means disabled, <value>=1 enabled.
|
||||
</dd> <dt> -Dqt_version=<value> </dt><dd> Allows to specify which <code>Qt</code> version shall be tried. <value> can take the values: <code>AUTO</code>, 3, 4, 5. If the value is set to <code>AUTO</code>, this highest installed version is chosen, otherwise the specified version is used.
|
||||
</dd> <dt> -Dtry_OpenMP=<value> </dt><dd> Will check if <code>OpenMP</code> support is possible, and if yes use it. The default is <strong>enabled</strong>
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>-DCMAKE_INSTALL_PREFIX</strong>. <code>musrfit</code> build with <code>cmake</code> takes the out-of-source approach. Therefore a typical configuration / make / install process including <code>NeXus</code> support would look like
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
$ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -Dnexus=1
|
||||
# below it is assumed that multiple cores are present, hence the -j8 option
|
||||
$ cmake --build ./ --clean-first -- -j8
|
||||
$ make install
|
||||
$ /sbin/ldconfig # (as superuser)
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3 id="A_4.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 4.2.3 <code><b>musrfit</b></code> last step of the installation </h3>
|
||||
<p></p>
|
||||
In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> (/cygdrive/c/root/bin/musrfit_startup.xml or C:\root\bin\musrfit_startup.xml). The paths have to obey the POSIX naming convention. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
<p></p>
|
||||
<span id="MusrEditInstallCygwin"></span>
|
||||
<h2 id="A_4.3_61_61musredit_61_61"> 4.3 <code><b>musredit</b></code> </h2>
|
||||
@ -625,20 +732,21 @@ In this case, try to do the following: Close all Cygwin programs (including the
|
||||
</pre>
|
||||
If this does not resolve the problem, try to change the compatibility settings of <strong>C:\cygwin\bin\sh.exe</strong> and <strong>C:\cygwin\bin\bash.exe</strong> so that they are executed with administrator privileges.
|
||||
<p></p>
|
||||
<h1 id="A_5_Mac_OS_X"> 5 Mac OS X </h1>
|
||||
<h1 id="A_5_Mac_OS_X_47_macOS"> 5 Mac OS X / macOS </h1>
|
||||
<p></p>
|
||||
With Mac OS X the situation is up to some extent similar like on MS Windows but still different since Mac OS X is a UNIX system. The similarity is that also on OS X a helping framework—<i>either</i> <code><a href="http://www.macports.org/">MacPorts</a></code> <em>or</em> <code><a href="http://www.finkproject.org/">Fink</a></code>—which provides open-source software is employed to fulfill the basic software requirements of <code>musrfit</code>. <span class='foswikiRedFG'>In the following, both possibilities (using <code>MacPorts</code> or <code>Fink</code>) are described but it is emphasized here that it should be followed <em>only one of the possible routes</em>.
|
||||
With Mac OS X / macOS the situation is up to some extent similar like on MS Windows but still different since Mac OS X is a UNIX system. The similarity is that also on OS X a helping framework—<i>either</i> <code><a href="http://www.macports.org/">MacPorts</a></code> <em>or</em> <code><a href="http://www.finkproject.org/">Fink</a></code>—which provides open-source software is employed to fulfill the basic software requirements of <code>musrfit</code>. <span class='foswikiRedFG'>In the following, both possibilities (using <code>MacPorts</code> or <code>Fink</code>) are described but it is emphasized here that it should be followed <em>only one of the possible routes</em> </span>.
|
||||
<p></p>
|
||||
WARNING: The instruction for <code>Fink</code> haven't been updated/tested for quite a while and likely are slightly outdated.
|
||||
</span>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<h2 id="A_5.1_Requirements_40_61_61MacPorts_61_61_41"> 5.1 Requirements (<code><b>MacPorts</b></code>) </h2>
|
||||
<h3 id="A_5.1.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"> 5.1.1 Everything but <code><b>ROOT</b></code> and <code><b>NeXus</b></code> </h3>
|
||||
Before proceeding with the usage of the <code><a href="http://www.macports.org/">MacPorts</a></code> system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:
|
||||
$ <a href="http://developer.apple.com/technology/tools.html">Xcode tools</a>: Useful developer tools including for instance the GNU compiler collection. Starting from XCode >= 4.3 the command line tools need to be installed manually. <dl>
|
||||
<dt> X11 </dt><dd> The X-window system (automatically installed on 10.5 Leopard and 10.6 Snow Leopard). For 10.7 and higher you also will need to install <code><a href="http://xquartz.macosforge.org/trac">XQuartz</a></code>
|
||||
Before proceeding with the usage of the <code><a href="http://www.macports.org/">MacPorts</a></code> system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed: <dl>
|
||||
<dt> Xcode </dt><dd> Useful developer tools including for instance the GNU compiler collection. It can be installed via the Apple App store. Starting from XCode >= 4.3 the command line tools need to be installed manually. The necessary command line tools can be installed via the following commands entered in the terminal<pre class="bash">
|
||||
$ xcode-select --install
|
||||
$ sudo xcodebuild -license
|
||||
</pre>
|
||||
</dd> <dt> X11 </dt><dd> The X-window system (automatically installed on 10.5 Leopard and 10.6 Snow Leopard). For 10.7 and higher you also will need to install <code><a href="http://xquartz.macosforge.org/trac">XQuartz</a></code>
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
After installing the Xcode tools go to the <a href="http://www.macports.org/install.php">MacPorts install page</a>, download the installer for your system and follow the installation instructions on the page. By default the <code>MacPorts</code> system will be installed in <strong>/opt/local</strong>.<br>
|
||||
@ -663,9 +771,9 @@ file:///Users/username/dports
|
||||
Then the <code>MacPorts</code> system should be set up and can be used to install additional software.<br>
|
||||
The installation of the software mentioned <a class="foswikiCurrentTopicLink" href="#ReqSw">above</a> is then done in the terminal:
|
||||
<pre class="bash">
|
||||
$ sudo port -v install pkgconfig autoconf automake libtool fftw-3 fftw-3-single gsl boost libxml2 qt4-mac
|
||||
$ sudo port -v install pkgconfig autoconf automake libtool cmake fftw-3 fftw-3-single gsl boost libxml2 qt5 qt5-qtsvg qt5-qtwebengine
|
||||
</pre>
|
||||
With <code><b>qt4-mac</b></code>, <code>musredit</code> will be installed. If it happens that you used <code>musrgui</code> in the past, please change over to <code>musredit</code> since there will be <strong>no</strong> further development for <code>musrgui</code> anymore!
|
||||
With <code><b>qt5</b></code>, <code>musredit</code> will be installed. If it happens that you used <code>musrgui</code> in the past, please change over to <code>musredit</code> since there will be <strong>no</strong> further development for <code>musrgui</code> anymore!
|
||||
<p></p>
|
||||
<h3 id="A_5.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 5.1.2 Installation of <code><b>NeXus</b></code> requirements (optional) </h3>
|
||||
<p></p>
|
||||
@ -697,6 +805,17 @@ Unfortunately, the <code>minixml</code> and <code>NeXus</code> libraries have to
|
||||
<h3 id="A_5.1.3_61_61ROOT_61_61"> 5.1.3 <code><b>ROOT</b></code> </h3>
|
||||
ROOT 5.34/xx is supported as legacy version only! <strong>The default now will be ROOT 6.xx/yy!</strong>
|
||||
<p></p>
|
||||
<h4 id="A_5.1.3.1_61_61ROOT_61_61_installed_via_package_installer"> 5.1.3.1 <code><b>ROOT</b></code> installed via package installer </h4>
|
||||
The lazy way to get <code>ROOT</code> installed is via package installer. If your macOS is directly supported by the <code>ROOT</code> people you can download the package installer from the <code>ROOT</code> <a href="https://root.cern.ch/downloading-root">download page</a>. Choose the latest <code>ROOT</code> release and download you macOS version dmg-file, e.g. for macOS 10.12 (Sierra) it is at the time of writting <code>root_v6.10.02.macosx64-10.12-clang81.dmg</code>. After the installation <code>ROOT</code> will be installed under <code>/Application</code> as owner <code>root</code>. In order to ease your life for the steps to follow and assuming you are the only guy working on your Mac, you could change the <code>owner</code> and <code>group</code> of the <code>ROOT</code> directory:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ cd /Applications
|
||||
$ sudo chown -R <username> root_v6.10.02
|
||||
$ sudo chgrp -R staff root_v6.10.02
|
||||
$ sudo ln -s root_v6.10.02 root
|
||||
</pre>
|
||||
<p></p>
|
||||
<h4 id="A_5.1.3.2_61_61ROOT_61_61_installed_from_source"> 5.1.3.2 <code><b>ROOT</b></code> installed from source </h4>
|
||||
The best way to get <code>ROOT</code> exactly the way needed for <code>musrfit</code> is to install it from source. Before describing it, please make sure that you have installed all required packages listed under <a class="foswikiCurrentTopicLink" href="#ReqSw">Requested Software</a> (e.g. fftw, gsl, etc).
|
||||
<p></p>
|
||||
For the following it is assumed that <code>ROOT</code> shall be installed under <code>$HOME/Applications</code>. If you want to install it somewhere else, just systematically replace the related terms of the following description. For the following list of commands the '$' will be given, the command prompt. Do <strong>not</strong> enter it! Also some comments will be added starting with a '#' which can be omitted. They are only there to explain what is going on.
|
||||
@ -705,9 +824,9 @@ For the following it is assumed that <code>ROOT</code> shall be installed under
|
||||
$ git clone http://root.cern.ch/git/root.git
|
||||
$ cd root
|
||||
$ git tag -l
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v6-08-xx
|
||||
$ # where xx is the highest listed number, e.g. v6-08-06
|
||||
$ git checkout -b v6-08-06 v6-08-06
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v6-10-xx
|
||||
$ # where xx is the highest listed number, e.g. v6-10-02
|
||||
$ git checkout -b v6-10-02 v6-10-02
|
||||
$ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
|
||||
$ # We will use the cmake out-of-source approach here.
|
||||
$ mkdir root_build
|
||||
@ -723,11 +842,12 @@ For the following it is assumed that <code>ROOT</code> shall be installed under
|
||||
<p></p>
|
||||
For further details see <a href="https://root.cern.ch/building-root">Installing ROOT from Source</a>.
|
||||
<p></p>
|
||||
<h4 id="A_5.1.3.3_Setting_up_Environment_Variables_for_61_61ROOT_61_61_and_61_61musrfit_61_61"> 5.1.3.3 Setting up Environment Variables for <code><b>ROOT</b></code> and <code><b>musrfit</b></code> </h4>
|
||||
Since Apple in its wisdom decided that programs started from a shell are treated differently than apps if it is coming to system variables, we need to work harder compared to a Linux system.
|
||||
<p></p>
|
||||
<strong>For Mac OS X < 10.8:</strong>
|
||||
<p></p>
|
||||
In order to finalize the <code>ROOT</code> installation and to prepare already the installation of <code>musrfit</code> and <code>musrgui</code> / <code>musredit</code> this is a good time for setting necessary environment variables for the use in Mac OS X. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file <strong>~/.MacOSX/environment.plist</strong> and <span class='foswikiRedFG'>re-login</span>:<br>
|
||||
In order to finalize the <code>ROOT</code> installation and to prepare already the installation of <code>musrfit</code> and <code>musrgui</code> / <code>musredit</code> this is a good time for setting necessary environment variables for the use in Mac OS X. Here it assumed that you installed <code>ROOT</code> from source. If you downloaded the binary package, you will need to adopt the paths accordingly. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file <strong>~/.MacOSX/environment.plist</strong> and <span class='foswikiRedFG'>re-login</span>:<br>
|
||||
<pre class="html">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
@ -748,17 +868,30 @@ In order to finalize the <code>ROOT</code> installation and to prepare already t
|
||||
One needs to add some system variables in <strong>~/.profile</strong>:
|
||||
<pre class="bash">
|
||||
export ROOTSYS=$HOME/Applications/root/root_exec
|
||||
launchctl setenv ROOTSYS $ROOTSYS
|
||||
export MUSRFITPATH=$ROOTSYS/bin
|
||||
launchctl setenv MUSRFITPATH $MUSRFITPATH
|
||||
export PATH=$ROOTSYS/bin:$QTDIR/bin:$PATH
|
||||
export LD_LIBRARY_PATH=$ROOTSYS/lib:$LD_LIBRARY_PATH
|
||||
|
||||
launchctl setenv ROOTSYS $ROOTSYS
|
||||
launchctl setenv MUSRFITPATH $MUSRFITPATH
|
||||
launchctl setenv PATH $PATH
|
||||
launchctl setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH
|
||||
</pre>
|
||||
<p></p>
|
||||
After this you will need to `execute' <code>.profile</code> before proceeding:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ source $HOME/.profile
|
||||
</pre>
|
||||
<h2 id="A_5.2_Requirements_40_61_61Fink_61_61_41"> 5.2 Requirements (<code><b>Fink</b></code>) </h2>
|
||||
<h3 id="A_5.2.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"> 5.2.1 Everything but <code><b>ROOT</b></code> and <code><b>NeXus</b></code> </h3>
|
||||
Before proceeding with the usage of the <code><a href="http://www.finkproject.org/">Fink</a></code> system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:
|
||||
$ <a href="http://developer.apple.com/technology/tools.html">Xcode tools</a>: Useful developer tools including for instance the GNU compiler collection <dl>
|
||||
<dt> X11 </dt><dd> The X-window-system (automatically installed on 10.5 Leopard and 10.6 Snow Leopard)
|
||||
<p></p> <dl>
|
||||
<dt> <strong>Xcode</strong> </dt><dd> Useful developer tools including for instance the GNU compiler collection. It can be installed via the Apple App Store. Starting from XCode >= 4.3 the command line tools need to be installed manually. The necessary command line tools can be installed via the following commands entered in the terminal:<pre class="bash">
|
||||
$ xcode-select --install
|
||||
$ sudo xcodebuild -license
|
||||
</pre>
|
||||
</dd> <dt> <strong>X11</strong> </dt><dd> The X-window-system (automatically installed on 10.5 Leopard and 10.6 Snow Leopard)
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
After installing the Xcode tools go to the <a href="http://www.finkproject.org/download/index.php?phpLang=en">Fink download page</a>, download the installer for your system and follow the installation instructions on the page.
|
||||
@ -773,9 +906,11 @@ After applying the changes above to the configuration file, the <code>Fink</code
|
||||
Then the <code>Fink</code> system should be set up and can be used to install additional software.<br>
|
||||
The <code>Fink</code> installer package also contains a graphical user interface called <code>FinkCommander</code> and it is suggested to use that for installing the following packages (or packages with revisions close to the following)—it is necessary to compile a few packages from source since no binary packages are available, however, this is done automatically by the <code>FinkCommander</code> after you have chosen the software packages for installation:
|
||||
<p></p>
|
||||
<code><b>autoconf automake boost1.41.nopython boost1.41.nopython-shlibs fftw3 fftw3-shlibs gsl gsl-shlibs libtool2 libtool2-shlibs libxml2 libxml2-bin libxml2-shlibs pkgconfig qt3mac qt3mac-shlibs</b></code>
|
||||
<pre class="bash">
|
||||
autoconf automake cmake boost1.63-nopython boost1.63.nopython-shlibs fftw3 fftw3-shlibs gsl gsl-shlibs libtool2 libtool2-shlibs libxml2 libxml2-bin libxml2-shlibs pkgconfig qt5-mac-qtbase qt5-mac-qtbase-dev-tools qt5-mac-qtsvg qt5-mac-qtsvg-shlibs qt5-mac-qtwebengine qt5-mac-qtwebengine-shlibs qt5-mac-qtwebenginecore-shlibs qt5-mac-qtwebenginewidgets-shlibs
|
||||
</pre>
|
||||
<p></p>
|
||||
Under OS X 10.6 Snow Leopard it will not be possible to install <code><b>qt3mac</b></code> since the system is by default a 64-bit system and the old <code><b>qt3-mac</b></code> depends on software which is only available for 32-bit systems. It is suggested to install <code><b>qt4mac</b></code> instead and use <code>musredit</code>.
|
||||
Under OS X 10.6 Snow Leopard it will not be possible to install <code><b>qt3mac</b></code> since the system is by default a 64-bit system and the old <code><b>qt3-mac</b></code> depends on software which is only available for 32-bit systems. It is suggested to install <code><b>qt5-mac</b></code> instead and use <code>musredit</code>.
|
||||
<p></p>
|
||||
Also, due to some not fulfilled dependencies, it might not be possible to install FFTW3 through Fink. In this case (<span class='foswikiRedFG'>and ONLY in THIS case</span>) simply download the FFTW3 source code from <a href="http://www.fftw.org/download.html">its download page</a> and install it from a terminal using the following commands (for the FFTW version 3.x.y):
|
||||
<pre class="bash">
|
||||
@ -790,13 +925,15 @@ Since later on the <code>boost</code> header files should be used and in the sta
|
||||
<pre class="bash">
|
||||
$ ln -sf /sw/include/boost-x_yy_z/boost /sw/include/boost
|
||||
</pre>
|
||||
where <strong>x_yy_z</strong> has to be substituted by the correct version number, e.g. <strong>1_41_0</strong>.
|
||||
where <strong>x_yy_z</strong> has to be substituted by the correct version number, e.g. <strong>1_63_0</strong>.
|
||||
<p></p>
|
||||
<h3 id="A_5.2.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 5.2.2 Installation of <code><b>NeXus</b></code> requirements (optional) </h3>
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading data files in the <code>NeXus</code> format the further <a class="foswikiCurrentTopicLink" href="#ReqSwNeXus">required</a> packages can be installed through <code>Fink</code>:
|
||||
<span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading data files in the <code>NeXus</code> format the further <a class="foswikiCurrentTopicLink" href="#ReqSwNeXus">required</a> packages can be installed through <code>Fink</code> (check for the most recent versions):
|
||||
<p></p>
|
||||
<code><b>libjpeg hdf hdf5-18 hdf5-18-shlibs</b></code>
|
||||
<pre class="bash">
|
||||
libjpeg hdf hdf5-cpp11 hdf5-cpp11-shlibs
|
||||
</pre>
|
||||
<p></p>
|
||||
Unfortunately, the <code>minixml</code> and <code>NeXus</code> libraries have to be compiled and installed directly from the source code. Given the respective version numbers of <strong>2.9</strong> and <strong>4.3.2</strong> (which are subject to change with time) this can be achieved for example by:
|
||||
<pre class="bash">
|
||||
@ -820,6 +957,21 @@ Unfortunately, the <code>minixml</code> and <code>NeXus</code> libraries have to
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3 id="A_5.2.3_61_61ROOT_61_61"> 5.2.3 <code><b>ROOT</b></code> </h3>
|
||||
<p></p>
|
||||
ROOT 5.34/xx is supported as legacy version only and will likely to be dropped in 2018. <strong>The default now is ROOT 6.xx/yy!</strong>
|
||||
<p></p>
|
||||
<h4 id="A_5.2.3.1_61_61ROOT_61_61_installed_via_package_installer"> 5.2.3.1 <code><b>ROOT</b></code> installed via package installer </h4>
|
||||
<p></p>
|
||||
The lazy way to get ROOT installed is via package installer. If your macOS is directly supported by the ROOT people you can download the package installer from the ROOT <a href="https://root.cern.ch/downloading-root">download page</a>. Choose the latest ROOT release and download you macOS version dmg-file, e.g. for macOS 10.12 (Sierra) it is at the time of writting root_v6.10.02.macosx64-10.12-clang81.dmg. After the installation ROOT will be installed under /Application as owner root. In order to ease your life for the steps to follow and assuming you are the only guy working on your Mac, you could change the owner and group of the ROOT directory:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ cd /Applications
|
||||
$ sudo chown -R <username> root_v6.10.02
|
||||
$ sudo chgrp -R staff root_v6.10.02
|
||||
$ sudo ln -s root_v6.10.02 root
|
||||
</pre>
|
||||
<h4 id="A_5.2.3.2_61_61ROOT_61_61_installed_from_source"> 5.2.3.2 <code><b>ROOT</b></code> installed from source </h4>
|
||||
<p></p>
|
||||
The best way to get <code>ROOT</code> exactly the way needed for <code>musrfit</code> is to install it from source. Before describing it, please make sure that you have installed all required packages listed under <a class="foswikiCurrentTopicLink" href="#ReqSw">Requested Software</a> (e.g. fftw, gsl, etc).
|
||||
<p></p>
|
||||
For the following it is assumed that <code>ROOT</code> shall be installed under <code>$HOME/Applications</code>. If you want to install it somewhere else, just systematically replace the related terms of the following description. For the following list of commands the '$' will be given, the command prompt. Do <strong>not</strong> enter it! Also some comments will be added starting with a '#' which can be omitted. They are only there to explain what is going on.
|
||||
@ -828,9 +980,9 @@ For the following it is assumed that <code>ROOT</code> shall be installed under
|
||||
$ git clone http://root.cern.ch/git/root.git
|
||||
$ cd root
|
||||
$ git tag -l
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v6-08-06
|
||||
$ # where xx is the highest listed number, e.g. v6-08-06
|
||||
$ git checkout -b v6-08-06 v6-08-06
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v6-10-02
|
||||
$ # where xx is the highest listed number, e.g. v6-10-02
|
||||
$ git checkout -b v6-10-06 v6-10-02
|
||||
$ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
|
||||
$ # the out-of-source approach will be followed
|
||||
$ mkdir root_build
|
||||
@ -845,11 +997,13 @@ For the following it is assumed that <code>ROOT</code> shall be installed under
|
||||
<p></p>
|
||||
For further details see <a href="http://root.cern.ch/drupal/content/installing-root-source">Installing ROOT from Source</a>.
|
||||
<p></p>
|
||||
<h4 id="A_5.2.3.3_Setting_up_Environment_Variables_for_61_61ROOT_61_61_and_61_61musrfit_61_61"> 5.2.3.3 Setting up Environment Variables for <code><b>ROOT</b></code> and <code><b>musrfit</b></code> </h4>
|
||||
<p></p>
|
||||
Since Apple in its wisdom decided that programs started from a shell are treated differently than apps if it is coming to system variables, we need to work harder compared to a Linux system.
|
||||
<p></p>
|
||||
<strong>For Mac OS X < 10.8:</strong>
|
||||
<p></p>
|
||||
In order to finalize the <code>ROOT</code> installation and to prepare already the installation of <code>musrfit</code> and <code>musrgui</code> / <code>musredit</code> this is a good time for setting necessary environment variables for the use in Mac OS X. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file <strong>~/.MacOSX/environment.plist</strong> and <span class='foswikiRedFG'>re-login</span>:<br>
|
||||
In order to finalize the <code>ROOT</code> installation and to prepare already the installation of <code>musrfit</code> and <code>musrgui</code> / <code>musredit</code> this is a good time for setting necessary environment variables for the use in Mac OS X. Here it assumed that you installed ROOT from source. If you downloaded the binary package, you will need to adopt the paths accordingly. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file <strong>~/.MacOSX/environment.plist</strong> and <span class='foswikiRedFG'>re-login</span>:<br>
|
||||
<pre class="html">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
@ -858,7 +1012,7 @@ In order to finalize the <code>ROOT</code> installation and to prepare already t
|
||||
<key>MUSRFITPATH</key>
|
||||
<string>$HOME/Applications/root/root_exec/bin</string> (where to find the musrfit executables)
|
||||
<key>QTDIR</key>
|
||||
<string>/opt/local/lib/qt3mac</string> (where to find Qt3 (for musrgui) or Qt4 (for musredit))
|
||||
<string>/sw/lib/qt5-mac</string> (where to find Qt5)
|
||||
<key>ROOTSYS</key>
|
||||
<string>$HOME/Applications/root/root_exec</string> (where to find the ROOT system)
|
||||
</dict>
|
||||
@ -870,10 +1024,24 @@ In order to finalize the <code>ROOT</code> installation and to prepare already t
|
||||
One needs to add some system variables in <strong>~/.profile</strong>:
|
||||
<pre class="bash">
|
||||
export ROOTSYS=$HOME/Applications/root/root_exec
|
||||
launchctl setenv ROOTSYS $ROOTSYS
|
||||
export MUSRFITPATH=$ROOTSYS/bin
|
||||
launchctl setenv MUSRFITPATH $MUSRFITPATH
|
||||
export QTDIR=/sw/lib/qt5-mac
|
||||
export PATH=$ROOTSYS/bin:$QTDIR/bin:$PATH
|
||||
export PKG_CONFIG_PATH=$QTDIR/lib/pkgconfig:$PKG_CONFIG_PATH
|
||||
export LD_LIBRARY_PATH=$ROOTSYS/lib:$QTDIR/lib:$LD_LIBRARAY_PATH
|
||||
|
||||
launchctl setenv ROOTSYS $ROOTSYS
|
||||
launchctl setenv MUSRFITPATH $MUSRFITPATH
|
||||
launchctl setenv QTDIR $QTDIR
|
||||
launchctl setenv PKG_CONFIG_PATH $PKG_CONFIG_PATH
|
||||
launchctl setenv PATH $PATH
|
||||
launchctl setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH
|
||||
</pre>
|
||||
<p></p>
|
||||
After this you will need to `execute' <code>.profile</code> before proceeding:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ source $HOME/.profile
|
||||
</pre>
|
||||
<h2 id="A_5.3_61_61musrfit_61_61"> 5.3 <code><b>musrfit</b></code> </h2>
|
||||
First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/Applications/musrfit this is achieved most easily calling from the terminal
|
||||
@ -904,6 +1072,8 @@ If a local repository clone is already present, one can update it using:
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.
|
||||
<p></p>
|
||||
<h3 id="A_5.3.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 5.3.1 <code><b>musrfit</b></code> build with <code><b>automake</b></code> </h3>
|
||||
<p></p>
|
||||
After the source-code extraction the <strong>autogen.sh</strong> script is called to prepare the build environment. If it has been executed successfully the <strong>configure</strong> script should be ready to collect all the information needed to create the Makefiles. <span class='foswikiRedFG'>If <code>musrfit</code> should support <code>NeXus</code> data files this has to be enabled by specifying the <strong>--enable-NeXus</strong> switch when calling <strong>configure</strong>.</span> For an overview of all available options just call <code>./configure --help</code>. Besides the standard options there are a few special options which should be mentioned here:
|
||||
<p></p> <dl>
|
||||
<dt> --prefix </dt><dd> Specify the installation prefix, e.g. /opt/root-system (<em>by default: /usr/local</em>)
|
||||
@ -933,11 +1103,47 @@ When the <strong>configure</strong> script has been called successfully everythi
|
||||
</pre>
|
||||
In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> ($ROOTSYS/bin/musrfit_startup.xml). For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
<p></p>
|
||||
<h3 id="A_5.3.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 5.3.2 <code><b>musrfit</b></code> build with <code><b>cmake</b></code> </h3>
|
||||
<p></p>
|
||||
Currently the following configuration switches for <code>musrfit</code> are available:
|
||||
<p></p> <dl>
|
||||
<dt> -DCMAKE_INSTALL_PREFIX=<prefix-path> </dt><dd> Specify the installation prefix, i.e. the place where <code>musrfit</code> shall be installed, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
|
||||
</dd> <dt> -Dnexus=<value> </dt><dd> enable/disable the support of <code>NeXus</code> data files (<em>requires the <code>HDF4</code>, <code>HDF5</code> and <code>NeXus</code> libraries to be installed</em>). <value>=1 enables <code>NeXus</code>, <value>=0 disables <code>NeXus</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>NeXus</code> support is <strong>disabled</strong>.
|
||||
</dd> <dt> -DASlibs=<value> </dt><dd> enable/disable the <code>ASlibs</code>. <value>=1 enables the <code>ASlibs</code>, <value>=0 disables the <code>ASlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>ASlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
|
||||
</dd> <dt> -DBMWlibs=<value> </dt><dd> enable/disable the <code>BMWlibs</code>. <value>=1 enables the <code>BMWlibs</code>, <value>=0 disables the <code>BMWlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BMWlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
|
||||
</dd> <dt> -DBNMRlibs=<value> </dt><dd> enable/disable the <code>BNMRlibs</code>. <value>=1 enables the <code>BNMRlibs</code>, <value>=0 disables the <code>BNMRlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BNMRlibs</code> support is <strong>disabled</strong>.
|
||||
</dd> <dt> -Dqt_based_tools=<value> </dt><dd> Will try to get musredit, musrWiz, musrStep, and mupp installed, if <code>Qt</code> is found. By default this is <strong>enabled</strong>. Again <value>=0 means disabled, <value>=1 enabled.
|
||||
</dd> <dt> -Dqt_version=<value> </dt><dd> Allows to specify which <code>Qt</code> version shall be tried. <value> can take the values: <code>AUTO</code>, 3, 4, 5. If the value is set to <code>AUTO</code>, this highest installed version is chosen, otherwise the specified version is used.
|
||||
</dd> <dt> -Dtry_OpenMP=<value> </dt><dd> Will check if <code>OpenMP</code> support is possible, and if yes use it. The default is <strong>enabled</strong>
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>-DCMAKE_INSTALL_PREFIX</strong>. <code>musrfit</code> build with <code>cmake</code> takes the out-of-source approach. Therefore a typical configuration / make / install process including <code>NeXus</code> support would look like
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
$ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -Dnexus=1
|
||||
# below it is assumed that multiple cores are present, hence the -j8 option
|
||||
$ cmake --build ./ --clean-first -- -j8
|
||||
$ make install
|
||||
$ /sbin/ldconfig # (as superuser)
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3 id="A_5.3.3_61_61musrfit_61_61_last_step_of_the_installation"> 5.3.3 <code><b>musrfit</b></code> last step of the installation </h3>
|
||||
<p></p>
|
||||
In order to finish the installation of <code>musrfit</code> two more things should be done: <ul>
|
||||
<li> Define the <strong>MUSRFITPATH</strong> environment variable containing the path to the <code>musrfit</code> executables and XML files. E.g. if the location of the example above is used append the following line to the <strong>~/.bashrc</strong> and <strong>~/.bash_profile</strong> (and then either restart the shell or call the same commands once more from the shell): <pre class="bash">
|
||||
export MUSRFITPATH=$ROOTSYS/bin
|
||||
</pre>
|
||||
</li> <li> Adjust the paths where <code>musrfit</code> will search for data files in the installed <strong>musrfit_startup.xml</strong>. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<span id="MusrGuiInstall"></span>
|
||||
<h2 id="A_5.4_61_61musredit_61_61"> 5.4 <code><b>musredit</b></code> </h2>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically if <code>Qt4.5</code> or higher is set up on the machine. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt4" option (<strong>MacPort</strong>: for Mac OS X < 10.11 this is likley <strong>/opt/local/libexec/qt4</strong>, for Mac OS X >= 10.11 this is likely <strong>/usr/local/libexec/qt4</strong>) or install this editor separately:</span>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically highest available Qt version. In case this is found, the editor <code>musredit</code> is built together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt5" option or install this editor separately:</span>
|
||||
<pre class="bash">
|
||||
$ cd ~/Apps/musrfit/src/musredit
|
||||
$ cd ~/Applications/musrfit/src/musredit_qt5
|
||||
$ qmake musredit.pro
|
||||
</pre>
|
||||
If everything went fine <code>musredit</code> can be compiled and installed:
|
||||
@ -950,7 +1156,7 @@ The last command copies <strong>musredit.app</strong> to the standard program di
|
||||
<h2 id="A_5.5_61_61musrgui_61_61_40obsolete_41"> 5.5 <code><b>musrgui</b></code> (obsolete) </h2>
|
||||
If <code>Qt3</code> is set up the installation of the <code>musrfit</code> editor can be done as follows from within the shell:
|
||||
<pre class="bash">
|
||||
$ cd ~/Apps/musrfit/src/musrgui
|
||||
$ cd ~/Applications/musrfit/src/musrgui
|
||||
$ qmake musrgui.pro
|
||||
$ make
|
||||
$ make install
|
||||
@ -990,7 +1196,7 @@ If <code>musrgui</code> has been installed, just open one of the <strong>test-&#
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'> > </span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a> > <a href="MusrFit.html">MusrFit</a><span class='foswikiSeparator'> > </span>MusrFitSetup <br />
|
||||
Topic revision: <span class='patternRevInfo'>27 Mar 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
Topic revision: <span class='patternRevInfo'>08 Jun 2018, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -1008,5 +1214,5 @@ Topic revision: <span class='patternRevInfo'>27 Mar 2017, <a href="https://intr
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:39 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
</html>
|
||||
390
doc/html/user/MUSR/MusrFitSetupDKS.html
Normal file
390
doc/html/user/MUSR/MusrFitSetupDKS.html
Normal file
@ -0,0 +1,390 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetupDKS?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
<title> MUSR :: MusrFitSetupDKS</title>
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
|
||||
<meta charset="utf-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.5, user-scalable=yes" />
|
||||
<meta name="mobile-web-app-capable" content="yes" />
|
||||
<meta name="mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<meta name="apple-mobile-web-app-capable" content="yes" />
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetupDKS?t=1528465296" type="application/x-wiki" title="edit MusrFitSetupDKS" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/colors.css');
|
||||
</style>
|
||||
<link rel='stylesheet' href='../pub/System/PatternSkinTheme2009/column_left.css' media='all' type='text/css' />
|
||||
<link rel='stylesheet' href='../pub/System/PatternSkinTheme2009/variant_twiki.css' media='all' type='text/css' /><style type="text/css" media="all">
|
||||
/* Styles that are set using variables */
|
||||
.patternBookView .foswikiTopRow,
|
||||
.patternWebIndicator,
|
||||
.patternWebIndicator a {
|
||||
background-color:#D0D0D0;
|
||||
}
|
||||
#patternTopBarContents { background-image:url(../pub/System/PatternSkin/header5.gif); background-repeat:repeat-x;}
|
||||
#patternTopBarContents { background-color:#ffffff;}
|
||||
.patternBookView {
|
||||
border-color:#D0D0D0;
|
||||
}
|
||||
.patternPreviewPage #patternMain {
|
||||
/* uncomment to set the preview image */
|
||||
/*background-image:url("/pub/System/PreviewBackground/preview2bg.gif");*/
|
||||
}
|
||||
</style>
|
||||
<style type="text/css" media="all">
|
||||
@import url("../pub/System/PsiSkin/psicolors.css");
|
||||
@import url("../pub/System/PsiSkin/psistyle.css");
|
||||
.foswikiTopic {overflow: hidden;}
|
||||
</style>
|
||||
|
||||
|
||||
|
||||
<link rel='stylesheet' href='../pub/System/PatternSkin/print.css' media='all' type='text/css' />
|
||||
<!--[if IE 7 ]><style type="text/css" media="screen">
|
||||
.foswikiAttachments,
|
||||
.foswikiForm,
|
||||
.foswikiHelp,
|
||||
.foswikiPreviewArea,
|
||||
.patternPreviewPage .foswikiForm,
|
||||
.patternSigLine,
|
||||
.patternToolBar,
|
||||
.patternTop,
|
||||
.patternTopicAction,
|
||||
#patternSideBarContents .patternLeftBarPersonal,
|
||||
#patternSideBarContents h2,
|
||||
#patternSideBarContents li,
|
||||
#patternTopBarButtons ul {
|
||||
height:1%;
|
||||
}
|
||||
#patternSideBarContents .patternLeftBarPersonal {
|
||||
width:100%;
|
||||
}
|
||||
.foswikiFormStep {
|
||||
height:100%;
|
||||
}
|
||||
#foswikiLogin {
|
||||
margin-left: 25%;
|
||||
margin-right: 25%;
|
||||
}
|
||||
#foswikiLogin .foswikiFormSteps {
|
||||
width:auto;
|
||||
}
|
||||
#foswikiLogin input[type="text"],
|
||||
#foswikiLogin input[type="password"] {
|
||||
width: auto;
|
||||
}
|
||||
.patternShadow {
|
||||
border:10px solid #fff;
|
||||
margin-top:10px;
|
||||
margin-bottom:10px;
|
||||
border:2px solid #ccc;
|
||||
}
|
||||
</style><![endif]-->
|
||||
<!--[if lte IE 9]>
|
||||
|
||||
<![endif]-->
|
||||
<!--[if gt IE 9]><!-->
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
<div id="patternPageShadow">
|
||||
<div id="patternPage">
|
||||
<div id="patternOuter" class="clear">
|
||||
<div id="patternFloatWrap">
|
||||
<div id="patternMain">
|
||||
<div id="patternMainContents">
|
||||
<div class="patternContent"><div class="foswikiTopic"> <h1 id="Setting_up_61musrfit_61_47_61DKS_61:_high_speed_fitting_with_GPU_39s"> Setting up <code>musrfit</code> / <code>DKS</code>: high speed fitting with GPU's </h1>
|
||||
<p></p>
|
||||
<div class="foswikiToc" id="foswikiTOC"> <ul>
|
||||
<li> <a href="MusrFitSetupDKS.html#Setting_up_61musrfit_61_47_61DKS_61:_high_speed_fitting_with_GPU_39s"> Setting up musrfit / DKS: high speed fitting with GPU's </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_1_Setting_up_61_61musrfit_47DKS_61_61_for_a_Tesla_K40c_40NVIDIA_41"> 1 Setting up musrfit/DKS for a Tesla K40c (NVIDIA) </a> <ul>
|
||||
<li> <a href="MusrFitSetupDKS.html#A_1.1_Driver_Installation_for_the_Tesla_K40c"> 1.1 Driver Installation for the Tesla K40c </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_1.2_Installation_of_CUDA"> 1.2 Installation of CUDA </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_1.3_Installation_of_DKS"> 1.3 Installation of DKS </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_1.4_Installation_of_61musrfit_61_for_DKS"> 1.4 Installation of musrfit for DKS </a> <ul>
|
||||
<li> <a href="MusrFitSetupDKS.html#A_1.4.1_Install_via_61_61automake_61_61"> 1.4.1 Install via automake </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_1.4.2_Install_via_61_61cmake_61_61"> 1.4.2 Install via cmake </a>
|
||||
</li></ul>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_2_Setting_up_61_61musrfit_47DKS_61_61_for_a_AMD_Graphic_Card_40Radeon_R9_390X_41"> 2 Setting up musrfit/DKS for a AMD Graphic Card (Radeon R9 390X) </a> <ul>
|
||||
<li> <a href="MusrFitSetupDKS.html#A_2.1_Driver_Installation_for_an_AMD_Graphic_Card_44_e.g._Radeon_R9_390X"> 2.1 Driver Installation for an AMD Graphic Card, e.g. Radeon R9 390X </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_2.2_AMD_APP_Software_Development_Kit_40SDK_41_to_enable_OpenCL_support"> 2.2 AMD APP Software Development Kit (SDK) to enable OpenCL support </a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_2.3_Installation_of_DKS_and_61musrfit_61"> 2.3 Installation of DKS and musrfit </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html#A_3_Setting_up_61_61musrfit_47DKS_61_61_for_macOS_for_OpenCL_support"> 3 Setting up musrfit/DKS for macOS for OpenCL support </a>
|
||||
</li></ul>
|
||||
</div>
|
||||
<p></p>
|
||||
In the years 2016/2017 we explored ways to speed up current fitting frameworks, especially <code>musrfit</code>. This allows now to analyze histogram sets of high field spectrometers like HAL-9500 at PSI without the error-prone RRF fitting (see U. Locans and A. Suter, " <code>musrfit</code> - Real Time Parameter Fitting Using GPUs", accepted for the proceedings of the muSR2017 conference in Sapporo, and the Memo from A. Suter, "Rotating Reference Frame Fits", in the <code>musrfit</code> source code). At the same time it can help to speed-up elaborate global fits tremendously, and dealing properly with muonium. It also allows Apple Mac users to speed up their fitting code on the CPU. Currently it is not straight forward to get <code>musrfit</code> multi-threaded under macOS since Apple doesn't be default support OpenMP. DKS enables <code>musrfit</code> to utilize OpenCL instead which is present on macOS by default.
|
||||
<p></p>
|
||||
<strong>Warning</strong>: before you run into the shop to buy a gamer graphic card or a Tesla card, make sure that you have an appropriate server with a sufficiently strong power supply!
|
||||
<p></p>
|
||||
<strong>However, the current <code>musrfit/DKS</code> version doesn't yet support all theory functions on the GPU.</strong> In case the theory function is not yet available for the GPU, <code>musrfit</code> will fall back to the CPU implementation.
|
||||
<p></p>
|
||||
Conceptually the setup of <code>musrfit/DKS</code> is as following: <ol>
|
||||
<li> install the latest hardware driver for your graphic card.
|
||||
</li> <li> install the GPU SDK which enables number crunching (CUDA for NVIDIA, OpenCL for AMD)
|
||||
</li> <li> install DKS
|
||||
</li> <li> install the musrfit version which is DKS ready
|
||||
</li></ol>
|
||||
<p></p>
|
||||
In the following the description for the installation of <code>musrfit/DKS</code> for the following systems will be discussed in some more detail: <ul>
|
||||
<li> NVIDIA Tesla K40c
|
||||
</li> <li> AMD Graphic Card (Radeon R9 390X)
|
||||
</li> <li> macOS in order to get OpenCL support
|
||||
</li></ul>
|
||||
<p></p>
|
||||
The <strong>usage</strong> of <code>musrfit</code> with GPU acceleration and OpenCL support is described in the <a href="MusrFit.html">'User manual of the μSR data analysis software <code>musrfit</code> '</a>. The additional <code>musrfit</code> / DKS commands are labelled in <span class='foswikiMaroonFG'> <strong>MAROON</strong> </span>.
|
||||
<p></p>
|
||||
<h1 id="A_1_Setting_up_61_61musrfit_47DKS_61_61_for_a_Tesla_K40c_40NVIDIA_41"> 1 Setting up <code><b>musrfit/DKS</b></code> for a Tesla K40c (NVIDIA) </h1>
|
||||
<p></p>
|
||||
It is assumed that the Tesla K40c is already physically installed on your system. For now I only will discuss to set it up for a Linux based system. In order to check that your operating systems see the card, enter the following command in the terminal:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ lspci | grep NVIDIA
|
||||
</pre>
|
||||
<p></p>
|
||||
On the response you should find something like
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
05:00.0 3D controller: NVIDIA Corporation GK110BGL [Tesla K40c] (rev a1)
|
||||
</pre>
|
||||
<p></p>
|
||||
which means that the OS physically recognises your card.
|
||||
<p></p>
|
||||
<h2 id="A_1.1_Driver_Installation_for_the_Tesla_K40c"> 1.1 Driver Installation for the Tesla K40c </h2>
|
||||
<p></p>
|
||||
Next, you will need to download and install the driver for your card. Select the proper operating system, card, etc. from the <a href="http://www.nvidia.com/Download/index.aspx?lang=en-us">NVIDIA download center</a>. At PSI we are running currently Red Hat Enterprise Linux 7.x (RHEL) for which we will get a rpm (something like <code>nvidia-diag-driver-local-repo-rhel7-375.66-1.x86_64.rpm</code>). Install it and make sure there is no conflict with the nouveau driver of the system.
|
||||
<p></p>
|
||||
<h2 id="A_1.2_Installation_of_CUDA"> 1.2 Installation of CUDA </h2>
|
||||
<p></p>
|
||||
Download the <a href="https://developer.nvidia.com/cuda-downloads">CUDA SDK</a> form NVIDIA for your system. Again, for the RHEL 7.x this is an rpm. After the installation of the rpm you should reboot your machine. Afterwards you are ready for the installation of DKS.
|
||||
<p></p>
|
||||
<span id="DksInstall"></span>
|
||||
<h2 id="A_1.3_Installation_of_DKS"> 1.3 Installation of DKS </h2>
|
||||
<p></p>
|
||||
For the following list of commands the '$' will be given as the command prompt. Do not enter it! Also some comments will be added starting with a '#' which can be omitted. They are only there to explain what is going on.
|
||||
<code>DKS</code> stands for Dynamical Kernel Scheduler and provides a thin interface allowing host applications to incorporate GPU's and other hardware accelerators.
|
||||
<p></p>
|
||||
Details can be found in the papers listed <a href="CiteMusrFit.html">here</a>, or on the <a href="https://gitlab.psi.ch/uldis_l/DKS/wikis/home">DKS wiki page</a>.
|
||||
<p></p>
|
||||
In brief the installation should be something like this:<pre class="bash">
|
||||
# go to whatever directory you would like to clone/install DKS
|
||||
# For macOS DKS will likely to got to $HOME/Applications to be consistent with the musrfit docu for macOS
|
||||
$ cd $HOME/Apps
|
||||
$ git clone https://gitlab.psi.ch/uldis_l/DKS.git
|
||||
$ cd DKS
|
||||
$ mkdir build
|
||||
$ cd build
|
||||
$ cmake ../ -DENABLE_MUSR=1 -DCMAKE_INSTALL_PREFIX=../exec
|
||||
$ cmake --build ./ --clean-first
|
||||
$ make install
|
||||
</pre>
|
||||
<p></p>
|
||||
Since <code>DKS</code> is installed in a non-standard path, a couple of additional small steps are required. This will be different for Linux compared to macOS.
|
||||
<p></p>
|
||||
For <strong>Linux</strong>:
|
||||
<p></p>
|
||||
add the <code>DKS</code> library path to <code>/etc/ld.so.conf.d/musrfit-x86_64.conf</code> and execute as super user
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ /sbin/ldconfig
|
||||
</pre>
|
||||
<p></p>
|
||||
For <strong>macOS</strong>:
|
||||
<p></p>
|
||||
add the <code>DKS</code> path to <code>$HOME/.profile</code>:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
export DKS=$HOME/Applications/DKS/exec
|
||||
export LD_LIBRARY_PATH=$DKS/lib:$LD_LIBRARY_PATH
|
||||
|
||||
launchctl setenv DKS $DKS
|
||||
launchctl setenv LD_LIBRARY_PATH $LD_LIBRARY_PATH
|
||||
</pre>
|
||||
<p></p>
|
||||
<h2 id="A_1.4_Installation_of_61musrfit_61_for_DKS"> 1.4 Installation of <code>musrfit</code> for DKS </h2>
|
||||
<p></p>
|
||||
Most of the installation steps are the same as described for <a href="MusrFitSetup.html"><code>musrfit</code></a> without GPU support.
|
||||
Here only the differences are explained. First checkout <code>musrfit</code>, then you will need to switch the working branch which is done by<pre class="bash">
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ git checkout dks6
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3 id="A_1.4.1_Install_via_61_61automake_61_61"> 1.4.1 Install via <code><b>automake</b></code> </h3>
|
||||
<p></p>
|
||||
The configure script for <code>musrfit</code> has now a couple of more tags/options, which are: <dl>
|
||||
<dt> <code><b>--enable-dks</b></code> </dt><dd> by default this is set to <code><b>no</b></code>, hence if you want to have GPU support you need to enable it.
|
||||
</dd> <dt> <code><b>--with-cuda</b></code> </dt><dd> with this tag you tell the configure script where it can find CUDA
|
||||
</dd> <dt> <code><b>--with-opencl</b></code> </dt><dd> with this tag you tell the configure script where it can find OpenCL
|
||||
</dd> <dt> <code><b>--with-dks</b></code> </dt><dd> with this tag you tell the configure script where it can find <code>DKS</code>
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
For a typical setup on a RHEL system it could look like this
|
||||
<pre class="bash">
|
||||
$ ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks=$HOME/Apps/DKS/exec --enable-dks --prefix=$ROOTSYS
|
||||
</pre>
|
||||
whereas for macOS it would typically look like this
|
||||
<pre class="bash">
|
||||
$ ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks=$HOME/Applications/DKS/exec --enable-dks --prefix=$ROOTSYS
|
||||
</pre>
|
||||
After
|
||||
<pre class="bash">
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
and updating the shared library lookup table (only needed for Linux)
|
||||
<pre class="bash">
|
||||
/sbin/ldconfig # as superuser / root
|
||||
</pre>
|
||||
you are done with the setup.
|
||||
<p></p>
|
||||
<h3 id="A_1.4.2_Install_via_61_61cmake_61_61"> 1.4.2 Install via <code><b>cmake</b></code> </h3>
|
||||
<p></p>
|
||||
There is on more configuration switch
|
||||
<p></p> <dl>
|
||||
<dt> <code>-Ddks=<value> </dt><dd> it allows to enable/disable =DKS</code> support. The default is <value>=1, i.e. <strong>enabled</strong>. To disable use <value>=0.
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
For a typical setup on a RHEL system it could look like this
|
||||
<pre class="bash">
|
||||
$ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -DASlibs=1 -DBMWlibs=1 -Dnexus=1
|
||||
</pre>
|
||||
whereas for macOS it would typically look like this
|
||||
<pre class="bash">
|
||||
$ cmake ../ -DCMAKE_INSTALL_PREFIX=$ROOTSYS -DASlibs=1 -DBMWlibs=1 -Dnexus=1
|
||||
</pre>
|
||||
<p></p>
|
||||
After
|
||||
<pre class="bash">
|
||||
$ cmake --build ./ --clean-first
|
||||
$ make install
|
||||
</pre>
|
||||
and updating the shared library lookup table (only needed for Linux)
|
||||
<pre class="bash">
|
||||
/sbin/ldconfig # as superuser / root
|
||||
</pre>
|
||||
you are done with the setup.
|
||||
<p></p>
|
||||
<h1 id="A_2_Setting_up_61_61musrfit_47DKS_61_61_for_a_AMD_Graphic_Card_40Radeon_R9_390X_41"> 2 Setting up <code><b>musrfit/DKS</b></code> for a AMD Graphic Card (Radeon R9 390X) </h1>
|
||||
<p></p>
|
||||
<h2 id="A_2.1_Driver_Installation_for_an_AMD_Graphic_Card_44_e.g._Radeon_R9_390X"> 2.1 Driver Installation for an AMD Graphic Card, e.g. Radeon R9 390X </h2>
|
||||
<p></p>
|
||||
This will depend slightly on the AMD Card and operating system. Here I will summaries how it was done on a RHEL (Linux) system using a Radeon R9 390X.
|
||||
<p></p>
|
||||
It is assumed that the Radeon R9 390X is already physically installed on your system. For now I only will discuss to set it up for a Linux based system. In order to check that your operating systems see the card, enter the following command in the terminal:
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
$ lspci | grep NVIDIA
|
||||
</pre>
|
||||
<p></p>
|
||||
On the response you should find something like
|
||||
<pre class="bash">
|
||||
84:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Hawaii XT / Grenada XT [Radeon R9 290X/390X] (rev 80)
|
||||
</pre>
|
||||
which means that the OS physically recognises your card.
|
||||
<p></p>
|
||||
For RHEL7.x the AMDGPU-PRO driver should be used. It can be downloaded from <a href="http://support.amd.com/en-us/kb-articles/Pages/AMDGPU-PRO-RedHat-Install.aspx">here</a>.
|
||||
Unpack the driver
|
||||
<pre class="bash">
|
||||
$ tar -Jxvf amdgpu-pro-17.10-414273.tar.xz
|
||||
$ cd amdgpu-pro-17.10-414273
|
||||
</pre>
|
||||
<p></p>
|
||||
Install the driver as root
|
||||
<pre class="bash">
|
||||
$ ./amdgpu-pro-install --compute -y
|
||||
</pre>
|
||||
<p></p>
|
||||
Here I assume that the AMD graphic card is only used for computation. You need to add the following command in order that the user 'blabla' (chance this to the appropriate user name) can access the GPU (otherwise only root works):
|
||||
<pre class="bash">
|
||||
$ /sbin/usermod -a -G video blabla
|
||||
</pre>
|
||||
<p></p>
|
||||
Reboot the machine.
|
||||
<p></p>
|
||||
<h2 id="A_2.2_AMD_APP_Software_Development_Kit_40SDK_41_to_enable_OpenCL_support"> 2.2 AMD APP Software Development Kit (SDK) to enable OpenCL support </h2>
|
||||
<p></p>
|
||||
The AMD APP Software Development Kit (SDK) is a complete development platform created by AMD to allow you to quickly and easily develop applications accelerated by AMD APP technology. The SDK provides samples, documentation, and other materials to quickly get you started leveraging accelerated compute using OpenCL or <code>C++ AMP</code> in your <code>C/C++</code> applications.
|
||||
<p></p>
|
||||
Download the AMD APP SDK 3.0 from <a href="http://developer.amd.com/tools-and-sdks/opencl-zone/amd-accelerated-parallel-processing-app-sdk/">here</a>.
|
||||
<p></p>
|
||||
Extract the installer
|
||||
<pre class="bash">
|
||||
$ tar -xvjf AMD-APP-SDKInstaller-v3.0.130.136-GA-linux64.tar.bz2
|
||||
</pre>
|
||||
<p></p>
|
||||
Run the installer
|
||||
<pre class="bash">
|
||||
$ ./AMD-APP-SDK-v3.0.130.136-GA-linux64.sh
|
||||
</pre>
|
||||
<p></p>
|
||||
This will install the AMD APP SDK to /opt/AMDAPPSDK-3.0/ where you can find the OpenCL include and library files, as well as documentation and sample code.
|
||||
The install guide for AMD OpenCL SDK can be found <a href="http://developer.amd.com/wordpress/media/2012/10/AMD_APP_SDK_InstallationNotes.pdf">here</a>.
|
||||
<p></p>
|
||||
<h2 id="A_2.3_Installation_of_DKS_and_61musrfit_61"> 2.3 Installation of DKS and <code>musrfit</code> </h2>
|
||||
<p></p>
|
||||
To install DKS and <code>musrfit</code> follow the instructions <a class="foswikiCurrentTopicLink" href="#DksInstall">here</a>.
|
||||
<p></p>
|
||||
<h1 id="A_3_Setting_up_61_61musrfit_47DKS_61_61_for_macOS_for_OpenCL_support"> 3 Setting up <code><b>musrfit/DKS</b></code> for macOS for OpenCL support </h1>
|
||||
<p></p>
|
||||
Since Apple is not providing an out-of-the-box OpenMP support on their macOS compiler framework (Xcode), typically <code>musrfit</code> is just running single threaded. Here DKS can help since it delivers OpenCL support which is present on macOS. Hence, if you would like to run <code>musrfit</code> multi-threaded the easiest way is to use DKS.
|
||||
<p></p>
|
||||
Since there is no graphic card involved, you do not need any graphic card driver of additional SDK. The only thing you need DKS and the proper <code>musrfit</code> version.
|
||||
<p></p>
|
||||
The installation instruction for DKS / <code>musrfit</code> can be found <a class="foswikiCurrentTopicLink" href="#DksInstall">here</a>.
|
||||
<p></p>
|
||||
-- <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a> - June 8, 2018</div>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'> > </span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a><span class='foswikiSeparator'> > </span>MusrFitSetupDKS <br />
|
||||
Topic revision: <span class='patternRevInfo'>08 Jun 2018, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><div id="patternBottomBar"><div id="patternBottomBarContents"><div id="patternWebBottomBar"><span class="foswikiRight"> <a href="http://foswiki.org/"><img src="../pub/System/ProjectLogos/foswiki-badge.png" alt="This site is powered by Foswiki" title="This site is powered by Foswiki" /></a></span>Copyright © by the contributing authors. All material on this collaboration platform is the property of the contributing authors. <br /> Ideas, requests, problems regarding PSI Wiki? <a href='mailto:thomas.buecklers@psi.ch?subject=PSI Wiki %20Feedback%20on%20MUSR.MusrFitSetupDKS'>Send feedback</a></div></div></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div></div><!-- /endWrap -->
|
||||
<p></p>
|
||||
<!-- Piwik -->
|
||||
|
||||
<noscript><p><img src="../piwik/piwikf832.gif?idsite=7" style="border:0" alt=""></p></noscript>
|
||||
<!-- End Piwik Tag -->
|
||||
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetupDKS?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:33 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:51 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,12 +14,11 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1494785296" type="application/x-wiki" title="edit MusrGui" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1528465296" type="application/x-wiki" title="edit MusrGui" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
<base /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
body .foswikiTable {border-width:1px}
|
||||
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
|
||||
body .foswikiTable td {border-style:solid none; vertical-align:top}
|
||||
@ -33,6 +32,11 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
|
||||
</style><!--TABLEPLUGIN_default-->
|
||||
<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<style class='head TABLEPLUGIN_specific' type="text/css" media="all">
|
||||
body .foswikiTable#tableMusrGui1 td {vertical-align:middle; vertical-align:top}
|
||||
body .foswikiTable#tableMusrGui1 td.foswikiTableCol0 {text-align:left}
|
||||
@ -50,11 +54,7 @@ body .foswikiTable#tableMusrGui1 th a:hover {color:#0066cc; background-color:#ff
|
||||
body .foswikiTable#tableMusrGui1 th.foswikiSortedCol {background-color:#eeeeee}
|
||||
body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
|
||||
body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
|
||||
</style><!--TABLEPLUGIN_specific-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
</style><!--TABLEPLUGIN_specific--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -135,18 +135,18 @@ body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::TWISTY-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::TWISTY--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
@ -531,5 +531,5 @@ Topic revision: <span class='patternRevInfo'>14 May 2017, <a href="https://intr
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:38 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:20 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:39 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,13 +14,11 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1494785293" type="application/x-wiki" title="edit MusrRoot" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1528465295" type="application/x-wiki" title="edit MusrRoot" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<style class='head TABLEPLUGIN_default' type="text/css" media="all">
|
||||
body .foswikiTable {border-width:1px}
|
||||
@ -36,6 +34,9 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
|
||||
</style><!--TABLEPLUGIN_default-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
|
||||
<style class='head TABLEPLUGIN_specific' type="text/css" media="all">
|
||||
body .foswikiTable#tableMusrRoot7 td {vertical-align:middle; vertical-align:top}
|
||||
body .foswikiTable#tableMusrRoot7 td.foswikiTableCol0 {text-align:left}
|
||||
@ -54,8 +55,7 @@ body .foswikiTable#tableMusrRoot7 th.foswikiSortedCol {background-color:#eeeeee}
|
||||
body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
|
||||
body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
|
||||
</style><!--TABLEPLUGIN_specific-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -138,16 +138,16 @@ body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JQUERYPLUGIN::TWISTY-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::METADATA-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
|
||||
<!--JQUERYPLUGIN::CHILI-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::TWISTY--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
@ -1125,5 +1125,5 @@ Topic revision: <span class='patternRevInfo'>29 Mar 2012, suter_a</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:26 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:45 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:33 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:50 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,14 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1494785296" type="application/x-wiki" title="edit QuickStart" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1528465296" type="application/x-wiki" title="edit QuickStart" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -101,15 +101,15 @@
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
@ -285,5 +285,5 @@ Topic revision: <span class='patternRevInfo'>10 Jul 2011, wojek</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:33 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:50 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:30 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:47 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,7 +14,7 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1494785295" type="application/x-wiki" title="edit TutorialSingleHisto" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1528465296" type="application/x-wiki" title="edit TutorialSingleHisto" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
@ -32,6 +32,12 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
|
||||
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
|
||||
</style><!--TABLEPLUGIN_default-->
|
||||
<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<style class='head TABLEPLUGIN_specific' type="text/css" media="all">
|
||||
body .foswikiTable#tableTutorialSingleHisto1 td {vertical-align:middle; vertical-align:top}
|
||||
body .foswikiTable#tableTutorialSingleHisto1 td.foswikiTableCol0 {text-align:left}
|
||||
@ -49,13 +55,7 @@ body .foswikiTable#tableTutorialSingleHisto1 th a:hover {color:#0066cc; backgrou
|
||||
body .foswikiTable#tableTutorialSingleHisto1 th.foswikiSortedCol {background-color:#eeeeee}
|
||||
body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
|
||||
body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
|
||||
</style><!--TABLEPLUGIN_specific-->
|
||||
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
</style><!--TABLEPLUGIN_specific--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -138,12 +138,12 @@ body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswik
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JQUERYPLUGIN::TWISTY-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
@ -401,5 +401,5 @@ Topic revision: <span class='patternRevInfo'>02 Sep 2011, wojek</span></div>
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:08:33 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:50 GMT -->
|
||||
</html>
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html><html lang="en">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:10 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:27 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -14,14 +14,14 @@
|
||||
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1494785300" type="application/x-wiki" title="edit WebHome" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1528465299" type="application/x-wiki" title="edit WebHome" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<base /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
|
||||
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
|
||||
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
|
||||
<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/PatternSkinTheme/layout.css');
|
||||
@import url('../pub/System/PatternSkinTheme2009/style.css');
|
||||
@ -101,15 +101,15 @@
|
||||
|
||||
<!--<![endif]-->
|
||||
<!--JQUERYPLUGIN-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::MIGRATE-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI-->
|
||||
<!--JQUERYPLUGIN::LIVEQUERY-->
|
||||
<!--JavascriptFiles/foswikiString-->
|
||||
<!--JavascriptFiles/foswikiPref-->
|
||||
<!--JavascriptFiles/foswikiForm-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
|
||||
<!--PatternSkin/pattern-->
|
||||
<!--JQUERYPLUGIN::COMMENT-->
|
||||
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
|
||||
</head>
|
||||
<body class="foswikiNoJs patternViewPage patternPrintPage">
|
||||
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
|
||||
@ -125,9 +125,10 @@
|
||||
<li> <a href="CiteMusrFit.html">How to cite <code>musrfit</code>? <img class='smily' src='../pub/Main/SmiliesPluginPSI/yes.gif' alt='yes' title='yes' /> </a>
|
||||
</li> <li> <a href="TutorialSingleHisto.html">Single-histogram-fit tutorial for <code>musrfit</code> introducing the basic features of the programs and <code>msr</code> files</a>
|
||||
</li> <li> <a href="MusrFit.html">User manual of the μSR data analysis software <code>musrfit</code> </a>
|
||||
</li> <li> <a href="MusrFitSetup.html">Setting up <code>musrfit</code> on Different Platforms <img src="../pub/System/DocumentGraphics/new.png" alt="NEW" title="NEW" width="30" height="16" /> <strong><span class='foswikiRedFG'>ROOT6!</span></strong></a>
|
||||
</li> <li> <a href="MusrFitSetup.html">Setting up <code>musrfit</code> on Different Platforms</a>
|
||||
</li> <li> <a href="MusrFitSetupDKS.html">Setting up <code>musrfit</code> / <code>DKS</code>: high speed fitting with GPU's</a>
|
||||
</li> <li> <a href="QuickStart.html">Quick start page for <code>WKM</code> users</a>
|
||||
</li> <li> <a href="MusrGui.html">Documentation of <code>musrgui</code>/<code>musredit</code>—editors interfacing <code>musrfit</code> <img src="../pub/System/DocumentGraphics/updated.png" alt="UPDATED" title="UPDATED" width="55" height="16" /></a>
|
||||
</li> <li> <a href="MusrGui.html">Documentation of <code>musrgui</code>/<code>musredit</code>—editors interfacing <code>musrfit</code></a>
|
||||
</li> <li> <a href="Msr2Data.html">Documentation of <code>msr2data</code>—a program for automatically processing multiple musrfit <code>msr</code> files</a>
|
||||
</li> <li> <a href="MusrFit.html#Any2Many"><code>any2many</code>—a universal μSR-file-format converter</a>
|
||||
</li> <li> <a href="MusrRoot.html"><code>MusrRoot</code>: an extensible open file format for μSR</a>
|
||||
@ -138,12 +139,12 @@
|
||||
</li> <li> <a href="MusrFitAcknowledgements.html">Acknowledgements</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
-- <a href="http://www.psi.ch/low-energy-muons/people">AS</a> & (<a href="http://www.fsf.org/register_form?referrer=8369">BMW</a>) - last update May 14, 2017</div>
|
||||
-- <a href="http://www.psi.ch/low-energy-muons/people">AS</a> & (<a href="http://www.fsf.org/register_form?referrer=8369">BMW</a>) - last update June 8, 2018</div>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'> > </span>WebHome <br />
|
||||
Topic revision: <span class='patternRevInfo'>14 May 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
Topic revision: <span class='patternRevInfo'>08 Jun 2018, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -161,5 +162,5 @@ Topic revision: <span class='patternRevInfo'>14 May 2017, <a href="https://intr
|
||||
|
||||
</body>
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Sun, 14 May 2017 18:09:12 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:28 GMT -->
|
||||
</html>
|
||||
Loading…
x
Reference in New Issue
Block a user