add a stretched Kubo-Toyabe function to the PTheory class, including an update of the docu. Motivated by Z. Salman, which also provided a patch, which needed some improvements.
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 15 Jan 2013 11:56:28 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 10 Sep 2013 08:47:44 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@@ -8,11 +8,12 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<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=1358250917" type="application/x-wiki" title="edit Msr2Data" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1378802792" 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="WebRsshtml.html" />
|
||||
<base /><!--[if IE]></base><![endif]-->
|
||||
<link rel='stylesheet' href='../pub/System/ImagePlugin/style.css' media='all' />
|
||||
<style type="text/css" media="all">
|
||||
@import url('../pub/System/SkinTemplates/base.css');
|
||||
</style>
|
||||
@@ -135,7 +136,7 @@ pre {
|
||||
<p></p>
|
||||
<a name="IntroDuction"></a>
|
||||
<h1><a name="A_1_Introduction"></a> 1 Introduction </h1>
|
||||
<code>msr2data</code> (originally written by B. M. Wojek) is a program implemented in <code>C++</code>. Its purpose is to process multiple <code><a href="MusrFit.html">musrfit</a></code> msr files with the same parameters and summarize the fitting results either in a TRIUMF <strong>DB</strong> <a name="FootNote1text"></a><span class="FootNoteTextLink" title=" For an abridged description of this format see <a href="http://musr.org/xyfit/dbformat.html" target="_top">here</a>. The <strong>DB</strong> files produced by <code>msr2data</code> can be viewed for instance with <a href="http://musr.org/muview/" target="_top">μView</a>, however, they are <em>not completely</em> backward-compatible to the original "db language" since the parameter names can be longer than five or six characters! In order to establish this backward compatibility (if needed) the user has to ensure the correct length of the parameter names in the msr files!"><a href="#FootNote1note" class="foswikiCurrentTopicLink">(1)</a></span> or a <strong>column ASCII</strong> file. It evolved from a script called <code>mlog2db</code> which has been written only for collecting fit results of <a href="http://lmu.web.psi.ch/lem/" target="_top">LEM</a> data stored in mlog files generated by <code>musrfit</code> and putting them together in a file with the <strong>DB</strong> format for further analysis. Therefore, any peculiarities, e.g. in supplying options to <code>msr2data</code> are owed its original purpose.
|
||||
<code>msr2data</code> (originally written by B. M. Wojek) is a program implemented in <code>C++</code>. Its purpose is to process multiple <code><a href="MusrFit.html">musrfit</a></code> msr files with the same parameters and summarize the fitting results either in a TRIUMF <strong>DB</strong> <a name="FootNote1text"></a><span class='FootNoteTextLink' title=' For an abridged description of this format see <a href="http://musr.org/xyfit/dbformat.html" target="_top">here</a>. The <strong>DB</strong> files produced by <code>msr2data</code> can be viewed for instance with <a href="http://musr.org/muview/" target="_top">μView</a>, however, they are <em>not completely</em> backward-compatible to the original "db language" since the parameter names can be longer than five or six characters! In order to establish this backward compatibility (if needed) the user has to ensure the correct length of the parameter names in the msr files!'><a href="#FootNote1note" class="foswikiCurrentTopicLink">(1)</a></span> or a <strong>column ASCII</strong> file. It evolved from a script called <code>mlog2db</code> which has been written only for collecting fit results of <a href="http://lmu.web.psi.ch/lem/" target="_top">LEM</a> data stored in mlog files generated by <code>musrfit</code> and putting them together in a file with the <strong>DB</strong> format for further analysis. Therefore, any peculiarities, e.g. in supplying options to <code>msr2data</code> are owed its original purpose.
|
||||
<code>msr2data</code> is <a href="http://www.gnu.org/philosophy/free-sw.html" target="_top">free software</a> and licensed under the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_top">GNU GPL version 2</a> or any later version (at your option).
|
||||
<p></p>
|
||||
Before the usage of msr2data will be explained in greater detail first be aware of the following:
|
||||
@@ -341,18 +342,17 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<span class='foswikiClear'></span>
|
||||
<div class="foswikiMetaData foswikiMetaDataNotAllowed">
|
||||
<div class="jqTabPane jqTabPaneSimple {select:'1', autoMaxExpand:false, animate:true, minHeight:230}">
|
||||
<div class="foswikiMetaData foswikiHideOnPrint foswikiMetaDataNotAllowed">
|
||||
<div class="jqTabPane jqTabPanePlain {select:'1', autoMaxExpand:false, animate:true, minHeight:230}">
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab7644' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1358250917'}">
|
||||
<!-- TAB --><div id='jqTab9265' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1378802792'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/processing.gif" width="16" height="16" alt="processing" /></span></div>
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
</div></div><!-- //ENDTAB --><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@@ -371,9 +371,9 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1358250917' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/Msr2Data' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='Msr2Datac99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/Msr2Data?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/Msr2Data?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r38 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=37;rev2=38"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=37">r37</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=36;rev2=37"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=36">r36</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=35;rev2=36"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=35">r35</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=more&maxrev=38&currrev=38' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1378802792' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/Msr2Data' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='Msr2Datac99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/Msr2Data?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/Msr2Data?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r38 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=37;rev2=38"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=37">r37</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=36;rev2=37"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=36">r36</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=35;rev2=36"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=35">r35</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=more&maxrev=38&currrev=38' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 20 Jul 2011, wojek</span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r38 - 20 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@@ -383,7 +383,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<p></p>
|
||||
<p></p>
|
||||
<b>PSI Webs</b> <ul>
|
||||
<li> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/psi.png" width="16" height="16" alt="psi" /></span> <a href="https://intranet.psi.ch/Main/WebHome">WebHome</a>
|
||||
<li> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/psi.png" width="16" height="16" alt="psi" /></span> <a href="https://intranet.psi.ch/Main/WebHome">Main</a>
|
||||
</li> <li> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/psi.png" width="16" height="16" alt="psi" /></span> <a href="https://intranet.psi.ch/Main/WebList">weitere Webs</a>
|
||||
</li></ul>
|
||||
<hr />
|
||||
@@ -407,10 +407,13 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<div id="patternTopBarContents"><table border="0" cellpadding="0" cellspacing="0" style="width:100%" summary="">
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<ul>
|
||||
<li> <form name="quickSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/Msr2Data" method="get"> <input type="hidden" name="redirectto" value="/MUSR/Msr2Data?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@@ -419,7 +422,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 15 Jan 2013 11:56:30 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 10 Sep 2013 08:47:45 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
Reference in New Issue
Block a user