LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

(i) add PRINT_LEVEL to the command block (0='nothing' to

Browse Source 
3='everything'). This allows to tune the Minuit2 output. (ii) added the
possibilty to give the fit range in bins. For details see the docu.
This commit is contained in:
suter_a 2012-10-25 14:44:16 +00:00
parent 8f057d9967
commit 6c8ce66e1d
34 changed files with 1084 additions and 247 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -6,6 +6,9 @@
changes since 0.11.0 changes since 0.11.0
=================================== ===================================
NEW 2012-10-25 (i) add PRINT_LEVEL to the command block (0='nothing' to
3='everything'). This allows to tune the Minuit2 output. (ii) added the
possibilty to give the fit range in bins. For details see the docu.
NEW 2012-09-24 add header information for printing. NEW 2012-09-24 add header information for printing.
NEW 2012-05-31 added Noakes-Kalvius function (see A. Yaouanc and P. Dalmas de Reotiers, NEW 2012-05-31 added Noakes-Kalvius function (see A. Yaouanc and P. Dalmas de Reotiers,
"Muon Spin Rotation, Relaxation, and Resonance" Oxford, Section 6.4.1.3). "Muon Spin Rotation, Relaxation, and Resonance" Oxford, Section 6.4.1.3).

12
doc/html/user/MUSR/BmwLibs.html
View File

@ -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"> <!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/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:33 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:33 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657495" type="application/x-wiki" title="edit BmwLibs" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1351175906" type="application/x-wiki" title="edit BmwLibs" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic">To be written... </div><div class="patternContent"><div class="foswikiTopic">To be written...
@ -146,7 +144,7 @@ pre {
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1346657495' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/BmwLibs' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='BmwLibsc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/BmwLibs?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/BmwLibs?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r5&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=4;rev2=5">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=4">r4</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=3;rev2=4">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=3">r3</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=2;rev2=3">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=2">r2</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?template=more&amp;maxrev=5&amp;currrev=5' 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/BmwLibs?t=1351175906' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/BmwLibs' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='BmwLibsc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/BmwLibs?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/BmwLibs?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r5&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=4;rev2=5">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=4">r4</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=3;rev2=4">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=3">r3</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=2;rev2=3">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=2">r2</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?template=more&amp;maxrev=5&amp;currrev=5' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div>
</div> </div>
@ -194,7 +192,7 @@ pre {
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:34 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:34 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

12
doc/html/user/MUSR/LibFitPofB.html
View File

@ -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"> <!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/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:26 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:25 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657495" type="application/x-wiki" title="edit LibFitPofB" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1351175905" type="application/x-wiki" title="edit LibFitPofB" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"> </div><div class="patternContent"><div class="foswikiTopic">
@ -422,7 +420,7 @@ An example XML file looks as follows:
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1346657495' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/LibFitPofB' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='LibFitPofBc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/LibFitPofB?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibFitPofB?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r16&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=15;rev2=16">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=15">r15</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=14;rev2=15">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=14">r14</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=13;rev2=14">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=13">r13</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?template=more&amp;maxrev=16&amp;currrev=16' 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/LibFitPofB?t=1351175905' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/LibFitPofB' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='LibFitPofBc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/LibFitPofB?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibFitPofB?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r16&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=15;rev2=16">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=15">r15</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=14;rev2=15">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=14">r14</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=13;rev2=14">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=13">r13</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?template=more&amp;maxrev=16&amp;currrev=16' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div>
</div> </div>
@ -470,7 +468,7 @@ An example XML file looks as follows:
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:33 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:33 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

12
doc/html/user/MUSR/LibZFRelaxation.html
View File

@ -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"> <!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/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:31:48 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:41 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657489" type="application/x-wiki" title="edit LibZFRelaxation" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1351175896" type="application/x-wiki" title="edit LibZFRelaxation" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"> </div><div class="patternContent"><div class="foswikiTopic">
@ -227,7 +225,7 @@ The parameters are: <ol>
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1346657489' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/LibZFRelaxation' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='LibZFRelaxationc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/LibZFRelaxation?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibZFRelaxation?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r2&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibZFRelaxation?rev1=1;rev2=2">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibZFRelaxation?rev=1">r1</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?template=more&amp;maxrev=2&amp;currrev=2' 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/LibZFRelaxation?t=1351175896' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/LibZFRelaxation' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='LibZFRelaxationc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/LibZFRelaxation?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibZFRelaxation?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r2&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibZFRelaxation?rev1=1;rev2=2">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibZFRelaxation?rev=1">r1</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?template=more&amp;maxrev=2&amp;currrev=2' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div>
</div> </div>
@ -275,7 +273,7 @@ The parameters are: <ol>
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:31:52 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:46 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

14
doc/html/user/MUSR/Msr2Data.html
View File

@ -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"> <!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], Mon, 03 Sep 2012 07:32:25 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:24 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657494" type="application/x-wiki" title="edit Msr2Data" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1351175904" type="application/x-wiki" title="edit Msr2Data" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"> </div><div class="patternContent"><div class="foswikiTopic">
@ -351,7 +349,7 @@ For reporting bugs or requesting new features and improvements please use the <a
<!-- --> <!-- -->
<!-- --><!-- --> <!-- --><!-- -->
<!-- --> <!-- -->
<!-- TAB --><div id='jqTab7612' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1346657494'}"> <!-- TAB --><div id='jqTab6977' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1351175904'}">
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2> <h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2>
<div class='jqTabContents' > <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="foswikiIcon"><img src="../pub/System/DocumentGraphics/processing.gif" width="16" height="16" alt="processing" /></span></div>
@ -373,7 +371,7 @@ For reporting bugs or requesting new features and improvements please use the <a
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1346657494' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=37;rev2=38">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=37">r37</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=36;rev2=37">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=36">r36</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=35;rev2=36">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=35">r35</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=more&amp;maxrev=38&amp;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=1351175904' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=37;rev2=38">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=37">r37</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=36;rev2=37">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=36">r36</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=35;rev2=36">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=35">r35</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=more&amp;maxrev=38&amp;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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 20 Jul 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 20 Jul 2011, wojek</span></div>
</div> </div>
@ -421,7 +419,7 @@ For reporting bugs or requesting new features and improvements please use the <a
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:26 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:25 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

31
doc/html/user/MUSR/MusrFit.html
View File

@ -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"> <!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/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:04 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:01 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657492" type="application/x-wiki" title="edit MusrFit" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1351175902" type="application/x-wiki" title="edit MusrFit" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"> </div><div class="patternContent"><div class="foswikiTopic">
@ -908,7 +906,9 @@ etc.
<dt> xy-data (fit type 8) </dt><dd> Specification of the data from an ASCII or DB file which should be used as <i>x</i> and <i>y</i> data (in this order). For a simple ASCII file the column numbers are used, in the case of a DB file one can either specify the variable numbers or the name of the variables as given in the DB header. <dt> xy-data (fit type 8) </dt><dd> Specification of the data from an ASCII or DB file which should be used as <i>x</i> and <i>y</i> data (in this order). For a simple ASCII file the column numbers are used, in the case of a DB file one can either specify the variable numbers or the name of the variables as given in the DB header.
</dd></dl> </dd></dl>
<p></p> <dl> <p></p> <dl>
<dt> fit </dt><dd> The range of data that should be considered when the fitting is done. For the &mu;SR fit types <strong>0</strong>, <strong>2</strong>, and <strong>4</strong> here the starting and end times are given in microseconds. For the non-&mu;SR fit type <strong>8</strong> the starting and end points of the fitting range are given in the units of the <i>x</i> data.<br><span class='foswikiRedFG'>In case the fit range specified here is larger than the <a href="#DataRange" class="foswikiCurrentTopicLink">data range</a> (in any direction), eventually the <a href="#DataRange" class="foswikiCurrentTopicLink">data range</a> will be used as fit range.</span> <dt> fit </dt><dd> The range of data that should be considered when the fitting is done. For the &mu;SR fit types <strong>0</strong>, <strong>2</strong>, and <strong>4</strong> here the starting and end times are given in microseconds. For the non-&mu;SR fit type <strong>8</strong> the starting and end points of the fitting range are given in the units of the <i>x</i> data.<br><span class='foswikiRedFG'>In case the fit range specified here is larger than the <a href="#DataRange" class="foswikiCurrentTopicLink">data range</a> (in any direction), eventually the <a href="#DataRange" class="foswikiCurrentTopicLink">data range</a> will be used as fit range.</span> An example for a &mu;SR fit:<pre>
fit 0.2 8.5
</pre>Which means that the fitting window will span from 0.2 to 8.5 microseconds.<br> Another possibility for the &mu;SR fits is to give the fit range in bins, rather than time. The syntax is then: <pre>fit fgb+&#60;n0&#62; lgb-&#60;n1&#62;,</pre> where <strong>fgb</strong> and <strong>lgb</strong> are label tags which refer to the 'first good bin' and the 'last good bin' defined either in the <code><b>data</b></code> tag of the run block, data file, are estimated based on T0. &lt;n0&gt; and &lt;n1&gt; are offsets (given in bins) allowing to change the fit window compared to the data window. An example: <pre>fit fgb+150 lgb-1332</pre>
</dd></dl> </dd></dl>
<p></p> <dl> <p></p> <dl>
<dt> packing </dt><dd> Number of data channels to be binned together. For the non-&mu;SR fit type <strong>8</strong> the binning is supposed to be 1. <dt> packing </dt><dd> Number of data channels to be binned together. For the non-&mu;SR fit type <strong>8</strong> the binning is supposed to be 1.
@ -956,6 +956,8 @@ It is important to understand that before <strong>MINOS</strong> is called, all
<p></p> <p></p>
For even more complex fitting the additional command <strong>FIT_RANGE RESET | <i>t</i><sub>start</sub> <i>t</i><sub>end</sub> | <i>t</i><sub>s1</sub> <i>t</i><sub>e1</sub> <i>t</i><sub>s2</sub> <i>t</i><sub>e2</sub> ... <i>t</i><sub>s<i>n</i></sub> <i>t</i><sub>e<i>n</i></sub></strong> is provided. It allows to change the fit range during different iterations. The command <strong>FIT_RANGE <i>t</i><sub>start</sub> <i>t</i><sub>end</sub></strong> changes the current fit range for <code>all</code> the runs present in the msr file. <strong>FIT_RANGE RESET</strong> will restore to the original fit ranges as provided in the <a href="#TheRunBlock" class="foswikiCurrentTopicLink">RUN block</a>. If for each run of the msr file an individual fit range should be used, the third option applies. Here <strong><i>n</i></strong> has to correspond to the number of runs in the RUN block. For even more complex fitting the additional command <strong>FIT_RANGE RESET | <i>t</i><sub>start</sub> <i>t</i><sub>end</sub> | <i>t</i><sub>s1</sub> <i>t</i><sub>e1</sub> <i>t</i><sub>s2</sub> <i>t</i><sub>e2</sub> ... <i>t</i><sub>s<i>n</i></sub> <i>t</i><sub>e<i>n</i></sub></strong> is provided. It allows to change the fit range during different iterations. The command <strong>FIT_RANGE <i>t</i><sub>start</sub> <i>t</i><sub>end</sub></strong> changes the current fit range for <code>all</code> the runs present in the msr file. <strong>FIT_RANGE RESET</strong> will restore to the original fit ranges as provided in the <a href="#TheRunBlock" class="foswikiCurrentTopicLink">RUN block</a>. If for each run of the msr file an individual fit range should be used, the third option applies. Here <strong><i>n</i></strong> has to correspond to the number of runs in the RUN block.
<p></p> <p></p>
As for the run block, there is a 2nd flavor how the <strong>FIT_RANGE</strong> can be changed, namely giving the fit range in bins, i.e. <strong>FIT_RANGE RESET | fgb+&lt;n0&gt; lgb-&lt;n1&gt; | fgb+&lt;n00&gt; lgb-&lt;n01&gt; fgb+&lt;n10&gt; lgb-&lt;n11&gt; ... fgb+&lt;nN0&gt; lgb-&lt;nN1&gt;</strong> where <strong>N</strong> is the number of available run blocks. The idea is inline with the above syntax and the syntax describe for the fit range (<strong>fit</strong>) of the <a href="#TheRunBlock" class="foswikiCurrentTopicLink">RUN block</a>.
<p></p>
A typical example could look like:<pre> A typical example could look like:<pre>
COMMANDS COMMANDS
FIT&#95;RANGE 0.0 0.8 FIT&#95;RANGE 0.0 0.8
@ -964,6 +966,15 @@ A typical example could look like:<pre>
MINIMIZE MINIMIZE
MINOS MINOS
SAVE SAVE
</pre> or
<pre>
COMMANDS
FIT&#95;RANGE fgb+15 lgb-1332 fgb+17 lgb-1330
MINIMIZE
FIT&#95;RANGE RESET
MINIMIZE
MINOS
SAVE
</pre> </pre>
<p></p> <p></p>
<a name="ScaleNzero"></a> <a name="ScaleNzero"></a>
@ -1429,7 +1440,7 @@ For reporting bugs or requesting new features and improvements please use the <a
<!-- --> <!-- -->
<!-- --><!-- --> <!-- --><!-- -->
<!-- --> <!-- -->
<!-- TAB --><div id='jqTab4047' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrFit;render=on;1346657493'}"> <!-- TAB --><div id='jqTab8203' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrFit;render=on;1351175903'}">
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2> <h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2>
<div class='jqTabContents' > <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="foswikiIcon"><img src="../pub/System/DocumentGraphics/processing.gif" width="16" height="16" alt="processing" /></span></div>
@ -1451,9 +1462,9 @@ For reporting bugs or requesting new features and improvements please use the <a
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1346657493' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrFit' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrFitc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrFit?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFit?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r108&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=107;rev2=108">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=107">r107</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=106;rev2=107">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=106">r106</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=105;rev2=106">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=105">r105</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?template=more&amp;maxrev=108&amp;currrev=108' 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/MusrFit?t=1351175903' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrFit' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrFitc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrFit?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFit?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r109&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=108;rev2=109">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=108">r108</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=107;rev2=108">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=107">r107</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=106;rev2=107">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=106">r106</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?template=more&amp;maxrev=109&amp;currrev=109' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 04 Jul 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 25 Oct 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
</div> </div>
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div> </div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
<div id="patternSideBarContents"> <div id="patternSideBarContents">
@ -1499,7 +1510,7 @@ For reporting bugs or requesting new features and improvements please use the <a
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:23 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:22 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

12
doc/html/user/MUSR/MusrFitAcknowledgements.html
View File

@ -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"> <!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/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:03 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:00 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657492" type="application/x-wiki" title="edit MusrFitAcknowledgements" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1351175901" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Acknowledgements_45_61_61musrfit_61_61"></a> Acknowledgements - <code><b>musrfit</b></code> </h1> </div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Acknowledgements_45_61_61musrfit_61_61"></a> Acknowledgements - <code><b>musrfit</b></code> </h1>
@ -144,7 +142,7 @@ pre {
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1346657492' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrFitAcknowledgements' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrFitAcknowledgementsc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrFitAcknowledgements?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitAcknowledgements?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r4&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=3;rev2=4">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=3">r3</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=2;rev2=3">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=2">r2</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=1;rev2=2">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=1">r1</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?template=more&amp;maxrev=4&amp;currrev=4' 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/MusrFitAcknowledgements?t=1351175901' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrFitAcknowledgements' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrFitAcknowledgementsc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrFitAcknowledgements?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitAcknowledgements?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r4&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=3;rev2=4">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=3">r3</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=2;rev2=3">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=2">r2</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=1;rev2=2">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=1">r1</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?template=more&amp;maxrev=4&amp;currrev=4' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div>
</div> </div>
@ -192,7 +190,7 @@ pre {
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:04 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:01 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

14
doc/html/user/MUSR/MusrFitSetup.html
View File

@ -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"> <!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/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:02 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:58 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657491" type="application/x-wiki" title="edit MusrFitSetup" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1351175900" type="application/x-wiki" title="edit MusrFitSetup" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Setting_up_61_61musrfit_61_61_on_Different_Platforms"></a> Setting up <code><b>musrfit</b></code> on Different Platforms </h1> </div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Setting_up_61_61musrfit_61_61_on_Different_Platforms"></a> Setting up <code><b>musrfit</b></code> on Different Platforms </h1>
@ -334,7 +332,7 @@ musrview test-histo-ROOT-NPP.msr
<p></p> <p></p>
Notes Notes
<p></p> <p></p>
<a name="FootNote1note"></a><span class="FootNoteLabel"><a href="MusrFitSetup.html#FootNote1text" class="foswikiCurrentWebHomeLink"> <strong>1</strong> </a></span>: <span class="FootNote">In case only a single user is working at the machine it might be considerable to change the ownership of the <code>ROOT</code> folder so that the user has easy write access to this directory: <!-- verbatim2252 --></span> <a name="FootNote1note"></a><span class="FootNoteLabel"><a href="MusrFitSetup.html#FootNote1text" class="foswikiCurrentWebHomeLink"> <strong>1</strong> </a></span>: <span class="FootNote">In case only a single user is working at the machine it might be considerable to change the ownership of the <code>ROOT</code> folder so that the user has easy write access to this directory: <!-- verbatim2019 --></span>
<p></p> <p></p>
<a name="FootNote2note"></a><span class="FootNoteLabel"><a href="MusrFitSetup.html#FootNote2text" class="foswikiCurrentWebHomeLink"> <strong>2</strong> </a></span>: <span class="FootNote"> When using <code>GCC</code> &#8805; 4.2 please make sure that the environment variables <strong>USE_PARALLEL_MINUIT2</strong> and <strong>USE_OPENMP</strong> are <em>not</em> set! Otherwise <code>MINUIT2</code> will be compiled with parallelization support and cannot be used together with <code>musrfit</code> afterwards since the <code>musrfit</code> code is <em>not</em> fully thread-safe! When compiled with <code>GCC</code> &#8805; 4.2 <code>musrfit</code> itself will parallelize the &chi;<sup>2</sup> calculation.</span> <a name="FootNote2note"></a><span class="FootNoteLabel"><a href="MusrFitSetup.html#FootNote2text" class="foswikiCurrentWebHomeLink"> <strong>2</strong> </a></span>: <span class="FootNote"> When using <code>GCC</code> &#8805; 4.2 please make sure that the environment variables <strong>USE_PARALLEL_MINUIT2</strong> and <strong>USE_OPENMP</strong> are <em>not</em> set! Otherwise <code>MINUIT2</code> will be compiled with parallelization support and cannot be used together with <code>musrfit</code> afterwards since the <code>musrfit</code> code is <em>not</em> fully thread-safe! When compiled with <code>GCC</code> &#8805; 4.2 <code>musrfit</code> itself will parallelize the &chi;<sup>2</sup> calculation.</span>
<p></p> <p></p>
@ -823,7 +821,7 @@ musrview test-histo-ROOT-NPP.msr
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1346657491' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrFitSetup' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrFitSetupc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrFitSetup?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitSetup?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r52&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=51;rev2=52">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=51">r51</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=50;rev2=51">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=50">r50</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=49;rev2=50">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=49">r49</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?template=more&amp;maxrev=52&amp;currrev=52' 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/MusrFitSetup?t=1351175900' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrFitSetup' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrFitSetupc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrFitSetup?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitSetup?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r52&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=51;rev2=52">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=51">r51</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=50;rev2=51">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=50">r50</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=49;rev2=50">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=49">r49</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?template=more&amp;maxrev=52&amp;currrev=52' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 03 Sep 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 03 Sep 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
</div> </div>
@ -871,7 +869,7 @@ musrview test-histo-ROOT-NPP.msr
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:03 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:00 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

14
doc/html/user/MUSR/MusrGui.html
View File

@ -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"> <!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/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:00 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:56 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657491" type="application/x-wiki" title="edit MusrGui" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1351175898" type="application/x-wiki" title="edit MusrGui" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"> </div><div class="patternContent"><div class="foswikiTopic">
@ -326,7 +324,7 @@ For reporting bugs or requesting new features and improvements please use the <a
<!-- --> <!-- -->
<!-- --><!-- --> <!-- --><!-- -->
<!-- --> <!-- -->
<!-- TAB --><div id='jqTab8365' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrGui;render=on;1346657491'}"> <!-- TAB --><div id='jqTab8345' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrGui;render=on;1351175898'}">
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2> <h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2>
<div class='jqTabContents' > <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="foswikiIcon"><img src="../pub/System/DocumentGraphics/processing.gif" width="16" height="16" alt="processing" /></span></div>
@ -348,7 +346,7 @@ For reporting bugs or requesting new features and improvements please use the <a
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1346657491' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrGui' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrGuic99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrGui?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrGui?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r19&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=18;rev2=19">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=18">r18</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=17;rev2=18">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=17">r17</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=16;rev2=17">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=16">r16</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?template=more&amp;maxrev=19&amp;currrev=19' 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/MusrGui?t=1351175898' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrGui' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='MusrGuic99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/MusrGui?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrGui?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r19&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=18;rev2=19">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=18">r18</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=17;rev2=18">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=17">r17</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=16;rev2=17">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=16">r16</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?template=more&amp;maxrev=19&amp;currrev=19' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 25 May 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 25 May 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
</div> </div>
@ -396,7 +394,7 @@ For reporting bugs or requesting new features and improvements please use the <a
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:02 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:58 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

12
doc/html/user/MUSR/QuickStart.html
View File

@ -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"> <!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/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:31:57 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:52 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657490" type="application/x-wiki" title="edit QuickStart" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1351175897" type="application/x-wiki" title="edit QuickStart" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Quickstart_for_61_61WKM_61_61_users"></a> Quickstart for <code><b>WKM</b></code> users </h1> </div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Quickstart_for_61_61WKM_61_61_users"></a> Quickstart for <code><b>WKM</b></code> users </h1>
@ -282,7 +280,7 @@ RUN 2008/lem08&#95;his&#95;8472 MUE4 PSI ROOT-NPP (name beamline institute dat
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1346657490' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/QuickStart' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='QuickStartc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/QuickStart?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/QuickStart?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r7&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=6;rev2=7">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=6">r6</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=5;rev2=6">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=5">r5</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=4;rev2=5">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=4">r4</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?template=more&amp;maxrev=7&amp;currrev=7' 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/QuickStart?t=1351175898' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/QuickStart' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='QuickStartc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/QuickStart?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/QuickStart?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r7&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=6;rev2=7">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=6">r6</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=5;rev2=6">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=5">r5</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=4;rev2=5">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=4">r4</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?template=more&amp;maxrev=7&amp;currrev=7' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 10 Jul 2011, wojek</span></div>
</div> </div>
@ -330,7 +328,7 @@ RUN 2008/lem08&#95;his&#95;8472 MUE4 PSI ROOT-NPP (name beamline institute dat
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:31:59 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:56 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

14
doc/html/user/MUSR/TutorialSingleHisto.html
View File

@ -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"> <!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/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:31:52 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:46 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657489" type="application/x-wiki" title="edit TutorialSingleHisto" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1351175897" type="application/x-wiki" title="edit TutorialSingleHisto" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"><h1><a name="A_61_61musrfit_61_61_Single_45Histogram_45Fit_Tutorial"></a> <code><b>musrfit</b></code> Single-Histogram-Fit Tutorial </h1> </div><div class="patternContent"><div class="foswikiTopic"><h1><a name="A_61_61musrfit_61_61_Single_45Histogram_45Fit_Tutorial"></a> <code><b>musrfit</b></code> Single-Histogram-Fit Tutorial </h1>
@ -283,7 +281,7 @@ This page only summarizes the very basic features and options of the programs co
<!-- --> <!-- -->
<!-- --><!-- --> <!-- --><!-- -->
<!-- --> <!-- -->
<!-- TAB --><div id='jqTab274' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.TutorialSingleHisto;render=on;1346657490'}"> <!-- TAB --><div id='jqTab8387' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.TutorialSingleHisto;render=on;1351175897'}">
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(6)</span></h2> <h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(6)</span></h2>
<div class='jqTabContents' > <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="foswikiIcon"><img src="../pub/System/DocumentGraphics/processing.gif" width="16" height="16" alt="processing" /></span></div>
@ -305,7 +303,7 @@ This page only summarizes the very basic features and options of the programs co
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1346657490' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/TutorialSingleHisto' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='TutorialSingleHistoc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/TutorialSingleHisto?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/TutorialSingleHisto?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r9&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=8;rev2=9">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=8">r8</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=7;rev2=8">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=7">r7</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=6;rev2=7">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=6">r6</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?template=more&amp;maxrev=9&amp;currrev=9' 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/TutorialSingleHisto?t=1351175897' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/TutorialSingleHisto' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='TutorialSingleHistoc99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/TutorialSingleHisto?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/TutorialSingleHisto?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r9&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=8;rev2=9">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=8">r8</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=7;rev2=8">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=7">r7</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=6;rev2=7">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=6">r6</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?template=more&amp;maxrev=9&amp;currrev=9' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 02 Sep 2011, wojek</span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 02 Sep 2011, wojek</span></div>
</div> </div>
@ -353,7 +351,7 @@ This page only summarizes the very basic features and options of the programs co
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:31:57 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:38:52 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

16
doc/html/user/MUSR/WebHome.html
View File

@ -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"> <!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/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:34 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:34 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@ -8,7 +8,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> <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="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="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=1346657496" type="application/x-wiki" title="edit WebHome" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1351175907" type="application/x-wiki" title="edit WebHome" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <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" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
@ -111,9 +111,7 @@ pre {
<p></p> <p></p>
<link rel='stylesheet' href='../webbase/css/oscar.css' type='text/css'> <p></p>
<link rel='stylesheet' href='../labels/style/bubbles.css' type='text/css'>
<link rel='stylesheet' href='../labels/support/jquery.qtip.css' type='text/css'>
<p></p> <p></p>
<p></p> <p></p>
</div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Welcome_to_the_MUSR_web"></a> Welcome to the MUSR web </h1> </div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Welcome_to_the_MUSR_web"></a> Welcome to the MUSR web </h1>
@ -135,7 +133,7 @@ pre {
</li> <li> <a href="MusrFitAcknowledgements.html">Acknowledgements</a> </li> <li> <a href="MusrFitAcknowledgements.html">Acknowledgements</a>
</li></ul> </li></ul>
<p></p> <p></p>
-- <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> &amp; <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> - last update July 4, 2012 </div> -- <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> &amp; <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> - last update Oct 25, 2012 </div>
<div class="foswikiContentFooter"></div><!-- --> <div class="foswikiContentFooter"></div><!-- -->
<!-- --> <!-- -->
<!-- --> <!-- -->
@ -158,9 +156,9 @@ pre {
<div class="foswikiFormSteps"> <div class="foswikiFormSteps">
<a name="topic-actions"></a> <a name="topic-actions"></a>
<div class="patternTopicActions foswikiFormStep"> <div class="patternTopicActions foswikiFormStep">
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1346657496' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/WebHome' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='WebHomec99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/WebHome?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/WebHome?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r35&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=34;rev2=35">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=34">r34</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=33;rev2=34">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=33">r33</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=32;rev2=33">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=32">r32</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?template=more&amp;maxrev=35&amp;currrev=35' 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/WebHome?t=1351175907' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/WebHome' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='WebHomec99a.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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/print/pdf.php?url=MUSR/WebHome?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/WebHome?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r36&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=35;rev2=36">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=35">r35</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=34;rev2=35">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=34">r34</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=33;rev2=34">&lt;</a>&nbsp;<a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=33">r33</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?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'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'>&nbsp;|&nbsp;</span><span><a href='https://intranet.psi.ch/MUSR/WebHome?template=more&amp;maxrev=36&amp;currrev=36' 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><div class="patternInfo"><span class="patternRevInfo">Topic revision: 04 Jul 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div> </div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: 25 Oct 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
</div> </div>
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div> </div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
<div id="patternSideBarContents"> <div id="patternSideBarContents">
@ -206,7 +204,7 @@ pre {
</div> </div>
</div> </div>
</div></body> </div></body>
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Mon, 03 Sep 2012 07:32:34 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 25 Oct 2012 14:39:35 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
</html> </html>
<p></p> <p></p>

4
doc/html/user/pub/System/PsiSkin/psistyle.css
View File

@ -128,6 +128,10 @@ blockquote.psi {
padding-right: 0px; padding-right: 0px;
} }
.patternContent a[href^="http://i.psi.ch"] {
background: transparent;
padding-right: 0px;
}
/* ...but not to absolute links in this domain... /* ...but not to absolute links in this domain...

4
src/any2many.cpp
View File

@ -502,6 +502,10 @@ int main(int argc, char *argv[])
else else
dataHandler = new PRunDataHandler(&info); dataHandler = new PRunDataHandler(&info);
// read and convert all data
dataHandler->ConvertData();
// check if it has been successfull
bool success = dataHandler->IsAllDataAvailable(); bool success = dataHandler->IsAllDataAvailable();
if (!success) { if (!success) {
cout << endl << ">> any2many **ERROR** Couldn't read all data files, will quit ..." << endl; cout << endl << ">> any2many **ERROR** Couldn't read all data files, will quit ..." << endl;

124
src/classes/PFitter.cpp
View File

@ -51,6 +51,7 @@ using namespace std;
#include "Minuit2/MnMigrad.h" #include "Minuit2/MnMigrad.h"
#include "Minuit2/MnMinos.h" #include "Minuit2/MnMinos.h"
#include "Minuit2/MnPlot.h" #include "Minuit2/MnPlot.h"
#include "Minuit2/MnPrint.h"
#include "Minuit2/MnScan.h" #include "Minuit2/MnScan.h"
#include "Minuit2/MnSimplex.h" #include "Minuit2/MnSimplex.h"
#include "Minuit2/MnUserParameterState.h" #include "Minuit2/MnUserParameterState.h"
@ -99,6 +100,7 @@ PFitter::PFitter(PMsrHandler *runInfo, PRunListCollection *runListCollection, Bo
fScanNoPoints = 41; // minuit2 default fScanNoPoints = 41; // minuit2 default
fScanLow = 0.0; // minuit2 default, i.e. 2 std deviations fScanLow = 0.0; // minuit2 default, i.e. 2 std deviations
fScanHigh = 0.0; // minuit2 default, i.e. 2 std deviations fScanHigh = 0.0; // minuit2 default, i.e. 2 std deviations
fPrintLevel = 1.0;
// keep all the fit ranges in case RANGE command is present // keep all the fit ranges in case RANGE command is present
PMsrRunList *runs = fRunInfo->GetMsrRunList(); PMsrRunList *runs = fRunInfo->GetMsrRunList();
@ -289,8 +291,7 @@ Bool_t PFitter::DoFit()
cerr << endl; cerr << endl;
break; break;
case PMN_PRINT: case PMN_PRINT:
cerr << endl << "**WARNING** from PFitter::DoFit() : the command PRINT is not yet implemented."; status = ExecutePrintLevel(fCmdList[i].second);
cerr << endl;
break; break;
default: default:
cerr << endl << "**PANIC ERROR**: PFitter::DoFit(): You should never have reached this point"; cerr << endl << "**PANIC ERROR**: PFitter::DoFit(): You should never have reached this point";
@ -447,14 +448,19 @@ Bool_t PFitter::CheckCommands()
cmd.second = cmdLineNo; cmd.second = cmdLineNo;
fCmdList.push_back(cmd); fCmdList.push_back(cmd);
} else if (it->fLine.Contains("FIT_RANGE", TString::kIgnoreCase)) { } else if (it->fLine.Contains("FIT_RANGE", TString::kIgnoreCase)) {
// check the 3 options: FIT_RANGE RESET, FIT_RANGE start end, FIT_RANGE start1 end1 start2 end2 ... startN endN // check the 5 options:
// (i) FIT_RANGE RESET,
// (ii) FIT_RANGE start end,
// (iii) FIT_RANGE start1 end1 start2 end2 ... startN endN
// (iv) FIT_RANGE fgb+n0 lgb-n1
// (v) FIT_RANGE fgb+n00 lgb-n01 fgb+n10 lgb-n11 ... fgb+nN0 lgb-nN1
TObjArray *tokens = 0; TObjArray *tokens = 0;
TObjString *ostr; TObjString *ostr;
TString str; TString str;
tokens = it->fLine.Tokenize(", \t"); tokens = it->fLine.Tokenize(", \t");
if (tokens->GetEntries() == 2) { if (tokens->GetEntries() == 2) { // should only be RESET
ostr = dynamic_cast<TObjString*>(tokens->At(1)); ostr = dynamic_cast<TObjString*>(tokens->At(1));
str = ostr->GetString(); str = ostr->GetString();
if (str.Contains("RESET"), TString::kIgnoreCase) { if (str.Contains("RESET"), TString::kIgnoreCase) {
@ -478,7 +484,8 @@ Bool_t PFitter::CheckCommands()
if ((tokens->GetEntries() > 3) && ((static_cast<UInt_t>(tokens->GetEntries())-1)) != 2*fRunInfo->GetMsrRunList()->size()) { if ((tokens->GetEntries() > 3) && ((static_cast<UInt_t>(tokens->GetEntries())-1)) != 2*fRunInfo->GetMsrRunList()->size()) {
cerr << endl << ">> PFitter::CheckCommands: **ERROR** in line " << it->fLineNo; cerr << endl << ">> PFitter::CheckCommands: **ERROR** in line " << it->fLineNo;
cerr << endl << ">> " << it->fLine.Data(); cerr << endl << ">> " << it->fLine.Data();
cerr << endl << ">> Syntax: FIT_RANGE RESET | FIT_RANGE start end | FIT_RANGE s1 e1 s2 e2 .. sN eN,"; cerr << endl << ">> Syntax: FIT_RANGE RESET | FIT_RANGE <start> <end> | FIT_RANGE <s1> <e1> <s2> <e2> .. <sN> <eN> |";
cerr << endl << ">> FIT_RANGE fgb+<n0> lgb-<n1> | FIT_RANGE fgb+<n00> lgb-<n01> fgb+<n10> lgb-<n11> ... fgb+<nN0> lgb-<nN1>,";
cerr << endl << ">> with N the number of runs in the msr-file."; cerr << endl << ">> with N the number of runs in the msr-file.";
cerr << endl << ">> Found N=" << (tokens->GetEntries()-1)/2 << ", # runs in msr-file=" << fRunInfo->GetMsrRunList()->size() << endl; cerr << endl << ">> Found N=" << (tokens->GetEntries()-1)/2 << ", # runs in msr-file=" << fRunInfo->GetMsrRunList()->size() << endl;
fIsValid = false; fIsValid = false;
@ -488,21 +495,30 @@ Bool_t PFitter::CheckCommands()
} }
break; break;
} else { } else {
// check that all range entries are numbers // check that all range entries are numbers or fgb+n0 / lgb-n1
Int_t n=1; Bool_t ok = true;
do { for (Int_t n=1; n<tokens->GetEntries(); n++) {
ostr = dynamic_cast<TObjString*>(tokens->At(n)); ostr = dynamic_cast<TObjString*>(tokens->At(n));
str = ostr->GetString(); str = ostr->GetString();
} while ((++n < tokens->GetEntries()) && str.IsFloat()); if (!str.IsFloat()) {
if ((n%2 == 1) && (!str.Contains("fgb", TString::kIgnoreCase)))
ok = false;
if ((n%2 == 0) && (!str.Contains("lgb", TString::kIgnoreCase)))
ok = false;
}
if (!ok)
break;
}
if (str.IsFloat()) { // everything is fine, last string was a floating point number if (ok) { // everything is fine
cmd.first = PMN_FIT_RANGE; cmd.first = PMN_FIT_RANGE;
cmd.second = cmdLineNo; cmd.second = cmdLineNo;
fCmdList.push_back(cmd); fCmdList.push_back(cmd);
} else { } else {
cerr << endl << ">> PFitter::CheckCommands: **ERROR** in line " << it->fLineNo; cerr << endl << ">> PFitter::CheckCommands: **ERROR** in line " << it->fLineNo;
cerr << endl << ">> " << it->fLine.Data(); cerr << endl << ">> " << it->fLine.Data();
cerr << endl << ">> Syntax: FIT_RANGE RESET | FIT_RANGE <start> <end> | FIT_RANGE <s1> <e1> <s2> <e2> .. <sN> <eN>,"; cerr << endl << ">> Syntax: FIT_RANGE RESET | FIT_RANGE <start> <end> | FIT_RANGE <s1> <e1> <s2> <e2> .. <sN> <eN> |";
cerr << endl << ">> FIT_RANGE fgb+<n0> lgb-<n1> | FIT_RANGE fgb+<n00> lgb-<n01> fgb+<n10> lgb-<n11> ... fgb+<nN0> lgb-<nN1>,";
cerr << endl << ">> with N the number of runs in the msr-file."; cerr << endl << ">> with N the number of runs in the msr-file.";
cerr << endl << ">> Found token '" << str.Data() << "', which is not a floating point number." << endl; cerr << endl << ">> Found token '" << str.Data() << "', which is not a floating point number." << endl;
fIsValid = false; fIsValid = false;
@ -516,8 +532,9 @@ Bool_t PFitter::CheckCommands()
} else { } else {
cerr << endl << ">> PFitter::CheckCommands: **ERROR** in line " << it->fLineNo; cerr << endl << ">> PFitter::CheckCommands: **ERROR** in line " << it->fLineNo;
cerr << endl << ">> " << it->fLine.Data(); cerr << endl << ">> " << it->fLine.Data();
cerr << endl << ">> Syntax: FIT_RANGE RESET | FIT_RANGE start end | FIT_RANGE s1 e1 s2 e2 .. sN eN,"; cerr << endl << ">> Syntax: FIT_RANGE RESET | FIT_RANGE <start> <end> | FIT_RANGE <s1> <e1> <s2> <e2> .. <sN> <eN> |";
cerr << endl << ">> with N the number of runs in the msr-file." << endl; cerr << endl << ">> FIT_RANGE fgb+<n0> lgb-<n1> | FIT_RANGE fgb+<n00> lgb-<n01> fgb+<n10> lgb-<n11> ... fgb+<nN0> lgb-<nN1>,";
cerr << endl << ">> with N the number of runs in the msr-file.";
fIsValid = false; fIsValid = false;
if (tokens) { if (tokens) {
delete tokens; delete tokens;
@ -619,6 +636,10 @@ Bool_t PFitter::CheckCommands()
cmd.first = PMN_PLOT; cmd.first = PMN_PLOT;
cmd.second = cmdLineNo; cmd.second = cmdLineNo;
fCmdList.push_back(cmd); fCmdList.push_back(cmd);
} else if (it->fLine.Contains("PRINT_LEVEL", TString::kIgnoreCase)) {
cmd.first = PMN_PRINT;
cmd.second = cmdLineNo;
fCmdList.push_back(cmd);
} else if (it->fLine.Contains("RELEASE", TString::kIgnoreCase)) { } else if (it->fLine.Contains("RELEASE", TString::kIgnoreCase)) {
// check if the given set of parameters (number or names) is present // check if the given set of parameters (number or names) is present
TObjArray *tokens = 0; TObjArray *tokens = 0;
@ -849,10 +870,6 @@ Bool_t PFitter::CheckCommands()
cmd.first = PMN_USER_PARAM_STATE; cmd.first = PMN_USER_PARAM_STATE;
cmd.second = cmdLineNo; cmd.second = cmdLineNo;
fCmdList.push_back(cmd); fCmdList.push_back(cmd);
} else if (it->fLine.Contains("PRINT", TString::kIgnoreCase)) {
cmd.first = PMN_PRINT;
cmd.second = cmdLineNo;
fCmdList.push_back(cmd);
} else { // unkown command } else { // unkown command
cerr << endl << ">> PFitter::CheckCommands(): **FATAL ERROR** in line " << it->fLineNo << " an unkown command is found:"; cerr << endl << ">> PFitter::CheckCommands(): **FATAL ERROR** in line " << it->fLineNo << " an unkown command is found:";
cerr << endl << ">> " << it->fLine.Data(); cerr << endl << ">> " << it->fLine.Data();
@ -872,7 +889,7 @@ Bool_t PFitter::CheckCommands()
if (it->fLine.Contains("FIX", TString::kIgnoreCase)) if (it->fLine.Contains("FIX", TString::kIgnoreCase))
fixFlag = true; fixFlag = true;
else if (it->fLine.Contains("RELEASE", TString::kIgnoreCase) || else if (it->fLine.Contains("RELEASE", TString::kIgnoreCase) ||
it->fLine.Contains("RESTORE", TString::kIgnoreCase)) it->fLine.Contains("RESTORE", TString::kIgnoreCase))
releaseFlag = true; releaseFlag = true;
else if (it->fLine.Contains("MINIMIZE", TString::kIgnoreCase) || else if (it->fLine.Contains("MINIMIZE", TString::kIgnoreCase) ||
it->fLine.Contains("MIGRAD", TString::kIgnoreCase) || it->fLine.Contains("MIGRAD", TString::kIgnoreCase) ||
@ -991,6 +1008,11 @@ Bool_t PFitter::ExecuteFitRange(UInt_t lineNo)
{ {
cout << ">> PFitter::ExecuteFitRange(): " << fCmdLines[lineNo].fLine.Data() << endl; cout << ">> PFitter::ExecuteFitRange(): " << fCmdLines[lineNo].fLine.Data() << endl;
if (fCmdLines[lineNo].fLine.Contains("fgb", TString::kIgnoreCase)) { // fit range given in bins
fRunListCollection->SetFitRange(fCmdLines[lineNo].fLine);
return true;
}
TObjArray *tokens = 0; TObjArray *tokens = 0;
TObjString *ostr; TObjString *ostr;
TString str; TString str;
@ -1116,6 +1138,9 @@ Bool_t PFitter::ExecuteHesse()
fRunInfo->SetMsrParamPosErrorPresent(i, false); fRunInfo->SetMsrParamPosErrorPresent(i, false);
} }
if (fPrintLevel >= 2)
cout << mnState << endl;
return true; return true;
} }
@ -1181,6 +1206,9 @@ Bool_t PFitter::ExecuteMigrad()
fConverged = true; fConverged = true;
if (fPrintLevel >= 2)
cout << *fFcnMin << endl;
return true; return true;
} }
@ -1247,6 +1275,9 @@ Bool_t PFitter::ExecuteMinimize()
fConverged = true; fConverged = true;
if (fPrintLevel >= 2)
cout << *fFcnMin << endl;
return true; return true;
} }
@ -1328,6 +1359,60 @@ Bool_t PFitter::ExecutePlot()
return true; return true;
} }
//--------------------------------------------------------------------------
// ExecutePrintLevel
//--------------------------------------------------------------------------
/**
* <p>Set the print level.
*
* \param lineNo the line number of the command block
*
* <b>return:</b> true if done, otherwise returns false.
*/
Bool_t PFitter::ExecutePrintLevel(UInt_t lineNo)
{
cout << ">> PFitter::ExecutePrintLevel(): " << fCmdLines[lineNo].fLine.Data() << endl;
TObjArray *tokens = 0;
TObjString *ostr;
TString str;
tokens = fCmdLines[lineNo].fLine.Tokenize(", \t");
if (tokens->GetEntries() < 2) {
cerr << endl << "**ERROR** from PFitter::ExecutePrintLevel(): SYNTAX: PRINT_LEVEL <N>, where <N>=0-3" << endl << endl;
return false;
}
ostr = (TObjString*)tokens->At(1);
str = ostr->GetString();
Int_t ival;
if (str.IsDigit()) {
ival = str.Atoi();
if ((ival >=0) && (ival <= 3)) {
fPrintLevel = (UInt_t) ival;
} else {
cerr << endl << "**ERROR** from PFitter::ExecutePrintLevel(): SYNTAX: PRINT_LEVEL <N>, where <N>=0-3";
cerr << endl << " found <N>=" << ival << endl << endl;
return false;
}
} else {
cerr << endl << "**ERROR** from PFitter::ExecutePrintLevel(): SYNTAX: PRINT_LEVEL <N>, where <N>=0-3" << endl << endl;
return false;
}
ROOT::Minuit2::MnPrint::SetLevel(fPrintLevel);
// clean up
if (tokens) {
delete tokens;
tokens = 0;
}
return true;
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ExecuteRelease // ExecuteRelease
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -1810,6 +1895,9 @@ Bool_t PFitter::ExecuteSimplex()
fConverged = true; fConverged = true;
if (fPrintLevel >= 2)
cout << *fFcnMin << endl;
return true; return true;
} }

127
src/classes/PMsrHandler.cpp
View File

@ -882,16 +882,30 @@ Int_t PMsrHandler::WriteMsrLogFile(const Bool_t messages)
// write fit range line // write fit range line
fout.width(16); fout.width(16);
fout << left << "fit"; fout << left << "fit";
for (UInt_t j=0; j<2; j++) { if (fRuns[runNo].IsFitRangeInBin()) { // fit range given in bins
if (fRuns[runNo].GetFitRange(j) == -1) fout << "fgb";
break; if (fRuns[runNo].GetFitRangeOffset(0) > 0)
neededWidth = 7; fout << "+" << fRuns[runNo].GetFitRangeOffset(0);
neededPrec = LastSignificant(fRuns[runNo].GetFitRange(j)); fout << " lgb";
fout.width(neededWidth); if (fRuns[runNo].GetFitRangeOffset(1) > 0)
fout << "-" << fRuns[runNo].GetFitRangeOffset(1);
neededPrec = LastSignificant(fRuns[runNo].GetFitRange(0));
if (LastSignificant(fRuns[runNo].GetFitRange(1)) > neededPrec)
neededPrec = LastSignificant(fRuns[runNo].GetFitRange(1));
fout.precision(neededPrec); fout.precision(neededPrec);
fout << left << fixed << fRuns[runNo].GetFitRange(j); fout << " # in time: " << fRuns[runNo].GetFitRange(0) << ".." << fRuns[runNo].GetFitRange(1) << " in (usec)";
if (j==0) } else { // fit range given in time
fout << " "; for (UInt_t j=0; j<2; j++) {
if (fRuns[runNo].GetFitRange(j) == -1)
break;
neededWidth = 7;
neededPrec = LastSignificant(fRuns[runNo].GetFitRange(j));
fout.width(neededWidth);
fout.precision(neededPrec);
fout << left << fixed << fRuns[runNo].GetFitRange(j);
if (j==0)
fout << " ";
}
} }
fout << endl; fout << endl;
} else if (sstr.BeginsWith("packing")) { } else if (sstr.BeginsWith("packing")) {
@ -1682,14 +1696,25 @@ Int_t PMsrHandler::WriteMsrFile(const Char_t *filename, map<UInt_t, TString> *co
// fit // fit
fout.width(16); fout.width(16);
fout << left << "fit"; fout << left << "fit";
for (UInt_t j=0; j<2; j++) { if (fRuns[i].IsFitRangeInBin()) { // fit range given in bins
if (fRuns[i].GetFitRange(j) == -1) fout << "fgb";
break; if (fRuns[i].GetFitRangeOffset(0) > 0)
fout.width(8); fout << "+" << fRuns[i].GetFitRangeOffset(0);
UInt_t neededPrec = 2; fout << " lgb";
neededPrec = LastSignificant(fRuns[i].GetFitRange(j)); if (fRuns[i].GetFitRangeOffset(1) > 0)
fout.precision(neededPrec); fout << "-" << fRuns[i].GetFitRangeOffset(1);
fout << left << fixed << fRuns[i].GetFitRange(j); } else { // fit range given in time
for (UInt_t j=0; j<2; j++) {
if (fRuns[i].GetFitRange(j) == -1)
break;
UInt_t neededWidth = 7;
UInt_t neededPrec = LastSignificant(fRuns[i].GetFitRange(j));
fout.width(neededWidth);
fout.precision(neededPrec);
fout << left << fixed << fRuns[i].GetFitRange(j);
if (j==0)
fout << " ";
}
} }
fout << endl; fout << endl;
@ -2921,13 +2946,49 @@ Bool_t PMsrHandler::HandleRunEntry(PMsrLines &lines)
if (tokens->GetEntries() < 3) { if (tokens->GetEntries() < 3) {
error = true; error = true;
} else { } else {
for (Int_t i=1; i<3; i++) { if (iter->fLine.Contains("fgb", TString::kIgnoreCase)) { // fit given in bins, i.e. fit fgb+n0 lgb-n1
ostr = dynamic_cast<TObjString*>(tokens->At(i)); // check 1st entry, i.e. fgb[+n0]
ostr = dynamic_cast<TObjString*>(tokens->At(1));
str = ostr->GetString(); str = ostr->GetString();
if (str.IsFloat()) Ssiz_t idx = str.First("+");
param.SetFitRange(str.Atof(), i-1); TString numStr = str;
else if (idx > -1) { // '+' present hence extract n0
error = true; numStr.Remove(0,idx+1);
if (numStr.IsFloat()) {
param.SetFitRangeOffset(numStr.Atoi(), 0);
} else {
error = true;
}
} else { // n0 == 0
param.SetFitRangeOffset(0, 0);
}
// check 2nd entry, i.e. lgb[-n1]
ostr = dynamic_cast<TObjString*>(tokens->At(2));
str = ostr->GetString();
idx = str.First("-");
numStr = str;
if (idx > -1) { // '-' present hence extract n1
numStr.Remove(0,idx+1);
if (numStr.IsFloat()) {
param.SetFitRangeOffset(numStr.Atoi(), 1);
} else {
error = true;
}
} else { // n0 == 0
param.SetFitRangeOffset(0, 0);
}
if (!error)
param.SetFitRangeInBins(true);
} else { // fit given in time, i.e. fit <start> <end>, where <start>, <end> are given as doubles
for (Int_t i=1; i<3; i++) {
ostr = dynamic_cast<TObjString*>(tokens->At(i));
str = ostr->GetString();
if (str.IsFloat())
param.SetFitRange(str.Atof(), i-1);
else
error = true;
}
} }
} }
} }
@ -4570,10 +4631,12 @@ Bool_t PMsrHandler::CheckRunBlockIntegrity()
} }
} }
// check fit range // check fit range
if ((fRuns[i].GetFitRange(0) == PMUSR_UNDEFINED) || (fRuns[i].GetFitRange(1) == PMUSR_UNDEFINED)) { if (!fRuns[i].IsFitRangeInBin()) { // fit range given as times in usec
cerr << endl << "PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; if ((fRuns[i].GetFitRange(0) == PMUSR_UNDEFINED) || (fRuns[i].GetFitRange(1) == PMUSR_UNDEFINED)) {
cerr << endl << " Fit range is not defined. Necessary for single histogram fits." << endl; cerr << endl << "PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1;
return false; cerr << endl << " Fit range is not defined. Necessary for single histogram fits." << endl;
return false;
}
} }
// check packing // check packing
if (fRuns[i].GetPacking() == -1) { if (fRuns[i].GetPacking() == -1) {
@ -4603,10 +4666,12 @@ Bool_t PMsrHandler::CheckRunBlockIntegrity()
return false; return false;
} }
// check fit range // check fit range
if ((fRuns[i].GetFitRange(0) == PMUSR_UNDEFINED) || (fRuns[i].GetFitRange(1) == PMUSR_UNDEFINED)) { if (!fRuns[i].IsFitRangeInBin()) { // fit range given as times in usec
cerr << endl << "PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1; if ((fRuns[i].GetFitRange(0) == PMUSR_UNDEFINED) || (fRuns[i].GetFitRange(1) == PMUSR_UNDEFINED)) {
cerr << endl << " Fit range is not defined. Necessary for single histogram fits." << endl; cerr << endl << "PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1;
return false; cerr << endl << " Fit range is not defined. Necessary for single histogram fits." << endl;
return false;
}
} }
// check packing // check packing
if (fRuns[i].GetPacking() == -1) { if (fRuns[i].GetPacking() == -1) {

131
src/classes/PMusr.cpp
View File

@ -75,7 +75,7 @@ PRunData::~PRunData()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetTheoryValue // SetTheoryValue (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Sets a value of the theory vector * <p>Sets a value of the theory vector
@ -92,7 +92,7 @@ void PRunData::SetTheoryValue(UInt_t idx, Double_t dval)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReplaceTheory // ReplaceTheory (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Replaces the theory vector. * <p>Replaces the theory vector.
@ -150,7 +150,7 @@ PNonMusrRawRunData::~PNonMusrRawRunData()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetLabel // SetLabel (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Modifies a label at position idx. In case idx is larges than the number * <p>Modifies a label at position idx. In case idx is larges than the number
@ -170,7 +170,7 @@ void PNonMusrRawRunData::SetLabel(const UInt_t idx, const TString str)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// AppendSubData // AppendSubData (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Modifies the data set at position idx. In case idx is larger than the number * <p>Modifies the data set at position idx. In case idx is larger than the number
@ -190,7 +190,7 @@ void PNonMusrRawRunData::AppendSubData(const UInt_t idx, const Double_t dval)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// AppendSubErrData // AppendSubErrData (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Modifies the error-data set at position idx. In case idx is larger than the number * <p>Modifies the error-data set at position idx. In case idx is larger than the number
@ -555,7 +555,7 @@ PRawRunData::~PRawRunData()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetTemperature // GetTemperature (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Returns the temperature of a muSR run. * <p>Returns the temperature of a muSR run.
@ -577,7 +577,7 @@ const Double_t PRawRunData::GetTemperature(const UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetTempError // GetTempError (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Returns the error estimate of the temperature of a muSR run. * <p>Returns the error estimate of the temperature of a muSR run.
@ -599,7 +599,7 @@ const Double_t PRawRunData::GetTempError(const UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetRingAnode // GetRingAnode (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Returns the value of a ring anode high voltage. (idx = 0: RAL, 1: RAR, 2: RAT, 3: RAB) * <p> Returns the value of a ring anode high voltage. (idx = 0: RAL, 1: RAR, 2: RAT, 3: RAB)
@ -621,7 +621,7 @@ const Double_t PRawRunData::GetRingAnode(const UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetDataSet // GetDataSet (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Returns a raw muSR run data set. * <p>Returns a raw muSR run data set.
@ -643,7 +643,7 @@ PRawRunDataSet* PRawRunData::GetDataSet(const UInt_t idx, Bool_t wantHistoNo)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetRingAnode // SetRingAnode (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Store the ring anode value at index position idx. * <p> Store the ring anode value at index position idx.
@ -659,7 +659,7 @@ void PRawRunData::SetRingAnode(const UInt_t idx, const Double_t dval)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetTemperature // SetTemperature (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Store the temperature with its error at index position idx. * <p> Store the temperature with its error at index position idx.
@ -678,7 +678,7 @@ void PRawRunData::SetTemperature(const UInt_t idx, const Double_t temp, const Do
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetTempError // SetTempError (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Store the temperature error at index position idx. * <p> Store the temperature error at index position idx.
@ -722,8 +722,11 @@ PMsrRunBlock::PMsrRunBlock()
fBkgRange[i] = -1; // undefined start background range fBkgRange[i] = -1; // undefined start background range
fDataRange[i] = -1; // undefined start data range fDataRange[i] = -1; // undefined start data range
} }
fFitRangeInBins = false; // default is that fit range is given in time NOT bins
fFitRange[0] = PMUSR_UNDEFINED; // undefined start fit range fFitRange[0] = PMUSR_UNDEFINED; // undefined start fit range
fFitRange[1] = PMUSR_UNDEFINED; // undefined end fit range fFitRange[1] = PMUSR_UNDEFINED; // undefined end fit range
fFitRangeOffset[0] = 0; // undefined start fit range offset
fFitRangeOffset[1] = 0; // undefined end fit range offset
fPacking = -1; // undefined packing fPacking = -1; // undefined packing
fXYDataIndex[0] = -1; // undefined x data index (NonMusr) fXYDataIndex[0] = -1; // undefined x data index (NonMusr)
fXYDataIndex[1] = -1; // undefined y data index (NonMusr) fXYDataIndex[1] = -1; // undefined y data index (NonMusr)
@ -752,7 +755,7 @@ PMsrRunBlock::~PMsrRunBlock()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CleanUp // CleanUp (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Clean up data structure. * <p> Clean up data structure.
@ -772,8 +775,11 @@ void PMsrRunBlock::CleanUp()
fBkgRange[i] = -1; // undefined background range fBkgRange[i] = -1; // undefined background range
fDataRange[i] = -1; // undefined data range fDataRange[i] = -1; // undefined data range
} }
fFitRangeInBins = false; // default is that fit range is given in time NOT bins
fFitRange[0] = PMUSR_UNDEFINED; // undefined start fit range fFitRange[0] = PMUSR_UNDEFINED; // undefined start fit range
fFitRange[1] = PMUSR_UNDEFINED; // undefined end fit range fFitRange[1] = PMUSR_UNDEFINED; // undefined end fit range
fFitRangeOffset[0] = 0; // undefined start fit range offset
fFitRangeOffset[1] = 0; // undefined end fit range offset
fPacking = -1; // undefined packing fPacking = -1; // undefined packing
fXYDataIndex[0] = -1; // undefined x data index (NonMusr) fXYDataIndex[0] = -1; // undefined x data index (NonMusr)
fXYDataIndex[1] = -1; // undefined y data index (NonMusr) fXYDataIndex[1] = -1; // undefined y data index (NonMusr)
@ -797,7 +803,7 @@ void PMsrRunBlock::CleanUp()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetRunName // GetRunName (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get run name at position idx * <p> get run name at position idx
@ -817,7 +823,7 @@ TString* PMsrRunBlock::GetRunName(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetRunName // SetRunName (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set run name at position idx * <p> set run name at position idx
@ -839,7 +845,7 @@ void PMsrRunBlock::SetRunName(TString &str, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetBeamline // GetBeamline (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get beamline name at position idx * <p> get beamline name at position idx
@ -859,7 +865,7 @@ TString* PMsrRunBlock::GetBeamline(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetBeamline // SetBeamline (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set beamline name at position idx * <p> set beamline name at position idx
@ -881,7 +887,7 @@ void PMsrRunBlock::SetBeamline(TString &str, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetInstitute // GetInstitute (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get institute name at position idx * <p> get institute name at position idx
@ -901,7 +907,7 @@ TString* PMsrRunBlock::GetInstitute(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetInstitute // SetInstitute (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set institute name at position idx * <p> set institute name at position idx
@ -923,7 +929,7 @@ void PMsrRunBlock::SetInstitute(TString &str, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetFileFormat // GetFileFormat (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get file format name at position idx * <p> get file format name at position idx
@ -943,7 +949,7 @@ TString* PMsrRunBlock::GetFileFormat(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetFileFormat // SetFileFormat (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set file format name at position idx * <p> set file format name at position idx
@ -965,7 +971,7 @@ void PMsrRunBlock::SetFileFormat(TString &str, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetForwardHistoNo // GetForwardHistoNo (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get forward histogram value at position idx * <p> get forward histogram value at position idx
@ -988,7 +994,7 @@ Int_t PMsrRunBlock::GetForwardHistoNo(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetForwardHistoNo // SetForwardHistoNo (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set forward histogram value at index idx * <p> set forward histogram value at index idx
@ -1009,7 +1015,7 @@ void PMsrRunBlock::SetForwardHistoNo(Int_t histoNo, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetBackwardHistoNo // GetBackwardHistoNo (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get backward histogram value at position idx * <p> get backward histogram value at position idx
@ -1032,7 +1038,7 @@ Int_t PMsrRunBlock::GetBackwardHistoNo(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetBackwardHistoNo // SetBackwardHistoNo (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set backward histogram value at position pos * <p> set backward histogram value at position pos
@ -1053,7 +1059,7 @@ void PMsrRunBlock::SetBackwardHistoNo(Int_t histoNo, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetMap // GetMap (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get map value at position idx * <p> get map value at position idx
@ -1073,7 +1079,7 @@ Int_t PMsrRunBlock::GetMap(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetMap // SetMap (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set map value at position idx * <p> set map value at position idx
@ -1095,7 +1101,7 @@ void PMsrRunBlock::SetMap(Int_t mapVal, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetBkgEstimated // GetBkgEstimated (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get estimated background value at position idx. If not present, * <p> get estimated background value at position idx. If not present,
@ -1117,7 +1123,7 @@ Double_t PMsrRunBlock::GetBkgEstimated(UInt_t idx)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetBkgEstimated // SetBkgEstimated (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set estimated background value at position idx * <p> set estimated background value at position idx
@ -1137,7 +1143,7 @@ void PMsrRunBlock::SetBkgEstimated(Double_t dval, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetBkgFix // GetBkgFix (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get background fixed value at position idx * <p> get background fixed value at position idx
@ -1157,7 +1163,7 @@ Double_t PMsrRunBlock::GetBkgFix(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetBkgFix // SetBkgFix (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set background fixed value at position idx * <p> set background fixed value at position idx
@ -1177,7 +1183,7 @@ void PMsrRunBlock::SetBkgFix(Double_t dval, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetBkgRange // GetBkgRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get background range at position idx * <p> get background range at position idx
@ -1198,7 +1204,7 @@ Int_t PMsrRunBlock::GetBkgRange(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetBkgRange // SetBkgRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set background range element at position idx * <p> set background range element at position idx
@ -1219,7 +1225,7 @@ void PMsrRunBlock::SetBkgRange(Int_t ival, Int_t idx)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetDataRange // GetDataRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get data range at position idx * <p> get data range at position idx
@ -1240,7 +1246,7 @@ Int_t PMsrRunBlock::GetDataRange(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetDataRange // SetDataRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set data range element at position idx * <p> set data range element at position idx
@ -1260,7 +1266,7 @@ void PMsrRunBlock::SetDataRange(Int_t ival, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetT0Bin // GetT0Bin (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get T0 bin at position idx * <p> get T0 bin at position idx
@ -1280,7 +1286,7 @@ Double_t PMsrRunBlock::GetT0Bin(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetT0Bin // SetT0Bin (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set T0 bin at position idx * <p> set T0 bin at position idx
@ -1302,7 +1308,7 @@ void PMsrRunBlock::SetT0Bin(Double_t dval, Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetAddT0BinSize // GetAddT0BinSize (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get add T0 size of the addrun at index addRunIdx * <p> get add T0 size of the addrun at index addRunIdx
@ -1325,7 +1331,7 @@ Int_t PMsrRunBlock::GetAddT0BinSize(UInt_t addRunIdx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetAddT0Bin // GetAddT0Bin (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get add T0 of the addrun (index addRunIdx) at index histoIdx * <p> get add T0 of the addrun (index addRunIdx) at index histoIdx
@ -1355,7 +1361,7 @@ Double_t PMsrRunBlock::GetAddT0Bin(UInt_t addRunIdx, UInt_t histoIdx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetAddT0Bin // SetAddT0Bin (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set add T0 bin of the addrun at index histoNoIdx * <p> set add T0 bin of the addrun at index histoNoIdx
@ -1376,7 +1382,7 @@ void PMsrRunBlock::SetAddT0Bin(Double_t dval, UInt_t addRunIdx, UInt_t histoNoId
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// GetFitRange // GetFitRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> get fit range value at position idx. idx: 0=fit range start, 1=fit range end. * <p> get fit range value at position idx. idx: 0=fit range start, 1=fit range end.
@ -1396,7 +1402,7 @@ Double_t PMsrRunBlock::GetFitRange(UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetFitRange // SetFitRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> set fit range value at position idx * <p> set fit range value at position idx
@ -1413,7 +1419,44 @@ void PMsrRunBlock::SetFitRange(Double_t dval, UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetParGlobal // GetFitRangeOffset (public)
//--------------------------------------------------------------------------
/**
* <p> get fit range offset value at position idx. idx: 0=fit range offset start, 1=fit range offset end.
*
* <b>return:</b>
* - fit range offset value, if idx is within proper boundaries
* - -1, otherwise
*
* \param idx index of the fit range value to be returned
*/
Int_t PMsrRunBlock::GetFitRangeOffset(UInt_t idx)
{
if (idx >= 2)
return -1;
return fFitRangeOffset[idx];
}
//--------------------------------------------------------------------------
// SetFitRangeOffset (public)
//--------------------------------------------------------------------------
/**
* <p> set fit range offset value at position idx. Illegale values will be ignored.
*
* \param ival value to be set
* \param idx index of the fit range value to be set
*/
void PMsrRunBlock::SetFitRangeOffset(Int_t ival, UInt_t idx)
{
if (idx >= 2)
return;
fFitRangeOffset[idx] = ival;
}
//--------------------------------------------------------------------------
// SetParGlobal (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> store the information that a certain parameter used in the block is global * <p> store the information that a certain parameter used in the block is global
@ -1428,7 +1471,7 @@ void PMsrRunBlock::SetParGlobal(const TString &str, Int_t ival)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SetMapGlobal // SetMapGlobal (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> store the information that a certain mapped parameter in the block is global * <p> store the information that a certain mapped parameter in the block is global

143
src/classes/PRunAsymmetry.cpp
View File

@ -42,6 +42,10 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
#include <TString.h>
#include <TObjArray.h>
#include <TObjString.h>
#include "PMusr.h" #include "PMusr.h"
#include "PRunAsymmetry.h" #include "PRunAsymmetry.h"
@ -54,6 +58,11 @@ using namespace std;
PRunAsymmetry::PRunAsymmetry() : PRunBase() PRunAsymmetry::PRunAsymmetry() : PRunBase()
{ {
fNoOfFitBins = 0; fNoOfFitBins = 0;
// the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1;
fGoodBins[1] = -1;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -69,6 +78,11 @@ PRunAsymmetry::PRunAsymmetry() : PRunBase()
*/ */
PRunAsymmetry::PRunAsymmetry(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag) : PRunBase(msrInfo, rawData, runNo, tag) PRunAsymmetry::PRunAsymmetry(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag) : PRunBase(msrInfo, rawData, runNo, tag)
{ {
// the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1;
fGoodBins[1] = -1;
// check if alpha and/or beta is fixed -------------------- // check if alpha and/or beta is fixed --------------------
PMsrParamList *param = msrInfo->GetMsrParamList(); PMsrParamList *param = msrInfo->GetMsrParamList();
@ -140,7 +154,7 @@ PRunAsymmetry::~PRunAsymmetry()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CalcChiSquare // CalcChiSquare (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Calculate chi-square. * <p>Calculate chi-square.
@ -236,7 +250,7 @@ Double_t PRunAsymmetry::CalcChiSquareExpected(const std::vector<Double_t>& par)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CalcMaxLikelihood // CalcMaxLikelihood (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>NOT IMPLEMENTED!! * <p>NOT IMPLEMENTED!!
@ -266,7 +280,97 @@ UInt_t PRunAsymmetry::GetNoOfFitBins()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CalcNoOfFitBins (private) // SetFitRangeBin (public)
//--------------------------------------------------------------------------
/**
* <p>Allows to change the fit range on the fly. Used in the COMMAND block.
* The syntax of the string is: FIT_RANGE fgb[+n00] lgb[-n01] [fgb[+n10] lgb[-n11] ... fgb[+nN0] lgb[-nN1]].
* If only one pair of fgb/lgb is given, it is used for all runs in the RUN block section.
* If multiple fgb/lgb's are given, the number N has to be the number of RUN blocks in
* the msr-file.
*
* <p>nXY are offsets which can be used to shift, limit the fit range.
*
* \param fitRange string containing the necessary information.
*/
void PRunAsymmetry::SetFitRangeBin(const TString fitRange)
{
TObjArray *tok = 0;
TObjString *ostr = 0;
TString str;
Ssiz_t idx = -1;
Int_t offset = 0;
tok = fitRange.Tokenize(" \t");
if (tok->GetEntries() == 3) { // structure FIT_RANGE fgb+n0 lgb-n1
// handle fgb+n0 entry
ostr = (TObjString*) tok->At(1);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("+");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitStartTime = (fGoodBins[0] + offset - fT0s[0]) * fTimeResolution;
// handle lgb-n1 entry
ostr = (TObjString*) tok->At(2);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("-");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitEndTime = (fGoodBins[1] - offset - fT0s[0]) * fTimeResolution;
} else if ((tok->GetEntries() > 3) && (tok->GetEntries() % 2 == 1)) { // structure FIT_RANGE fgb[+n00] lgb[-n01] [fgb[+n10] lgb[-n11] ... fgb[+nN0] lgb[-nN1]]
Int_t pos = 2*(fRunNo+1)-1;
if (pos + 1 >= tok->GetEntries()) {
cerr << endl << ">> PRunSingleHisto::SetFitRangeBin(): **ERROR** invalid FIT_RANGE command found: '" << fitRange << "'";
cerr << endl << ">> will ignore it. Sorry ..." << endl;
} else {
// handle fgb+n0 entry
ostr = (TObjString*) tok->At(pos);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("+");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitStartTime = (fGoodBins[0] + offset - fT0s[0]) * fTimeResolution;
// handle lgb-n1 entry
ostr = (TObjString*) tok->At(pos+1);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("-");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitEndTime = (fGoodBins[1] - offset - fT0s[0]) * fTimeResolution;
}
} else { // error
cerr << endl << ">> PRunSingleHisto::SetFitRangeBin(): **ERROR** invalid FIT_RANGE command found: '" << fitRange << "'";
cerr << endl << ">> will ignore it. Sorry ..." << endl;
}
// clean up
if (tok) {
delete tok;
}
}
//--------------------------------------------------------------------------
// CalcNoOfFitBins (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Calculate the number of fitted bins for the current fit range. * <p>Calculate the number of fitted bins for the current fit range.
@ -288,7 +392,7 @@ void PRunAsymmetry::CalcNoOfFitBins()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CalcTheory // CalcTheory (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Calculate theory for a given set of fit-parameters. * <p>Calculate theory for a given set of fit-parameters.
@ -344,7 +448,7 @@ void PRunAsymmetry::CalcTheory()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareData // PrepareData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Prepare data for fitting or viewing. What is already processed at this stage: * <p>Prepare data for fitting or viewing. What is already processed at this stage:
@ -682,7 +786,7 @@ Bool_t PRunAsymmetry::PrepareData()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SubtractFixBkg // SubtractFixBkg (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Subtracts a fixed background from the raw data. The background is given * <p>Subtracts a fixed background from the raw data. The background is given
@ -722,7 +826,7 @@ Bool_t PRunAsymmetry::SubtractFixBkg()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// SubtractEstimatedBkg // SubtractEstimatedBkg (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Subtracts the background which is estimated from a given interval (typically before t0). * <p>Subtracts the background which is estimated from a given interval (typically before t0).
@ -835,7 +939,7 @@ Bool_t PRunAsymmetry::SubtractEstimatedBkg()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareFitData // PrepareFitData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the asymmetry for fitting. * <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the asymmetry for fitting.
@ -936,6 +1040,19 @@ Bool_t PRunAsymmetry::PrepareFitData(PRawRunData* runData, UInt_t histoNo[2])
cerr << endl; cerr << endl;
} }
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
// write these times back into the data structure. This way it is available when writting the log-file
fRunInfo->SetFitRange(fFitStartTime, 0);
fRunInfo->SetFitRange(fFitEndTime, 1);
}
// keep good bins for potential latter use
fGoodBins[0] = start[0];
fGoodBins[1] = end[0];
// everything looks fine, hence fill packed forward and backward histo // everything looks fine, hence fill packed forward and backward histo
PRunData forwardPacked; PRunData forwardPacked;
PRunData backwardPacked; PRunData backwardPacked;
@ -1032,7 +1149,7 @@ Bool_t PRunAsymmetry::PrepareFitData(PRawRunData* runData, UInt_t histoNo[2])
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareViewData // PrepareViewData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the asymmetry for view representation. * <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the asymmetry for view representation.
@ -1141,6 +1258,12 @@ Bool_t PRunAsymmetry::PrepareViewData(PRawRunData* runData, UInt_t histoNo[2])
} }
} }
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
}
// everything looks fine, hence fill packed forward and backward histo // everything looks fine, hence fill packed forward and backward histo
PRunData forwardPacked; PRunData forwardPacked;
PRunData backwardPacked; PRunData backwardPacked;
@ -1289,7 +1412,7 @@ Bool_t PRunAsymmetry::PrepareViewData(PRawRunData* runData, UInt_t histoNo[2])
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareRRFViewData // PrepareRRFViewData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Prepares the RRF data set for visual representation. This is done the following way: * <p> Prepares the RRF data set for visual representation. This is done the following way:

288
src/classes/PRunDataHandler.cpp
View File

@ -82,22 +82,68 @@ using namespace std;
#define A2M_WKM 7 #define A2M_WKM 7
#define A2M_ASCII 8 #define A2M_ASCII 8
#define PHR_INIT_ALL 0
#define PHR_INIT_MSR 1
#define PHR_INIT_ANY2MANY 2
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// Constructor // Constructor
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Constructor, reading the data histogramm files. * <p>Empty Constructor
*
* \param msrInfo pointer to the msr-file handler
*/ */
PRunDataHandler::PRunDataHandler(PAny2ManyInfo *any2ManyInfo) : fAny2ManyInfo(any2ManyInfo) PRunDataHandler::PRunDataHandler()
{ {
fDataPath.clear(); Init();
// read files }
if (!ReadWriteFilesList()) // couldn't read file
fAllDataAvailable = false; //--------------------------------------------------------------------------
else // Constructor
fAllDataAvailable = true; //--------------------------------------------------------------------------
/**
* <p>Constructor which just reads a single muSR data file.
*
* \param fileName
* \param fileFormat
*/
PRunDataHandler::PRunDataHandler(TString fileName, const TString fileFormat) : fFileFormat(fileFormat)
{
Init();
FileExistsCheck(fileName);
}
//--------------------------------------------------------------------------
// Constructor
//--------------------------------------------------------------------------
/**
* <p>Constructor which just reads a single muSR data file.
*
* \param fileName
* \param fileFormat
* \param dataPath
*/
PRunDataHandler::PRunDataHandler(TString fileName, const TString fileFormat, const PStringVector dataPath) : fDataPath(dataPath), fFileFormat(fileFormat)
{
Init();
FileExistsCheck(fileName);
}
//--------------------------------------------------------------------------
// Constructor
//--------------------------------------------------------------------------
/**
* <p>Constructor which just writes a single muSR data file.
*
* \param fileName
* \param fileFormat
* \param dataPath
* \param runData
*/
PRunDataHandler::PRunDataHandler(TString fileName, const TString fileFormat, const TString dataPath, PRawRunData &runData)
{
Init();
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -108,14 +154,24 @@ PRunDataHandler::PRunDataHandler(PAny2ManyInfo *any2ManyInfo) : fAny2ManyInfo(an
* *
* \param msrInfo pointer to the msr-file handler * \param msrInfo pointer to the msr-file handler
*/ */
PRunDataHandler::PRunDataHandler(PAny2ManyInfo *any2ManyInfo) : fAny2ManyInfo(any2ManyInfo)
{
Init(PHR_INIT_ANY2MANY);
}
//--------------------------------------------------------------------------
// Constructor
//--------------------------------------------------------------------------
/**
* <p>Constructor, reading the data histogramm files.
*
* \param any2ManyInfo pointer to the PAny2ManyInfo structure needed to convert data
* \param dataPath contains all data search paths.
*/
PRunDataHandler::PRunDataHandler(PAny2ManyInfo *any2ManyInfo, const PStringVector dataPath) : PRunDataHandler::PRunDataHandler(PAny2ManyInfo *any2ManyInfo, const PStringVector dataPath) :
fAny2ManyInfo(any2ManyInfo), fDataPath(dataPath) fAny2ManyInfo(any2ManyInfo), fDataPath(dataPath)
{ {
// read files Init(PHR_INIT_ANY2MANY);
if (!ReadWriteFilesList()) // couldn't read file
fAllDataAvailable = false;
else
fAllDataAvailable = true;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -128,11 +184,7 @@ PRunDataHandler::PRunDataHandler(PAny2ManyInfo *any2ManyInfo, const PStringVecto
*/ */
PRunDataHandler::PRunDataHandler(PMsrHandler *msrInfo) : fMsrInfo(msrInfo) PRunDataHandler::PRunDataHandler(PMsrHandler *msrInfo) : fMsrInfo(msrInfo)
{ {
// read files Init(PHR_INIT_MSR);
if (!ReadFilesMsr()) // couldn't read file
fAllDataAvailable = false;
else
fAllDataAvailable = true;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -148,11 +200,7 @@ PRunDataHandler::PRunDataHandler(PMsrHandler *msrInfo) : fMsrInfo(msrInfo)
PRunDataHandler::PRunDataHandler(PMsrHandler *msrInfo, const PStringVector dataPath) : PRunDataHandler::PRunDataHandler(PMsrHandler *msrInfo, const PStringVector dataPath) :
fMsrInfo(msrInfo), fDataPath(dataPath) fMsrInfo(msrInfo), fDataPath(dataPath)
{ {
// read files Init(PHR_INIT_MSR);
if (!ReadFilesMsr()) // couldn't read file
fAllDataAvailable = false;
else
fAllDataAvailable = true;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -163,6 +211,7 @@ PRunDataHandler::PRunDataHandler(PMsrHandler *msrInfo, const PStringVector dataP
*/ */
PRunDataHandler::~PRunDataHandler() PRunDataHandler::~PRunDataHandler()
{ {
fDataPath.clear();
fData.clear(); fData.clear();
} }
@ -170,7 +219,7 @@ PRunDataHandler::~PRunDataHandler()
// GetRunData // GetRunData
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Checks if runName is found. * <p>Checks if runName is found, and if so return these data.
* *
* <b>return:</b> * <b>return:</b>
* - if data are found: pointer to the data. * - if data are found: pointer to the data.
@ -194,7 +243,87 @@ PRawRunData* PRunDataHandler::GetRunData(const TString &runName)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadFilesMsr // ReadData
//--------------------------------------------------------------------------
/**
* <p>Read data. Used to read data, either msr-file triggered, or a single
* explicit data file should be read.
*/
void PRunDataHandler::ReadData()
{
if (fMsrInfo) { // i.e. msr-file triggered
if (!ReadFilesMsr()) // couldn't read file
fAllDataAvailable = false;
else
fAllDataAvailable = true;
} else if (!fRunPathName.IsWhitespace()) { // i.e. file name triggered
cerr << endl << "debug>> fFileFormat=\"" << fFileFormat << "\"" << endl;
if ((fFileFormat == "MusrRoot") || (fFileFormat == "musrroot")) {
fAllDataAvailable = ReadRootFile();
} else if ((fFileFormat == "NeXus") || (fFileFormat == "nexus")) {
fAllDataAvailable = ReadNexusFile();
} else if ((fFileFormat == "PsiBin") || (fFileFormat == "psibin")) {
fAllDataAvailable = ReadPsiBinFile();
} else if ((fFileFormat == "Mud") || (fFileFormat == "mud")) {
fAllDataAvailable = ReadMudFile();
} else if ((fFileFormat == "Wkm") || (fFileFormat == "wkm")) {
fAllDataAvailable = ReadWkmFile();
} else {
cerr << endl << ">> PRunDataHandler::ReadData(): **ERROR** unkown file format \"" << fFileFormat << "\" found." << endl;
fAllDataAvailable = false;
}
} else {
cerr << endl << ">> PRunDataHandler::ReadData(): **ERROR** Couldn't read files." << endl;
fAllDataAvailable = false;
}
}
//--------------------------------------------------------------------------
// ConvertData
//--------------------------------------------------------------------------
/**
* <p>Read data and convert it. This routine is used by any2many.
*/
void PRunDataHandler::ConvertData()
{
if (!ReadWriteFilesList()) // couldn't read file
fAllDataAvailable = false;
else
fAllDataAvailable = true;
}
//--------------------------------------------------------------------------
// WriteData
//--------------------------------------------------------------------------
/**
* <p>Write data. This routine is used to write a single file.
*/
void PRunDataHandler::WriteData()
{
}
//--------------------------------------------------------------------------
// Init (private)
//--------------------------------------------------------------------------
/**
* <p>Common initializer.
*/
void PRunDataHandler::Init(const Int_t tag)
{
if ((tag==PHR_INIT_ALL) || (tag==PHR_INIT_ANY2MANY))
fMsrInfo = 0;
if ((tag==PHR_INIT_ALL) || (tag==PHR_INIT_MSR))
fAny2ManyInfo = 0;
fAllDataAvailable = false;
if (tag!=PHR_INIT_ALL)
fFileFormat = TString("");
fRunName = TString("");
fRunPathName = TString("");
}
//--------------------------------------------------------------------------
// ReadFilesMsr (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> The main read file routine which is filtering what read sub-routine * <p> The main read file routine which is filtering what read sub-routine
@ -283,7 +412,7 @@ Bool_t PRunDataHandler::ReadFilesMsr()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadWriteFilesList // ReadWriteFilesList (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> The main read file routine which is filtering what read sub-routine * <p> The main read file routine which is filtering what read sub-routine
@ -762,7 +891,7 @@ void PRunDataHandler::TestFileName(TString &runName, const TString &ext)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// FileExistsCheck // FileExistsCheck (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Checks if a given data file exists. * <p>Checks if a given data file exists.
@ -972,7 +1101,7 @@ Bool_t PRunDataHandler::FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// FileExistsCheck // FileExistsCheck (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Checks if a given data file exists. Used for the any2many program. * <p>Checks if a given data file exists. Used for the any2many program.
@ -1069,7 +1198,76 @@ Bool_t PRunDataHandler::FileExistsCheck(const Bool_t fileName, const Int_t idx)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadRootFile // FileExistsCheck (private)
//--------------------------------------------------------------------------
/**
* <p>Checks if a given data file exists. Used for the any2many program.
*
* <b>return:</b>
* - true if data file exists,
* - otherwise false.
*
* \param fileName file name
*/
Bool_t PRunDataHandler::FileExistsCheck(const TString fileName)
{
TString pathName("???");
TString str("");
// check if the file is in the local directory
if (gSystem->AccessPathName(fileName) != true) { // found in the local dir
pathName = fileName;
}
// check if the file is found in the directory given in the startup file
if (pathName.CompareTo("???") == 0) { // not found in local directory search
for (UInt_t i=0; i<fDataPath.size(); i++) {
str = fDataPath[i] + TString("/") + fileName;
if (gSystem->AccessPathName(str.Data())!=true) { // found
pathName = str;
break;
}
}
}
// check if the file is found in the directories given by MUSRFULLDATAPATH
const Char_t *musrpath = gSystem->Getenv("MUSRFULLDATAPATH");
if (pathName.CompareTo("???") == 0) { // not found in local directory and xml path
str = TString(musrpath);
// MUSRFULLDATAPATH has the structure: path_1:path_2:...:path_n
TObjArray *tokens = str.Tokenize(":");
TObjString *ostr;
for (Int_t i=0; i<tokens->GetEntries(); i++) {
ostr = dynamic_cast<TObjString*>(tokens->At(i));
str = ostr->GetString() + TString("/") + fileName;
if (gSystem->AccessPathName(str.Data())!=true) { // found
pathName = str;
break;
}
}
// cleanup
if (tokens) {
delete tokens;
tokens = 0;
}
}
// no proper path name found
if (pathName.CompareTo("???") == 0) {
cerr << endl << ">> PRunDataHandler::FileExistsCheck(): **ERROR** Couldn't find '" << fileName.Data() << "' in any standard path.";
cerr << endl << ">> standard search pathes are:";
cerr << endl << ">> 1. the local directory";
cerr << endl << ">> 2. the data directory given in the startup XML file";
cerr << endl << ">> 3. the directories listed in MUSRFULLDATAPATH";
return false;
}
fRunPathName = pathName;
cerr << endl << "debug-> fRunPathName=" << fRunPathName << endl;
return true;
}
//--------------------------------------------------------------------------
// ReadRootFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Reads both, the "old" LEM-data ROOT-files with TLemRunHeader, and the more general * <p> Reads both, the "old" LEM-data ROOT-files with TLemRunHeader, and the more general
@ -1738,7 +1936,7 @@ Bool_t PRunDataHandler::ReadRootFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadNexusFile // ReadNexusFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Will read the NeXuS File Format as soon as PSI will have an implementation. * <p> Will read the NeXuS File Format as soon as PSI will have an implementation.
@ -2105,7 +2303,7 @@ Bool_t PRunDataHandler::ReadNexusFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadWkmFile // ReadWkmFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Reads, for backwards compatibility, the ascii-wkm-file data format. * <p> Reads, for backwards compatibility, the ascii-wkm-file data format.
@ -2411,7 +2609,7 @@ Bool_t PRunDataHandler::ReadWkmFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadPsiBinFile // ReadPsiBinFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Reads the old-fashioned PSI-BIN data-files. The MuSR_td_PSI_bin class * <p> Reads the old-fashioned PSI-BIN data-files. The MuSR_td_PSI_bin class
@ -2659,7 +2857,7 @@ Bool_t PRunDataHandler::ReadPsiBinFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadMudFile // ReadMudFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Reads the triumf mud-file format. * <p> Reads the triumf mud-file format.
@ -2977,7 +3175,7 @@ Bool_t PRunDataHandler::ReadMudFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadMduAsciiFile // ReadMduAsciiFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Reads the mdu ascii files (PSI). Needed to work around PSI-BIN limitations. * <p>Reads the mdu ascii files (PSI). Needed to work around PSI-BIN limitations.
@ -3280,7 +3478,7 @@ Bool_t PRunDataHandler::ReadMduAsciiFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadAsciiFile // ReadAsciiFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Reads ascii files. Intended for the nonMuSR data. * <p>Reads ascii files. Intended for the nonMuSR data.
@ -3517,7 +3715,7 @@ Bool_t PRunDataHandler::ReadAsciiFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// ReadDBFile // ReadDBFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Reads triumf db-files. Intended for the nonMuSR data. * <p>Reads triumf db-files. Intended for the nonMuSR data.
@ -3966,7 +4164,7 @@ Bool_t PRunDataHandler::ReadDBFile()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WriteMusrRootFile // WriteMusrRootFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the MusrRoot file format. Only the required entries will be handled. * <p> Write the MusrRoot file format. Only the required entries will be handled.
@ -4208,7 +4406,7 @@ Bool_t PRunDataHandler::WriteMusrRootFile(TString fln)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WriteRootFile // WriteRootFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the PSI LEM root-file format. * <p> Write the PSI LEM root-file format.
@ -4392,7 +4590,7 @@ Bool_t PRunDataHandler::WriteRootFile(TString fln)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WriteNexusFile // WriteNexusFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the nexus-file format. * <p> Write the nexus-file format.
@ -4737,7 +4935,7 @@ Bool_t PRunDataHandler::WriteNexusFile(TString fln)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WriteWkmFile // WriteWkmFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the wkm-file format. * <p> Write the wkm-file format.
@ -4878,7 +5076,7 @@ Bool_t PRunDataHandler::WriteWkmFile(TString fln)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WritePsiBinFile // WritePsiBinFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the psi-bin-file format. * <p> Write the psi-bin-file format.
@ -5099,7 +5297,7 @@ Bool_t PRunDataHandler::WritePsiBinFile(TString fln)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WriteMudFile // WriteMudFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the mud-file format. * <p> Write the mud-file format.
@ -5259,7 +5457,7 @@ Bool_t PRunDataHandler::WriteMudFile(TString fln)
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// WriteAsciiFile // WriteAsciiFile (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p> Write the ascii-file format. * <p> Write the ascii-file format.

30
src/classes/PRunListCollection.cpp
View File

@ -131,8 +131,34 @@ Bool_t PRunListCollection::Add(Int_t runNo, EPMusrHandleTag tag)
// SetFitRange (public) // SetFitRange (public)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Set the current fit range. If fitRange.size()==1 the given fit range will be used for all the runs, * <p>Set the current fit range in bins. The string has the structure:
* otherwise fitRange.size()==the number of runs in the msr-file, and for each run there will be an induvidual * 'fit_range fgb0+n00 lgb0-n01 [fgb1+n10 lgb-n11 fgb2+n20 lgb2-n21 .. fgbN+nN0 lgbN-nN1]'
* where fgb is the first good bin, lgb is the last good bin. nXY are offsets in bins.
* N is the number of runs in the msr-file.
*
* <p>This means there are 2 options: (i) a globle fit range in bins for <em>all</em> runs in the
* msr-file, or (ii) each run block in the msr-file needs its individual range.
*
* \param fitRange string holding the fit range(s).
*/
void PRunListCollection::SetFitRange(const TString fitRange)
{
for (UInt_t i=0; i<fRunSingleHistoList.size(); i++)
fRunSingleHistoList[i]->SetFitRangeBin(fitRange);
for (UInt_t i=0; i<fRunAsymmetryList.size(); i++)
fRunAsymmetryList[i]->SetFitRangeBin(fitRange);
for (UInt_t i=0; i<fRunMuMinusList.size(); i++)
fRunMuMinusList[i]->SetFitRangeBin(fitRange);
for (UInt_t i=0; i<fRunNonMusrList.size(); i++)
fRunNonMusrList[i]->SetFitRangeBin(fitRange);
}
//--------------------------------------------------------------------------
// SetFitRange (public)
//--------------------------------------------------------------------------
/**
* <p>Set the current fit range in time. If fitRange.size()==1 the given fit range will be used for all the runs,
* otherwise fitRange.size()==the number of runs in the msr-file, and for each run there will be an individual
* fit range. * fit range.
* *
* \param fitRange vector holding the fit range(s). * \param fitRange vector holding the fit range(s).

124
src/classes/PRunMuMinus.cpp
View File

@ -30,6 +30,11 @@
***************************************************************************/ ***************************************************************************/
#include <iostream> #include <iostream>
using namespace std;
#include <TString.h>
#include <TObjArray.h>
#include <TObjString.h>
#include "PRunMuMinus.h" #include "PRunMuMinus.h"
@ -43,6 +48,11 @@ PRunMuMinus::PRunMuMinus() : PRunBase()
{ {
fNoOfFitBins = 0; fNoOfFitBins = 0;
// the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1;
fGoodBins[1] = -1;
fHandleTag = kEmpty; fHandleTag = kEmpty;
} }
@ -61,6 +71,11 @@ PRunMuMinus::PRunMuMinus(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t
{ {
fNoOfFitBins = 0; fNoOfFitBins = 0;
// the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1;
fGoodBins[1] = -1;
if (!PrepareData()) { if (!PrepareData()) {
cerr << endl << ">> PRunMuMinus::PRunMuMinus: **SEVERE ERROR**: Couldn't prepare data for fitting!"; cerr << endl << ">> PRunMuMinus::PRunMuMinus: **SEVERE ERROR**: Couldn't prepare data for fitting!";
cerr << endl << ">> This is very bad :-(, will quit ..."; cerr << endl << ">> This is very bad :-(, will quit ...";
@ -270,6 +285,96 @@ UInt_t PRunMuMinus::GetNoOfFitBins()
return fNoOfFitBins; return fNoOfFitBins;
} }
//--------------------------------------------------------------------------
// SetFitRangeBin (public)
//--------------------------------------------------------------------------
/**
* <p>Allows to change the fit range on the fly. Used in the COMMAND block.
* The syntax of the string is: FIT_RANGE fgb[+n00] lgb[-n01] [fgb[+n10] lgb[-n11] ... fgb[+nN0] lgb[-nN1]].
* If only one pair of fgb/lgb is given, it is used for all runs in the RUN block section.
* If multiple fgb/lgb's are given, the number N has to be the number of RUN blocks in
* the msr-file.
*
* <p>nXY are offsets which can be used to shift, limit the fit range.
*
* \param fitRange string containing the necessary information.
*/
void PRunMuMinus::SetFitRangeBin(const TString fitRange)
{
TObjArray *tok = 0;
TObjString *ostr = 0;
TString str;
Ssiz_t idx = -1;
Int_t offset = 0;
tok = fitRange.Tokenize(" \t");
if (tok->GetEntries() == 3) { // structure FIT_RANGE fgb+n0 lgb-n1
// handle fgb+n0 entry
ostr = (TObjString*) tok->At(1);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("+");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitStartTime = (fGoodBins[0] + offset - fT0s[0]) * fTimeResolution;
// handle lgb-n1 entry
ostr = (TObjString*) tok->At(2);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("-");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitEndTime = (fGoodBins[1] - offset - fT0s[0]) * fTimeResolution;
} else if ((tok->GetEntries() > 3) && (tok->GetEntries() % 2 == 1)) { // structure FIT_RANGE fgb[+n00] lgb[-n01] [fgb[+n10] lgb[-n11] ... fgb[+nN0] lgb[-nN1]]
Int_t pos = 2*(fRunNo+1)-1;
if (pos + 1 >= tok->GetEntries()) {
cerr << endl << ">> PRunSingleHisto::SetFitRangeBin(): **ERROR** invalid FIT_RANGE command found: '" << fitRange << "'";
cerr << endl << ">> will ignore it. Sorry ..." << endl;
} else {
// handle fgb+n0 entry
ostr = (TObjString*) tok->At(pos);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("+");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitStartTime = (fGoodBins[0] + offset - fT0s[0]) * fTimeResolution;
// handle lgb-n1 entry
ostr = (TObjString*) tok->At(pos+1);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("-");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitEndTime = (fGoodBins[1] - offset - fT0s[0]) * fTimeResolution;
}
} else { // error
cerr << endl << ">> PRunSingleHisto::SetFitRangeBin(): **ERROR** invalid FIT_RANGE command found: '" << fitRange << "'";
cerr << endl << ">> will ignore it. Sorry ..." << endl;
}
// clean up
if (tok) {
delete tok;
}
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CalcNoOfFitBins (private) // CalcNoOfFitBins (private)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -594,6 +699,19 @@ Bool_t PRunMuMinus::PrepareFitData(PRawRunData* runData, const UInt_t histoNo)
return false; return false;
} }
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
// write these times back into the data structure. This way it is available when writting the log-file
fRunInfo->SetFitRange(fFitStartTime, 0);
fRunInfo->SetFitRange(fFitEndTime, 1);
}
// keep good bins for potential latter use
fGoodBins[0] = start;
fGoodBins[1] = end;
// everything looks fine, hence fill data set // everything looks fine, hence fill data set
Int_t t0 = (Int_t)fT0s[0]; Int_t t0 = (Int_t)fT0s[0];
Double_t value = 0.0; Double_t value = 0.0;
@ -695,6 +813,12 @@ Bool_t PRunMuMinus::PrepareRawViewData(PRawRunData* runData, const UInt_t histoN
return false; return false;
} }
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
}
// everything looks fine, hence fill data set // everything looks fine, hence fill data set
Int_t t0 = (Int_t)fT0s[0]; Int_t t0 = (Int_t)fT0s[0];
Double_t value = 0.0; Double_t value = 0.0;

139
src/classes/PRunSingleHisto.cpp
View File

@ -58,6 +58,12 @@ PRunSingleHisto::PRunSingleHisto() : PRunBase()
{ {
fScaleN0AndBkg = true; fScaleN0AndBkg = true;
fNoOfFitBins = 0; fNoOfFitBins = 0;
fBackground = 0;
// the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1;
fGoodBins[1] = -1;
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@ -76,6 +82,11 @@ PRunSingleHisto::PRunSingleHisto(PMsrHandler *msrInfo, PRunDataHandler *rawData,
fScaleN0AndBkg = IsScaleN0AndBkg(); fScaleN0AndBkg = IsScaleN0AndBkg();
fNoOfFitBins = 0; fNoOfFitBins = 0;
// the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1;
fGoodBins[1] = -1;
if (!PrepareData()) { if (!PrepareData()) {
cerr << endl << ">> PRunSingleHisto::PRunSingleHisto: **SEVERE ERROR**: Couldn't prepare data for fitting!"; cerr << endl << ">> PRunSingleHisto::PRunSingleHisto: **SEVERE ERROR**: Couldn't prepare data for fitting!";
cerr << endl << ">> This is very bad :-(, will quit ..."; cerr << endl << ">> This is very bad :-(, will quit ...";
@ -461,7 +472,97 @@ UInt_t PRunSingleHisto::GetNoOfFitBins()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// CalcNoOfFitBins (private) // SetFitRangeBin (public)
//--------------------------------------------------------------------------
/**
* <p>Allows to change the fit range on the fly. Used in the COMMAND block.
* The syntax of the string is: FIT_RANGE fgb[+n00] lgb[-n01] [fgb[+n10] lgb[-n11] ... fgb[+nN0] lgb[-nN1]].
* If only one pair of fgb/lgb is given, it is used for all runs in the RUN block section.
* If multiple fgb/lgb's are given, the number N has to be the number of RUN blocks in
* the msr-file.
*
* <p>nXY are offsets which can be used to shift, limit the fit range.
*
* \param fitRange string containing the necessary information.
*/
void PRunSingleHisto::SetFitRangeBin(const TString fitRange)
{
TObjArray *tok = 0;
TObjString *ostr = 0;
TString str;
Ssiz_t idx = -1;
Int_t offset = 0;
tok = fitRange.Tokenize(" \t");
if (tok->GetEntries() == 3) { // structure FIT_RANGE fgb+n0 lgb-n1
// handle fgb+n0 entry
ostr = (TObjString*) tok->At(1);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("+");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitStartTime = (fGoodBins[0] + offset - fT0s[0]) * fTimeResolution;
// handle lgb-n1 entry
ostr = (TObjString*) tok->At(2);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("-");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitEndTime = (fGoodBins[1] - offset - fT0s[0]) * fTimeResolution;
} else if ((tok->GetEntries() > 3) && (tok->GetEntries() % 2 == 1)) { // structure FIT_RANGE fgb[+n00] lgb[-n01] [fgb[+n10] lgb[-n11] ... fgb[+nN0] lgb[-nN1]]
Int_t pos = 2*(fRunNo+1)-1;
if (pos + 1 >= tok->GetEntries()) {
cerr << endl << ">> PRunSingleHisto::SetFitRangeBin(): **ERROR** invalid FIT_RANGE command found: '" << fitRange << "'";
cerr << endl << ">> will ignore it. Sorry ..." << endl;
} else {
// handle fgb+n0 entry
ostr = (TObjString*) tok->At(pos);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("+");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitStartTime = (fGoodBins[0] + offset - fT0s[0]) * fTimeResolution;
// handle lgb-n1 entry
ostr = (TObjString*) tok->At(pos+1);
str = ostr->GetString();
// check if there is an offset present
idx = str.First("-");
if (idx != -1) { // offset present
str.Remove(0, idx+1);
if (str.IsFloat()) // if str is a valid number, convert is to an integer
offset = str.Atoi();
}
fFitEndTime = (fGoodBins[1] - offset - fT0s[0]) * fTimeResolution;
}
} else { // error
cerr << endl << ">> PRunSingleHisto::SetFitRangeBin(): **ERROR** invalid FIT_RANGE command found: '" << fitRange << "'";
cerr << endl << ">> will ignore it. Sorry ..." << endl;
}
// clean up
if (tok) {
delete tok;
}
}
//--------------------------------------------------------------------------
// CalcNoOfFitBins (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Calculate the number of fitted bins for the current fit range. * <p>Calculate the number of fitted bins for the current fit range.
@ -483,7 +584,7 @@ void PRunSingleHisto::CalcNoOfFitBins()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareData (private) // PrepareData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Prepare data for fitting or viewing. What is already processed at this stage: * <p>Prepare data for fitting or viewing. What is already processed at this stage:
@ -653,7 +754,7 @@ Bool_t PRunSingleHisto::PrepareData()
} }
} }
// set forward/backward histo data of the first group // set forward histo data of the first group
fForward.resize(forward[0].size()); fForward.resize(forward[0].size());
for (UInt_t i=0; i<fForward.size(); i++) { for (UInt_t i=0; i<fForward.size(); i++) {
fForward[i] = forward[0][i]; fForward[i] = forward[0][i];
@ -690,7 +791,7 @@ Bool_t PRunSingleHisto::PrepareData()
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareFitData (private) // PrepareFitData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the histogram for fitting. * <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the histogram for fitting.
@ -754,6 +855,20 @@ Bool_t PRunSingleHisto::PrepareFitData(PRawRunData* runData, const UInt_t histoN
return false; return false;
} }
// keep good bins for potential latter use
fGoodBins[0] = start;
fGoodBins[1] = end;
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
// write these times back into the data structure. This way it is available when writting the log-file
fRunInfo->SetFitRange(fFitStartTime, 0);
fRunInfo->SetFitRange(fFitEndTime, 1);
cout << "debug> fit: " << fRunInfo->GetFitRange(0) << ", " << fRunInfo->GetFitRange(1) << end;
}
// check how the background shall be handled // check how the background shall be handled
if (fRunInfo->GetBkgFitParamNo() == -1) { // bkg shall **NOT** be fitted if (fRunInfo->GetBkgFitParamNo() == -1) { // bkg shall **NOT** be fitted
// subtract background from histogramms ------------------------------------------ // subtract background from histogramms ------------------------------------------
@ -820,7 +935,7 @@ Bool_t PRunSingleHisto::PrepareFitData(PRawRunData* runData, const UInt_t histoN
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareRawViewData (private) // PrepareRawViewData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the histogram for viewing * <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the histogram for viewing
@ -888,6 +1003,12 @@ Bool_t PRunSingleHisto::PrepareRawViewData(PRawRunData* runData, const UInt_t hi
return false; return false;
} }
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
}
// everything looks fine, hence fill data set // everything looks fine, hence fill data set
Int_t t0 = (Int_t)fT0s[0]; Int_t t0 = (Int_t)fT0s[0];
Double_t value = 0.0; Double_t value = 0.0;
@ -997,7 +1118,7 @@ Bool_t PRunSingleHisto::PrepareRawViewData(PRawRunData* runData, const UInt_t hi
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
// PrepareViewData (private) // PrepareViewData (protected)
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the histogram for viewing * <p>Take the pre-processed data (i.e. grouping and addrun are preformed) and form the histogram for viewing
@ -1085,6 +1206,12 @@ Bool_t PRunSingleHisto::PrepareViewData(PRawRunData* runData, const UInt_t histo
return false; return false;
} }
// if fit range is given in bins (and not time), the fit start/end time can be calculated at this point now
if (fRunInfo->IsFitRangeInBin()) {
fFitStartTime = (fRunInfo->GetDataRange(0) + fRunInfo->GetFitRangeOffset(0) - fT0s[0]) * fTimeResolution; // (fgb+n0-t0)*dt
fFitEndTime = (fRunInfo->GetDataRange(1) - fRunInfo->GetFitRangeOffset(1) - fT0s[0]) * fTimeResolution; // (lgb-n1-t0)*dt
}
// everything looks fine, hence fill data set // everything looks fine, hence fill data set
// feed the parameter vector // feed the parameter vector

2
src/include/PFitter.h
View File

@ -81,6 +81,7 @@ class PFitter
Bool_t fConverged; ///< flag. true: the fit has converged. Bool_t fConverged; ///< flag. true: the fit has converged.
Bool_t fChisqOnly; ///< flag. true: calculate chi^2 only (no fitting). Bool_t fChisqOnly; ///< flag. true: calculate chi^2 only (no fitting).
Bool_t fUseChi2; ///< flag. true: chi^2 fit. false: log-max-likelihood Bool_t fUseChi2; ///< flag. true: chi^2 fit. false: log-max-likelihood
UInt_t fPrintLevel; ///< tag, showing the level of messages whished. 0=minimum, 1=standard, 2=maximum
UInt_t fStrategy; ///< fitting strategy (see minuit2 manual). UInt_t fStrategy; ///< fitting strategy (see minuit2 manual).
@ -119,6 +120,7 @@ class PFitter
Bool_t ExecuteMinimize(); Bool_t ExecuteMinimize();
Bool_t ExecuteMinos(); Bool_t ExecuteMinos();
Bool_t ExecutePlot(); Bool_t ExecutePlot();
Bool_t ExecutePrintLevel(UInt_t lineNo);
Bool_t ExecuteRelease(UInt_t lineNo); Bool_t ExecuteRelease(UInt_t lineNo);
Bool_t ExecuteRestore(); Bool_t ExecuteRestore();
Bool_t ExecuteScan(); Bool_t ExecuteScan();

6
src/include/PMusr.h
View File

@ -559,7 +559,9 @@ class PMsrRunBlock {
virtual UInt_t GetAddT0BinEntries() { return fAddT0.size(); } virtual UInt_t GetAddT0BinEntries() { return fAddT0.size(); }
virtual Int_t GetAddT0BinSize(UInt_t addRunIdx); virtual Int_t GetAddT0BinSize(UInt_t addRunIdx);
virtual Double_t GetAddT0Bin(UInt_t addRunIdx, UInt_t histoIdx); virtual Double_t GetAddT0Bin(UInt_t addRunIdx, UInt_t histoIdx);
virtual Bool_t IsFitRangeInBin() { return fFitRangeInBins; }
virtual Double_t GetFitRange(UInt_t idx); virtual Double_t GetFitRange(UInt_t idx);
virtual Int_t GetFitRangeOffset(UInt_t idx);
virtual Int_t GetPacking() { return fPacking; } virtual Int_t GetPacking() { return fPacking; }
virtual Int_t GetXDataIndex() { return fXYDataIndex[0]; } virtual Int_t GetXDataIndex() { return fXYDataIndex[0]; }
virtual Int_t GetYDataIndex() { return fXYDataIndex[1]; } virtual Int_t GetYDataIndex() { return fXYDataIndex[1]; }
@ -588,7 +590,9 @@ class PMsrRunBlock {
virtual void SetDataRange(Int_t ival, Int_t idx); virtual void SetDataRange(Int_t ival, Int_t idx);
virtual void SetT0Bin(Double_t dval, Int_t idx=-1); virtual void SetT0Bin(Double_t dval, Int_t idx=-1);
virtual void SetAddT0Bin(Double_t dval, UInt_t addRunIdx, UInt_t histoNoIdx); virtual void SetAddT0Bin(Double_t dval, UInt_t addRunIdx, UInt_t histoNoIdx);
virtual void SetFitRangeInBins(Bool_t bval) { fFitRangeInBins = bval; }
virtual void SetFitRange(Double_t dval, UInt_t idx); virtual void SetFitRange(Double_t dval, UInt_t idx);
virtual void SetFitRangeOffset(Int_t ival, UInt_t idx);
virtual void SetPacking(Int_t ival) { fPacking = ival; } virtual void SetPacking(Int_t ival) { fPacking = ival; }
virtual void SetXDataIndex(Int_t ival) { fXYDataIndex[0] = ival; } virtual void SetXDataIndex(Int_t ival) { fXYDataIndex[0] = ival; }
virtual void SetYDataIndex(Int_t ival) { fXYDataIndex[1] = ival; } virtual void SetYDataIndex(Int_t ival) { fXYDataIndex[1] = ival; }
@ -618,7 +622,9 @@ class PMsrRunBlock {
Int_t fDataRange[4]; ///< data bin range (fit type 0, 2, 4) Int_t fDataRange[4]; ///< data bin range (fit type 0, 2, 4)
PDoubleVector fT0; ///< t0 bins (fit type 0, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ... PDoubleVector fT0; ///< t0 bins (fit type 0, 2, 4). if fit type 0 -> f0, f1, f2, ...; if fit type 2, 4 -> f0, b0, f1, b1, ...
vector<PDoubleVector> fAddT0; ///< t0 bins for addrun's vector<PDoubleVector> fAddT0; ///< t0 bins for addrun's
Bool_t fFitRangeInBins; ///< flag telling if fit range is given in time or in bins
Double_t fFitRange[2]; ///< fit range in (us) Double_t fFitRange[2]; ///< fit range in (us)
Int_t fFitRangeOffset[2]; ///< if fit range is given in bins it can have the form fit fgb+n0 lgb-n1. This variable holds the n0 and n1.
Int_t fPacking; ///< packing/rebinning Int_t fPacking; ///< packing/rebinning
Int_t fXYDataIndex[2]; ///< used to get the data indices when using db-files (fit type 8) Int_t fXYDataIndex[2]; ///< used to get the data indices when using db-files (fit type 8)
TString fXYDataLabel[2]; ///< used to get the indices via labels when using db-files (fit type 8) TString fXYDataLabel[2]; ///< used to get the indices via labels when using db-files (fit type 8)

4
src/include/PRunAsymmetry.h
View File

@ -52,6 +52,8 @@ class PRunAsymmetry : public PRunBase
virtual UInt_t GetNoOfFitBins(); virtual UInt_t GetNoOfFitBins();
virtual void SetFitRangeBin(const TString fitRange);
protected: protected:
virtual void CalcNoOfFitBins(); virtual void CalcNoOfFitBins();
virtual Bool_t PrepareData(); virtual Bool_t PrepareData();
@ -69,6 +71,8 @@ class PRunAsymmetry : public PRunBase
PDoubleVector fBackward; ///< backward histo data PDoubleVector fBackward; ///< backward histo data
PDoubleVector fBackwardErr; ///< backward histo errors PDoubleVector fBackwardErr; ///< backward histo errors
Int_t fGoodBins[2]; ///< keep first/last good bins. 0=fgb, 1=lgb
Bool_t SubtractFixBkg(); Bool_t SubtractFixBkg();
Bool_t SubtractEstimatedBkg(); Bool_t SubtractEstimatedBkg();
}; };

4
src/include/PRunBase.h
View File

@ -78,8 +78,8 @@ class PRunBase
Double_t fTimeResolution; ///< time resolution in (us) Double_t fTimeResolution; ///< time resolution in (us)
PDoubleVector fT0s; ///< all t0 bins of a run! The derived classes will handle it PDoubleVector fT0s; ///< all t0 bins of a run! The derived classes will handle it
Double_t fFitStartTime; ///< fit start time Double_t fFitStartTime; ///< fit start time
Double_t fFitEndTime; ///< fit end time Double_t fFitEndTime; ///< fit end time
PDoubleVector fFuncValues; ///< is keeping the values of the functions from the FUNCTIONS block PDoubleVector fFuncValues; ///< is keeping the values of the functions from the FUNCTIONS block
PTheory *fTheory; ///< theory needed to calculate chi-square PTheory *fTheory; ///< theory needed to calculate chi-square

14
src/include/PRunDataHandler.h
View File

@ -46,14 +46,23 @@ using namespace std;
class PRunDataHandler class PRunDataHandler
{ {
public: public:
PRunDataHandler();
PRunDataHandler(TString fileName, const TString fileFormat);
PRunDataHandler(TString fileName, const TString fileFormat, const PStringVector dataPath);
PRunDataHandler(TString fileName, const TString fileFormat, const TString dataPath, PRawRunData &runData);
PRunDataHandler(PAny2ManyInfo *any2ManyInfo); PRunDataHandler(PAny2ManyInfo *any2ManyInfo);
PRunDataHandler(PAny2ManyInfo *any2ManyInfo, const PStringVector dataPath); PRunDataHandler(PAny2ManyInfo *any2ManyInfo, const PStringVector dataPath);
PRunDataHandler(PMsrHandler *msrInfo); PRunDataHandler(PMsrHandler *msrInfo);
PRunDataHandler(PMsrHandler *msrInfo, const PStringVector dataPath); PRunDataHandler(PMsrHandler *msrInfo, const PStringVector dataPath);
virtual ~PRunDataHandler(); virtual ~PRunDataHandler();
virtual void ReadData();
virtual void ConvertData();
virtual void WriteData();
virtual Bool_t IsAllDataAvailable() const { return fAllDataAvailable; } virtual Bool_t IsAllDataAvailable() const { return fAllDataAvailable; }
virtual PRawRunData* GetRunData(const TString &runName); virtual PRawRunData* GetRunData(const TString &runName);
virtual TString GetRunPathName() {return fRunPathName; }
private: private:
PMsrHandler *fMsrInfo; ///< pointer to the msr-file handler PMsrHandler *fMsrInfo; ///< pointer to the msr-file handler
@ -61,16 +70,19 @@ class PRunDataHandler
PStringVector fDataPath; ///< vector containing all the search paths where to look for data files PStringVector fDataPath; ///< vector containing all the search paths where to look for data files
Bool_t fAllDataAvailable; ///< flag indicating if all data sets could be read Bool_t fAllDataAvailable; ///< flag indicating if all data sets could be read
TString fFileFormat; ///< keeps the file format if explicitly given
TString fRunName; ///< current run name TString fRunName; ///< current run name
TString fRunPathName; ///< current path file name TString fRunPathName; ///< current path file name
PRawRunDataList fData; ///< keeping all the raw data PRawRunDataList fData; ///< keeping all the raw data
virtual void Init(const Int_t tag=0);
virtual Bool_t ReadFilesMsr(); virtual Bool_t ReadFilesMsr();
virtual Bool_t ReadWriteFilesList(); virtual Bool_t ReadWriteFilesList();
virtual Bool_t FileAlreadyRead(TString runName); virtual Bool_t FileAlreadyRead(TString runName);
virtual void TestFileName(TString &runName, const TString &ext); virtual void TestFileName(TString &runName, const TString &ext);
virtual Bool_t FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx); virtual Bool_t FileExistsCheck(PMsrRunBlock &runInfo, const UInt_t idx);
virtual Bool_t FileExistsCheck(const Bool_t fileName, const Int_t idx); virtual Bool_t FileExistsCheck(const Bool_t fileName, const Int_t idx);
virtual Bool_t FileExistsCheck(const TString fileName);
virtual Bool_t ReadRootFile(); virtual Bool_t ReadRootFile();
virtual Bool_t ReadNexusFile(); virtual Bool_t ReadNexusFile();
virtual Bool_t ReadWkmFile(); virtual Bool_t ReadWkmFile();

1
src/include/PRunListCollection.h
View File

@ -57,6 +57,7 @@ class PRunListCollection
virtual Bool_t Add(Int_t runNo, EPMusrHandleTag tag); virtual Bool_t Add(Int_t runNo, EPMusrHandleTag tag);
virtual void SetFitRange(const PDoublePairVector fitRange); virtual void SetFitRange(const PDoublePairVector fitRange);
virtual void SetFitRange(const TString fitRange);
virtual Double_t GetSingleHistoChisq(const std::vector<Double_t>& par) const; virtual Double_t GetSingleHistoChisq(const std::vector<Double_t>& par) const;
virtual Double_t GetAsymmetryChisq(const std::vector<Double_t>& par) const; virtual Double_t GetAsymmetryChisq(const std::vector<Double_t>& par) const;

4
src/include/PRunMuMinus.h
View File

@ -51,6 +51,8 @@ class PRunMuMinus : public PRunBase
virtual UInt_t GetNoOfFitBins(); virtual UInt_t GetNoOfFitBins();
virtual void SetFitRangeBin(const TString fitRange);
protected: protected:
virtual void CalcNoOfFitBins(); virtual void CalcNoOfFitBins();
virtual Bool_t PrepareData(); virtual Bool_t PrepareData();
@ -60,6 +62,8 @@ class PRunMuMinus : public PRunBase
private: private:
UInt_t fNoOfFitBins; ///< number of bins to be fitted UInt_t fNoOfFitBins; ///< number of bins to be fitted
Int_t fGoodBins[2]; ///< keep first/last good bins. 0=fgb, 1=lgb
PDoubleVector fForward; ///< forward histo data PDoubleVector fForward; ///< forward histo data
}; };

2
src/include/PRunNonMusr.h
View File

@ -52,6 +52,8 @@ class PRunNonMusr : public PRunBase
virtual UInt_t GetNoOfFitBins(); virtual UInt_t GetNoOfFitBins();
virtual void SetFitRangeBin(const TString fitRange) {}
virtual UInt_t GetXIndex(); virtual UInt_t GetXIndex();
virtual UInt_t GetYIndex(); virtual UInt_t GetYIndex();

6
src/include/PRunSingleHisto.h
View File

@ -51,6 +51,8 @@ class PRunSingleHisto : public PRunBase
virtual UInt_t GetNoOfFitBins(); virtual UInt_t GetNoOfFitBins();
virtual void SetFitRangeBin(const TString fitRange);
protected: protected:
virtual void CalcNoOfFitBins(); virtual void CalcNoOfFitBins();
virtual Bool_t PrepareData(); virtual Bool_t PrepareData();
@ -63,7 +65,9 @@ class PRunSingleHisto : public PRunBase
UInt_t fNoOfFitBins; ///< number of bins to be fitted UInt_t fNoOfFitBins; ///< number of bins to be fitted
Double_t fBackground; ///< needed if background range is given (units: 1/bin) Double_t fBackground; ///< needed if background range is given (units: 1/bin)
PDoubleVector fForward; ///< forward histo data Int_t fGoodBins[2]; ///< keep first/last good bins. 0=fgb, 1=lgb
PDoubleVector fForward; ///< forward histo data
virtual Bool_t EstimateBkg(UInt_t histoNo); virtual Bool_t EstimateBkg(UInt_t histoNo);
virtual Bool_t IsScaleN0AndBkg(); virtual Bool_t IsScaleN0AndBkg();

2
src/musrfit.cpp
View File

@ -543,6 +543,8 @@ int main(int argc, char *argv[])
else else
dataHandler = new PRunDataHandler(msrHandler); dataHandler = new PRunDataHandler(msrHandler);
dataHandler->ReadData();
bool success = dataHandler->IsAllDataAvailable(); bool success = dataHandler->IsAllDataAvailable();
if (!success) { if (!success) {
cout << endl << ">> musrfit **ERROR** Couldn't read all data files, will quit ..." << endl; cout << endl << ">> musrfit **ERROR** Couldn't read all data files, will quit ..." << endl;

2
src/musrt0.cpp
View File

@ -366,6 +366,8 @@ Int_t main(Int_t argc, Char_t *argv[])
else else
dataHandler = new PRunDataHandler(msrHandler); dataHandler = new PRunDataHandler(msrHandler);
dataHandler->ReadData();
success = dataHandler->IsAllDataAvailable(); success = dataHandler->IsAllDataAvailable();
if (!success) { if (!success) {
cout << endl << ">> musrt0 **ERROR** Couldn't read all data files, will quit ..." << endl; cout << endl << ">> musrt0 **ERROR** Couldn't read all data files, will quit ..." << endl;

2
src/musrview.cpp
View File

@ -247,6 +247,8 @@ int main(int argc, char *argv[])
else else
dataHandler = new PRunDataHandler(msrHandler); dataHandler = new PRunDataHandler(msrHandler);
dataHandler->ReadData();
success = dataHandler->IsAllDataAvailable(); success = dataHandler->IsAllDataAvailable();
if (!success) { if (!success) {
cerr << endl << ">> musrview **ERROR** Couldn't read all data files, will quit ..." << endl; cerr << endl << ">> musrview **ERROR** Couldn't read all data files, will quit ..." << endl;