Merge branch 'master' into root6
This commit is contained in:
commit
5f925c4fc3
35
ChangeLog
35
ChangeLog
@ -2,6 +2,41 @@
|
||||
# ChangeLog
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
changes since 0.14.0
|
||||
===================================
|
||||
NEW 2015-02-23 implemented an average-per-data-set option for musrFT.
|
||||
NEW 2015-02-21 add proper Mac icon to musredit
|
||||
FIXED 2015-06-30 changed setf/unsetf bug (PMsr2Data.cpp)
|
||||
FIXED 2015-05-15 another path check for HDF5 with ubuntu 15.04
|
||||
FIXED 2015-03-16 some minor correction for ASCII export in any2many
|
||||
FIXED 2015-02-26 some more bug fixing for average per data set.
|
||||
FIXED 2015-02-20 for graphical export in the batch mode, menus mustn't be set.
|
||||
CHANGED 2015-08-17 updated ChangeLog which was orphaned since V0.13.0
|
||||
CHANGED 2015-08-16 updated the docu
|
||||
CHANGED 2015-08-16 added the class PStringNumberList which allow to parse a
|
||||
generic encoded list of numbers. Used this class to improve
|
||||
PMsrHandler, and improved the runList feature of msr2data.
|
||||
For details see the documentation of msr2data.
|
||||
CHANGED 2015-06-25 adopted the temperature dependence of the gap function
|
||||
(see Eq.(8) of the memo), which breaks the self-consistency.
|
||||
Makes it more flexible but requires that the user is using
|
||||
his brain.
|
||||
CHANGED 2015-06-25 small correction of the skewed Gaussian for extrem parameter
|
||||
values.
|
||||
CHANGED 2015-05-29 updated docu and removed an unsed variable
|
||||
CHANGED 2015-05-29 added a group histo selector in any2many for MusrRoot when
|
||||
exporting to a too limited file format as PSI-BIN.
|
||||
CHANGED 2015-04-01 update of the technical docu
|
||||
CHANGED 2015-02-28 check that FOURIER block phase parameter as parX is not leading
|
||||
to an error message.
|
||||
CHANGED 2015-02-24 added missing background range from msr-file (musrFT)
|
||||
CHANGED 2015-02-24 separated PSI-BIN and PSI-MDU file format
|
||||
CHANGED 2015-02-21 make sure that musrFT is found
|
||||
CHANGED 2015-02-21 needed to adopted includes for dictionary generation due to
|
||||
adding fftw.h in PMusr.h
|
||||
CHANGED 2015-02-21 have now README and README.md for automake and bitbucket,
|
||||
respectively.
|
||||
|
||||
changes since 0.13.0
|
||||
===================================
|
||||
NEW 2015-02-23 implemented an average-per-data-set option for musrFT.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:16 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:49 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1432922470" type="application/x-wiki" title="edit BmwLibs" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1439717206" type="application/x-wiki" title="edit BmwLibs" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -124,7 +124,7 @@ pre {
|
||||
</li> <li> <a href="LibZFRelaxation.html"> <code>libZFRelaxation</code>: routines for calculating zero-field muon-spin depolarization functions from various static field distributions</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> </div>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://www.psi.ch/low-energy-muons/people" target="_top">AS</a> </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -146,9 +146,9 @@ pre {
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1432922470' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/BmwLibs?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/BmwLibs?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r5 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=4">r4</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=3;rev2=4"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=3">r3</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=2;rev2=3"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=2">r2</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?template=more&maxrev=5&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=1439717206' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/BmwLibs?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/BmwLibs?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r6 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=5;rev2=6"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=5">r5</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=4">r4</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/BmwLibs?rev1=3;rev2=4"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/BmwLibs?rev=3">r3</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/BmwLibs?template=more&maxrev=6&currrev=6' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r5 - 10 Jul 2011, wojek</span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r6 - 03 Jul 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -192,7 +192,7 @@ pre {
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:19 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:52 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:06 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:40 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1432922466" type="application/x-wiki" title="edit CiteMusrFit" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1439717203" type="application/x-wiki" title="edit CiteMusrFit" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -144,7 +144,7 @@ Since quite some effort is going into the development and maintenance of the <co
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1432922466' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/CiteMusrFit' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='CiteMusrFitc99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/CiteMusrFit?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/CiteMusrFit?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r2 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/CiteMusrFit?rev1=1;rev2=2"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/CiteMusrFit?rev=1">r1</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?template=more&maxrev=2&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/CiteMusrFit?t=1439717203' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/CiteMusrFit' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='CiteMusrFitc99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/CiteMusrFit?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/CiteMusrFit?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r2 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/CiteMusrFit?rev1=1;rev2=2"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/CiteMusrFit?rev=1">r1</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/CiteMusrFit?template=more&maxrev=2&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 class="patternInfo"><span class="patternRevInfo">Topic revision: r2 - 19 Jun 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
@ -190,7 +190,7 @@ Since quite some effort is going into the development and maintenance of the <co
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:07 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:41 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:09 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:42 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1432922468" type="application/x-wiki" title="edit LibFitPofB" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1439717205" type="application/x-wiki" title="edit LibFitPofB" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -400,7 +400,7 @@ An example XML file looks as follows:
|
||||
</BMW>
|
||||
</pre>
|
||||
<p></p>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> </div>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://www.psi.ch/low-energy-muons/people" target="_top">AS</a> </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -422,9 +422,9 @@ An example XML file looks as follows:
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1432922469' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/LibFitPofB?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibFitPofB?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r16 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=15;rev2=16"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=15">r15</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=14;rev2=15"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=14">r14</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=13;rev2=14"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=13">r13</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?template=more&maxrev=16&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=1439717205' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/LibFitPofB?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibFitPofB?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r17 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=16;rev2=17"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=16">r16</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=15;rev2=16"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=15">r15</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibFitPofB?rev1=14;rev2=15"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibFitPofB?rev=14">r14</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibFitPofB?template=more&maxrev=17&currrev=17' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r16 - 10 Jul 2011, wojek</span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r17 - 03 Jul 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -468,7 +468,7 @@ An example XML file looks as follows:
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:16 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:49 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:25 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:00 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1432922457" type="application/x-wiki" title="edit LibZFRelaxation" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1439717196" type="application/x-wiki" title="edit LibZFRelaxation" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -205,7 +205,7 @@ The parameters are: <ol>
|
||||
</li> <li> Θ (°).
|
||||
</li></ol>
|
||||
<p></p>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> </div>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://www.psi.ch/low-energy-muons/people" target="_top">AS</a> </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -227,9 +227,9 @@ The parameters are: <ol>
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1432922458' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/LibZFRelaxation?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibZFRelaxation?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r2 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibZFRelaxation?rev1=1;rev2=2"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibZFRelaxation?rev=1">r1</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?template=more&maxrev=2&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=1439717196' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/LibZFRelaxation?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/LibZFRelaxation?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r3 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibZFRelaxation?rev1=2;rev2=3"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibZFRelaxation?rev=2">r2</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/LibZFRelaxation?rev1=1;rev2=2"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/LibZFRelaxation?rev=1">r1</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/LibZFRelaxation?template=more&maxrev=3&currrev=3' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r2 - 10 Jul 2011, wojek</span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r3 - 03 Jul 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -273,7 +273,7 @@ The parameters are: <ol>
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:29 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:04 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:07 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:41 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1432922467" type="application/x-wiki" title="edit Msr2Data" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1439717204" type="application/x-wiki" title="edit Msr2Data" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -160,7 +160,7 @@ Notes
|
||||
Apart from numerous <a href="#OptionalParameters" class="foswikiCurrentTopicLink">optional parameters</a> that might be set or not, in principle there are four different ways of calling <code>msr2data</code>. These differ in how the list of runs which should be processed is supplied: <dl>
|
||||
<dt> msr2data <run> <extension> [optional parameters] </dt><dd> A single run number.
|
||||
</dd> <dt> msr2data <firstRunNo> <lastRunNo> <extension> [optional parameters] </dt><dd> An interval of run numbers is specified through the first and the last run number. The condition <strong><firstRunNo> < <lastRunNo></strong> is <em>not</em> necessary.
|
||||
</dd> <dt> msr2data \[<run1> <run2> ... <runN> \] <extension> [optional parameters] </dt><dd> A space separated list of run numbers can be enclosed in <strong>[</strong> and <strong>]</strong>. Every run that should be processed has to be specified explicitly by its run number.
|
||||
</dd> <dt> msr2data \[ <runList> \] <extension> [optional parameters] </dt><dd> Where <runList> is one or a combination of the following:(i) <strong><run0>, <run1>, <run2>, ... <runN></strong> : run numbers, e.g. 123 124, (ii) <strong><run0>-<runN></strong> : a range, e.g. 123-125 -> 123 124 125, (iii) <strong><run0>:<runN>:<step></strong> : a sequence, e.g. 123:127:2 -> 123 125 127. <step> has to be a <strong>positive</strong> integer. A <runList> can also combine (i)-(iii), e.g. 123 128-130 133, etc.
|
||||
</dd> <dt> msr2data <runListFileName> <extension> [optional parameters] </dt><dd> An ASCII file containing a list of run numbers and optional external parameters is passed to <code>msr2data</code>. For the structure of the ASCII file see <a href="#RunListStructure" class="foswikiCurrentTopicLink">below</a>.
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
@ -168,6 +168,7 @@ All four basic types of calling <code>msr2data</code> contain the <em>mandatory<
|
||||
<pre class="bash">msr2data 8472 _tf_h13</pre> generates the <strong>DB</strong> file <code><b>out.db</b></code> (can be changed by using <a href="#OptionalParameters" class="foswikiCurrentTopicLink">the -o option</a>) from <code><b>8472_tf_h13.msr</b></code>.
|
||||
<pre class="bash">msr2data 8472 8474 _tf_h13</pre> generates the <strong>DB</strong> file <code><b>out.db</b></code> (can be changed by using <a href="#OptionalParameters" class="foswikiCurrentTopicLink">the -o option</a>) from <code><b>8472_tf_h13.msr</b></code>, <code><b>8473_tf_h13.msr</b></code>, and <code><b>8474_tf_h13.msr</b></code>.
|
||||
<pre class="bash">msr2data [8472 8470] _tf_h13</pre> generates the <strong>DB</strong> file <code><b>out.db</b></code> (can be changed by using <a href="#OptionalParameters" class="foswikiCurrentTopicLink">the -o option</a>) from <code><b>8472_tf_h13.msr</b></code> and <code><b>8470_tf_h13.msr</b></code>.
|
||||
<pre class="bash">msr2data [8470:8474:2] _tf_h13</pre> generates the <strong>DB</strong> file <code><b>out.db</b></code> (can be changed by using <a href="#OptionalParameters" class="foswikiCurrentTopicLink">the -o option</a>) from <code><b>8470_tf_h13.msr</b></code>, <code><b>8472_tf_h13.msr</b></code>, and <code><b>8474_tf_h13.msr</b></code>.
|
||||
<pre class="bash">msr2data run.list _tf_h13</pre> generates the <strong>DB</strong> file <code><b>out.db</b></code> (can be changed by using <a href="#OptionalParameters" class="foswikiCurrentTopicLink">the -o option</a>) from all runs listed in the ASCII file <code><b>run.list</b></code> in the working directory. In this file it is also possible to include external parameters which should be put in the resulting <strong>DB</strong> file. The structure of the <code><b>run.list</b></code> is the following:
|
||||
<a name="RunListStructure"></a>
|
||||
<pre>
|
||||
@ -214,9 +215,9 @@ msr2data 8400 8460 _tf_h13 -oABC.db fit-8472
|
||||
</pre>
|
||||
Using <code><b>8472_tf_h13.msr</b></code> as first template, <code>msr2data</code> generates subsequent msr input files <code><b>8400_tf_h13.msr</b></code> through <code><b>8460_tf_h13.msr</b></code>, calls <code>musrfit</code> to perform a fit of these files and collects the results of the fits together with the <strong>DB</strong> header in the new file <code><b>ABC.db</b></code>. Additionally, some information about external parameters like the temperature will be passed to <code><b>ABC.db</b></code> if it is present in the data files.
|
||||
<pre class="bash">
|
||||
msr2data [8500 8505] _zf fit-8472 noheader nosummary -o DEF.db
|
||||
msr2data [8500 8502-8504 8507] _zf fit-8472 noheader nosummary -o DEF.db
|
||||
</pre>
|
||||
Using <code><b>8472_zf.msr</b></code> as first template, <code>msr2data</code> generates subsequent msr input files <code><b>8500_zf.msr</b></code> and <code><b>8505_zf.msr</b></code>, calls <code>musrfit</code> to perform a fit of these files and collects the results of the fits in the file <code><b>DEF.db</b></code> without writing the <strong>DB</strong> file header or attempting to read additional information from the data files.
|
||||
Using <code><b>8472_zf.msr</b></code> as first template, <code>msr2data</code> generates subsequent msr input files <code><b>8500_zf.msr</b></code>, <code><b>8502_zf.msr</b></code>, <code><b>8503_zf.msr</b></code>, <code><b>8504_zf.msr</b></code> and <code><b>8507_zf.msr</b></code>, calls <code>musrfit</code> to perform a fit of these files and collects the results of the fits in the file <code><b>DEF.db</b></code> without writing the <strong>DB</strong> file header or attempting to read additional information from the data files.
|
||||
<pre class="bash">
|
||||
msr2data 8595 8585 "" noheader fit-8472! -oGHI.dat data nosummary -k
|
||||
</pre>
|
||||
@ -337,7 +338,7 @@ msr2data 8471 8470 -OneRunFit_example -o OneRunFits.db
|
||||
<a name="BugTracking"></a>
|
||||
<h1><a name="A_7_Bugtracking"></a> 7 Bugtracking </h1>
|
||||
<p></p>
|
||||
For reporting bugs or requesting new features and improvements please use the <a href="https://tracker.intranet.psi.ch/jira/browse/MUSR" target="_top">PSI Tracker</a> or send an e-mail to A. Suter.
|
||||
For reporting bugs or requesting new features and improvements please use the <a href="https://bitbucket.org/muonspin/musrfit/issues?status=new&status=open" target="_top">Bitbucket Issues</a>, <a href="https://tracker.psi.ch/jira/browse/MUSR" target="_top">PSI Tracker</a> or send an e-mail to A. Suter.
|
||||
<p></p>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
@ -351,7 +352,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab3625' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1432922467'}">
|
||||
<!-- TAB --><div id='jqTab533' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1439717204'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -373,9 +374,9 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1432922467' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/Msr2Data' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='Msr2Datac99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/Msr2Data?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/Msr2Data?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r38 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=37;rev2=38"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=37">r37</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=36;rev2=37"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=36">r36</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=35;rev2=36"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=35">r35</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=more&maxrev=38&currrev=38' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1439717204' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/Msr2Data' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='Msr2Datac99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/Msr2Data?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/Msr2Data?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r39 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=38;rev2=39"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=38">r38</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=37;rev2=38"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=37">r37</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/Msr2Data?rev1=36;rev2=37"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/Msr2Data?rev=36">r36</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/Msr2Data?template=more&maxrev=39&currrev=39' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r38 - 20 Jul 2011, wojek</span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r39 - 16 Aug 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -419,7 +420,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:09 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:42 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:42 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:16 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1432922465" type="application/x-wiki" title="edit MusrFit" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1439717202" type="application/x-wiki" title="edit MusrFit" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -1610,7 +1610,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1432922465' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrFit?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFit?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r126 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=125;rev2=126"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=125">r125</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=124;rev2=125"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=124">r124</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=123;rev2=124"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=123">r123</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?template=more&maxrev=126&currrev=126' 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=1439717202' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrFit?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFit?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r126 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=125;rev2=126"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=125">r125</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=124;rev2=125"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=124">r124</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=123;rev2=124"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=123">r123</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFit?template=more&maxrev=126&currrev=126' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r126 - 29 May 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
@ -1656,7 +1656,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:06 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:40 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:42 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:15 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1432922463" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1439717201" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -120,9 +120,7 @@ pre {
|
||||
</div><div class="patternContent"><div class="foswikiTopic"><h1><a name="Acknowledgements_45_61_61musrfit_61_61"></a> Acknowledgements - <code><b>musrfit</b></code> </h1>
|
||||
<p></p> <dl>
|
||||
<dt> Bastian M. Wojek </dt><dd> I am very much indebted to <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> for his rigorous testing of <code><a href="MusrFit.html">musrfit</a></code>, his many useful suggestions, contributions, and for the largest part of the <a href="WebHome.html" class="foswikiCurrentWebHomeLink">user manual of <code>musrfit</code></a> which makes it accessible to a broader audience! Many thanks Bastian!
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> </div>
|
||||
</dd></dl> </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -144,9 +142,9 @@ pre {
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1432922464' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrFitAcknowledgements?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitAcknowledgements?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r4 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=3;rev2=4"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=3">r3</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=2;rev2=3"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=2">r2</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=1;rev2=2"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=1">r1</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?template=more&maxrev=4&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=1439717201' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrFitAcknowledgements?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitAcknowledgements?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r5 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=4">r4</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=3;rev2=4"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=3">r3</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitAcknowledgements?rev1=2;rev2=3"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?rev=2">r2</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitAcknowledgements?template=more&maxrev=5&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 class="patternInfo"><span class="patternRevInfo">Topic revision: r4 - 10 Jul 2011, wojek</span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r5 - 03 Jul 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -190,7 +188,7 @@ pre {
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:42 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:16 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:40 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:14 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1432922462" type="application/x-wiki" title="edit MusrFitSetup" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1439717200" type="application/x-wiki" title="edit MusrFitSetup" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -159,7 +159,7 @@ pre {
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.3_61_61musrfit_61_61"> 5.3 musrfit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.4_61_61musredit_61_61"> 5.4 musredit </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.5_61_61musrgui_61_61"> 5.5 musrgui </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.5_61_61musrgui_61_61_40obsolete_41"> 5.5 musrgui (obsolete) </a>
|
||||
</li> <li> <a href="MusrFitSetup.html#A_5.6_Check_of_the_installation"> 5.6 Check of the installation </a>
|
||||
</li></ul>
|
||||
</li></ul>
|
||||
@ -167,10 +167,10 @@ pre {
|
||||
<p></p>
|
||||
<h1><a name="A_1_Supported_Operating_Systems_and_Software_Requirements"></a> 1 Supported Operating Systems and Software Requirements </h1>
|
||||
<p></p>
|
||||
This page is intended to demonstrate for the interested user which steps are necessary to set up the <a href="http://www.gnu.org/philosophy/free-sw.html" target="_top">free software</a> μSR data analysis framework <code><a href="MusrFit.html">musrfit</a></code>. While the preferred way is to run the software on <strong>GNU/Linux</strong>, with some restrictions it can also be set up under <strong>MS Windows</strong> and <strong>MacOS X</strong>. <span class='foswikiRedFG'>In case <code>musrfit</code> should be installed according to the description found on this page, the user is strongly encouraged to <em>read completely</em> each section dealing with the present installation step <em>before</em> starting the installation process!</span>
|
||||
This page is intended to demonstrate for the interested user which steps are necessary to set up the <a href="http://www.gnu.org/philosophy/free-sw.html" target="_top">free software</a> μSR data analysis framework <code><a href="MusrFit.html">musrfit</a></code>. While the preferred way is to run the software on <strong>GNU/Linux</strong> or <strong>MacOS X</strong>, with some restrictions it can also be set up under <strong>MS Windows</strong> (cygwin, only for the very brave, probably it is easier for most MS Windows users to install a Virtual Machine running Linux). <span class='foswikiRedFG'>In case <code>musrfit</code> should be installed according to the description found on this page, the user is strongly encouraged to <em>read completely</em> each section dealing with the present installation step <em>before</em> starting the installation process!</span>
|
||||
<p></p>
|
||||
<a name="ReqSw"></a>
|
||||
Apart from <a href="http://gcc.gnu.org/" target="_top">GCC, the GNU Compiler Collection</a>, the GNU build tools <a href="http://www.gnu.org/software/autoconf/" target="_top">autoconf</a>, <a href="http://www.gnu.org/software/automake/" target="_top">automake</a> and <a href="http://www.gnu.org/software/libtool/" target="_top">libtool</a> as well as the helper tool <a href="http://pkg-config.freedesktop.org/wiki/" target="_top">pkg-config</a> <code>musrfit</code> requires the installation of a few open-source libraries and programs: <dl>
|
||||
Apart from <a href="http://gcc.gnu.org/" target="_top">GCC, the GNU Compiler Collection</a> (gcc, g++), the GNU build tools <a href="http://www.gnu.org/software/autoconf/" target="_top">autoconf</a>, <a href="http://www.gnu.org/software/automake/" target="_top">automake</a> and <a href="http://www.gnu.org/software/libtool/" target="_top">libtool</a> as well as the helper tool <a href="http://pkg-config.freedesktop.org/wiki/" target="_top">pkg-config</a> <code>musrfit</code> requires the installation of a few open-source libraries and programs including their header packages: <dl>
|
||||
<dt> <a href="http://www.boost.org/" target="_top">boost C++ libraries</a> </dt><dd> The powerful <code>Spirit</code> parser framework used by <code>musrfit</code> is included in that collection of libraries. <em>Required version ≥ 1.33</em>
|
||||
</dd> <dt> <a href="http://www.gnu.org/software/gsl/" target="_top">GNU Scientific Library</a> </dt><dd> A numerical <code>C</code> and <code>C++</code> library which provides efficient implementations of various mathematical routines. <em>Required version ≥ 1.9</em>
|
||||
</dd> <dt> <a href="http://www.fftw.org/" target="_top">FFTW</a> </dt><dd> A <code>C</code> implementation for the fast computation of discrete Fourier transforms. <em>Required version ≥ 3.1</em>
|
||||
@ -196,73 +196,102 @@ Each of the following sections focusing on the installation of <code>musrfit</co
|
||||
Before the further installation will be described, please note the following restrictions: <dl>
|
||||
<dt> GNU/Linux </dt><dd> No serious problems are known at the moment.
|
||||
</dd> <dt> MS Windows </dt><dd> The setup of <code>musrfit</code> (including the requirements) using <code>Visual C++</code> has not been tested. If anybody likes to do this: Just go ahead and have fun! However, not very much assistance can be expected, although it would be an interesting experiment.
|
||||
</dd> <dt> Mac OS X </dt><dd> On <code>10.6 Snow Leopard</code> <code>Qt3</code> for Mac is not supported any more since this was based on a 32-bit only API. <code>Snow Leopard</code> -users are advised to use the <code>Qt4</code> based <code>musredit</code> or to rely on the standard <code>Qt3</code> version for <code>X11</code> in order to run <code>musrgui</code>.
|
||||
</dd> <dt> Mac OS X </dt><dd> On <code>10.6 Snow Leopard</code> <code>Qt3</code> for Mac is not supported any more since this was based on a 32-bit only API. <code>Snow Leopard</code> -users are advised to use the <code>Qt4</code> based <code>musredit</code> or to rely on the standard <code>Qt3</code> version for <code>X11</code> in order to run <code>musrgui</code>. On newer Mac OS X versions (>= 10.8) you should use the <code>Qt4</code> base <code>musredit</code> only.
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
<h1><a name="A_3_GNU_47Linux"></a> 3 GNU/Linux </h1>
|
||||
<h2><a name="A_3.1_Requirements"></a> 3.1 Requirements </h2>
|
||||
<h3><a name="A_3.1.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"></a> 3.1.1 Everything but <code><b>ROOT</b></code> and <code><b>NeXus</b></code> </h3>
|
||||
Depending on the GNU/Linux distribution chosen, the above mentioned software—except the <code>ROOT</code> system and the <code>NeXus</code> library—should be available from the distributor and could be easily installed in the form of binary packages. If done in this way there should be taken care of installing <strong>both</strong>, the libraries and the header (dev, devel) files.<br>
|
||||
On a <a href="https://www.scientificlinux.org/" target="_top">Scientific Linux</a> (<a href="http://www.redhat.com/" target="_top">Red Hat</a>) system the following command executed as superuser from the shell will do the trick:
|
||||
On a <a href="https://www.scientificlinux.org/" target="_top">Scientific Linux</a> (<a href="http://www.redhat.com/" target="_top">Red Hat</a>, other RPM-package base Linux distributions) system the following command executed as superuser from the shell will do the trick (never type the '$' it is the shell prompt of your system):
|
||||
<pre class="bash">
|
||||
yum install git boost-devel gsl-devel fftw-devel libxml2-devel qt-devel qtwebkit-devel
|
||||
$ yum install git boost-devel gsl-devel fftw-devel libxml2-devel qt-devel qtwebkit-devel
|
||||
</pre>
|
||||
When dealing with a distribution that uses the dpkg/apt package manager like <a href="http://www.debian.org/" target="_top">Debian</a> or <a href="http://www.ubuntu.com/" target="_top">Ubuntu</a> the installation would look like:
|
||||
<pre class="bash">
|
||||
apt-get install git libboost-dev libgsl0-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-dev
|
||||
$ apt-get install git libboost-dev libgsl0-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-dev
|
||||
</pre>
|
||||
Everyone should know best himself which is the way to install distribution software on the chosen distribution <img src="../pub/Main/SmiliesPluginPSI/wink.gif" alt="wink" title="wink" border="0" />
|
||||
<p></p>
|
||||
In case the distribution does not include the required software it has to be compiled from the source files which normally means to download the source code from the corresponding website, to unpack the source tree and call the following from the shell:
|
||||
<pre class="bash">
|
||||
./configure
|
||||
make
|
||||
make install
|
||||
$ ./configure
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
In order to obtain some information about the possible options for the installation, calling <code>./configure --help</code> might give some useful hints. <br>
|
||||
For any further information on the standard installation of software, please refer to the web search engine of choice and ask for "install software on linux"...
|
||||
<p></p>
|
||||
<h3><a name="A_3.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"></a> 3.1.2 Installation of <code><b>NeXus</b></code> requirements (optional) </h3>
|
||||
<span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading data files in the <code>NeXus</code> format the further <a href="#ReqSwNeXus" class="foswikiCurrentTopicLink">required</a> software has to be set up. The required libraries and header files could either be available through the user's GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on Red Hat-like systems binary packages for <code>MXML</code>, <code>HDF4</code>, and <code>HDF5</code> might be called <code><b>mxml, mxml-devel, hdf, hdf-devel, hdf5, hdf5-devel</b></code>, on Debian-like systems <code><b>libmxml1, libmxml-dev, libhdf4-dev, libhdf5-dev</b></code>.
|
||||
<span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading/writing data files in the <code>NeXus</code> format the further <a href="#ReqSwNeXus" class="foswikiCurrentTopicLink">required</a> software has to be set up. The required libraries and header files could either be available through the user's GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on Red Hat-like systems binary packages for <code>MXML</code>, <code>HDF4</code>, and <code>HDF5</code> might be called <code><b>mxml, mxml-devel, hdf, hdf-devel, hdf5, hdf5-devel</b></code>, on Debian-like systems <code><b>libmxml1, libmxml-dev, libhdf4-dev, libhdf5-dev</b></code>.
|
||||
<p></p>
|
||||
Even though there might exist binary packages for the <code>NeXus</code> library, it is best to build and install it directly from the source code which can be found <a href="http://download.nexusformat.org/kits/" target="_top">here</a>.
|
||||
<p></p>
|
||||
<h3><a name="A_3.1.3_61_61ROOT_61_61"></a> 3.1.3 <code><b>ROOT</b></code> </h3>
|
||||
<strong>Currently only ROOT 5.34/xx is support! Do NOT try to use ROOT 6.xx/yy!</strong>
|
||||
<strong>Currently only ROOT 5.34/xx is support! Do NOT try to use ROOT 6.xx/yy yet!</strong>
|
||||
<p></p>
|
||||
The <code>ROOT</code> system may or may not be part of the GNU/Linux distribution. If it is, it should be checked that the provided binaries are of a recent version and then these in principle can be installed using a package manager as described above. <br>
|
||||
In case the distribution provides no or only outdated binary packages there are the following possibilities: <ul>
|
||||
<li> Visit the <code>ROOT</code> <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and download the packed precompiled binary version matching best the GNU/Linux distribution. Then unpack the bundle to its final destination.
|
||||
</li> <li> If there is no precompiled binary version of <code>ROOT</code> available for your system or e.g. <code>ROOT</code> should be compiled with another version of <code>GCC</code> visit the <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and download the 'complete source tree for all systems'. Then unpack this source tree to its destination (e.g. /opt/root-system)<a name="FootNote1text"></a><span class='FootNoteTextLink' title='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: <pre class="bash">chown username:username /opt/root-system/ -R</pre>'><a href="#FootNote1note" class="foswikiCurrentTopicLink">(1)</a></span>, configure<a name="FootNote2text"></a><span class='FootNoteTextLink' title=' When using <code>GCC</code> ≥ 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> ≥ 4.2 <code>musrfit</code> itself will parallelize the χ<sup>2</sup> calculation.'><a href="#FootNote2note" class="foswikiCurrentTopicLink">(2)</a></span> it (here using the minimal set of options) and compile it as follows right below: <pre class="bash">
|
||||
cd /opt/root-system
|
||||
./configure linux --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
(or in case of a 64 bit installation: ./configure linuxx8664gcc --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml)
|
||||
make
|
||||
(or in case there are multiple processors available, e.g.: make -j4)
|
||||
The <code>ROOT</code> system may or may not be part of the GNU/Linux distribution. Some distributions are packing <code>ROOT</code> in a manner incompatible with the way it is needed for <code>musrfit</code>. <strong>Therefore we advise to install <code>ROOT</code> from source</strong>. Before installing <code>ROOT</code> from source you will need to install some additional header packages.
|
||||
<p></p>
|
||||
For RPM based systems (RedHat, Fedora, etc) this will likely to be <strong>libX11-devel</strong>, <strong>libXft-devel</strong>, <strong>libXpm-devel</strong>, and <strong>libXext-devel</strong>:
|
||||
<pre class="bash">
|
||||
$ yum install libX11-devel libXft-devel libXpm-devel libXext-devel
|
||||
</pre>
|
||||
<p></p>
|
||||
For a dpkg/apt based system (Debian, Ubuntu, etc) this will likely to be <strong>libX11-dev</strong>, <strong>libxft-dev</strong>, <strong>libxpm-dev</strong>, and <strong>libxext-dev</strong>:
|
||||
<pre class="bash">
|
||||
$ apt-get install libX11-dev libxft-dev libxpm-dev libxext-dev
|
||||
</pre>
|
||||
<p></p>
|
||||
Also make sure that you have installed all required packages listed under <a href="#ReqSw" class="foswikiCurrentTopicLink">Requested Software</a> (e.g. fftw, gsl, etc).
|
||||
<p></p>
|
||||
For the following it is assumed that <code>ROOT</code> shall be installed under <code>$HOME/Apps</code>. If you want to install it somewhere else, just systematically replace the related terms of the following description. For the following list of commands the '$' will be given, the command prompt. Do <strong>not</strong> enter it! Also some comments will be added starting with a '#' which can be omitted. They are only there to explain what is going on.
|
||||
<pre class="bash">
|
||||
$ cd $HOME
|
||||
$ # creat the Apps directory if not already present
|
||||
$ mkdir Apps
|
||||
$ cd Apps
|
||||
$ git clone http://root.cern.ch/git/root.git
|
||||
$ cd root
|
||||
$ git tag -l
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v5-34-xx
|
||||
$ # where xx is the highest listed number, e.g. v5-34-32
|
||||
$ git checkout -b v5-34-32 v5-34-32
|
||||
$ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
|
||||
$ ./configure --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
$ # next will be the make. If running on a multicore CPU you can speed up tremendously by calling
|
||||
$ # make with the option -j <number>, where <number> is the number of threads which you want to give,
|
||||
$ # e.g. make -j8
|
||||
$ make
|
||||
</pre>
|
||||
<p></p>
|
||||
What is still missing is that the system should be told where to find the <code>ROOT</code> installation, therefore the following is suggested: <ul>
|
||||
<li> As superuser create a file <strong>/etc/ld.so.conf.d/cern-root.conf</strong> where the path to the <code>lib</code> directory of <code>ROOT</code> is added and call <strong>/sbin/ldconfig</strong> afterwards. In the example mentioned above one way of doing this is: <pre class="bash">
|
||||
$ echo "$HOME/Apps/root/lib" >> /etc/ld.so.conf.d/cern-root.conf
|
||||
$ /sbin/ldconfig
|
||||
</pre>
|
||||
</li> <li> <span class='foswikiRedFG'>Additionally</span>, as normal user one should append the following lines to the <strong>~/.bashrc</strong> and/or <strong>~/.bash_profile</strong> (<strong>~./profile</strong> on Debian like systems, and then either restart the shell or call the same commands once more from the shell) in order to change some path-setting environment variables: <pre class="bash">
|
||||
$ export ROOTSYS=$HOME/Apps/root
|
||||
$ export PATH=$ROOTSYS/bin:$PATH
|
||||
</pre>
|
||||
</li></ul>
|
||||
After one of the two setup variants has been executed the system should be told where to find the <code>ROOT</code> installation, therefore the following is suggested: <ul>
|
||||
<li> As superuser create a file <strong>/etc/ld.so.conf.d/root-system.conf</strong> where the path to the <code>lib</code> directory of <code>ROOT</code> is added and call <strong>/sbin/ldconfig</strong> afterwards. In the example mentioned above one way of doing this is: <pre class="bash">
|
||||
echo "/opt/root-system/lib" >> /etc/ld.so.conf.d/root-system.conf
|
||||
/sbin/ldconfig
|
||||
<p></p>
|
||||
If an update of <code>ROOT</code> is needed, simple do the following:<pre class="bash">
|
||||
$ cd $HOME/Apps/root
|
||||
$ git pull
|
||||
$ make
|
||||
</pre>
|
||||
</li> <li> <span class='foswikiRedFG'>Additionally</span>, as normal user one should append the following lines to the <strong>~/.bashrc</strong> and/or <strong>~/.bash_profile</strong> (and then either restart the shell or call the same commands once more from the shell) in order to change some path-setting environment variables: <pre class="bash">
|
||||
export ROOTSYS=/opt/root-system/
|
||||
export PATH=$ROOTSYS/bin:$PATH
|
||||
</pre>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<a name="MusrFitInstallation"></a>
|
||||
<h2><a name="A_3.2_61_61musrfit_61_61"></a> 3.2 <code><b>musrfit</b></code> </h2>
|
||||
When all required software has been set up it can be proceeded with the <code>musrfit</code> installation. First, the most recent source code should be downloaded. The preferred way of doing so is to <strong>clone</strong> the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal
|
||||
When all required software has been set up it can be proceeded with the <code>musrfit</code> installation. First, the most recent source code should be downloaded. The preferred way of doing so is to <strong>clone</strong> the musrfit repository via git. Assuming the code should be located in <strong>$HOME/Apps</strong> this is achieved most easily calling from the terminal
|
||||
<pre class="bash">
|
||||
cd
|
||||
git clone https://bitbucket.org/muonspin/musrfit.git
|
||||
$ cd $HOME/Apps
|
||||
$ git clone https://bitbucket.org/muonspin/musrfit.git
|
||||
</pre>
|
||||
or
|
||||
<pre class="bash">
|
||||
cd
|
||||
git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
$ cd $HOME/Apps
|
||||
$ git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
</pre>
|
||||
<p></p>
|
||||
<strong>Note:</strong> musrfit has moved from svn to git. In case you still have an <em>old</em> svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link:
|
||||
@ -270,8 +299,11 @@ git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
<p></p>
|
||||
If a local repository clone is already present, one can update it using:
|
||||
<pre class="bash">
|
||||
cd musrfit
|
||||
git pull
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ git pull
|
||||
$ # the new version now needs to be compiled and installed
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads" target="_top">musrfit at bitbucket</a>.
|
||||
@ -294,14 +326,14 @@ After the source-code extraction the <strong>autogen.sh</strong> script is calle
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>--prefix</strong>. The other paths should be detected automatically. If this does not work for some reason the <strong>configure</strong> script will terminate and ask for the information.
|
||||
When the <strong>configure</strong> script has been called successfully everything is ready for building the <code>musrfit</code> libraries and executables. A standard installation sequence (without <code>NeXus</code> support) might then look like<a name="FootNote3text"></a><span class='FootNoteTextLink' title='In case the normal user has no write permissions to the $ROOTSYS and the installation path the "make install" commands have to be executed as superuser.'><a href="#FootNote3note" class="foswikiCurrentTopicLink">(3)</a></span>:
|
||||
When the <strong>configure</strong> script has been called successfully everything is ready for building the <code>musrfit</code> libraries and executables. A standard installation sequence (without <code>NeXus</code> support) might then look like<a name="FootNote1text"></a><span class='FootNoteTextLink' title='In case the normal user has no write permissions to the $ROOTSYS and the installation path the "make install" commands have to be executed as superuser.'><a href="#FootNote1note" class="foswikiCurrentTopicLink">(3)</a></span>:
|
||||
<pre class="bash">
|
||||
cd musrfit
|
||||
sh autogen.sh
|
||||
./configure --prefix=$ROOTSYS
|
||||
make
|
||||
make install
|
||||
/sbin/ldconfig (as superuser)
|
||||
$ cd $HOME/Apps/musrfit
|
||||
$ sh autogen.sh
|
||||
$ ./configure --prefix=$ROOTSYS
|
||||
$ make
|
||||
$ make install
|
||||
$ /sbin/ldconfig # (as superuser)
|
||||
</pre>
|
||||
In order to finish the installation of <code>musrfit</code> two more things should be done: <ul>
|
||||
<li> Define the <strong>MUSRFITPATH</strong> environment variable containing the path to the <code>musrfit</code> executables and XML files. E.g. if the location of the example above is used append the following line to the <strong>~/.bashrc</strong> and <strong>~/.bash_profile</strong> (and then either restart the shell or call the same commands once more from the shell): <pre class="bash">
|
||||
@ -314,13 +346,14 @@ export MUSRFITPATH=/opt/root-system/bin
|
||||
<h2><a name="A_3.3_61_61musredit_61_61"></a> 3.3 <code><b>musredit</b></code> </h2>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically if <code>Qt4.6</code> or higher is set up on the machine. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:</span>
|
||||
<pre class="bash">
|
||||
cd src/musredit
|
||||
qmake musredit.pro
|
||||
$ cd $HOME/Apps/musrfit/src/musredit
|
||||
$ # for some distributions you will need qmake-qt4 for the next command
|
||||
$ qmake musredit.pro
|
||||
</pre>
|
||||
If everything went fine <code>musredit</code> can be compiled and installed:
|
||||
<pre class="bash">
|
||||
make
|
||||
make install
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
In case one does not like the executable <strong>musredit</strong> to be copied to the default installation directory $ROOTSYS/bin the last "make install" can be skipped and the executable can be copied somewhere else instead. However, the <strong>musredit_startup.xml</strong> should go to the installation directory <strong>MUSRFITPATH</strong> of the <code>musrfit</code> executables.
|
||||
Eventually, in the installed <strong>musredit_startup.xml</strong> the path specifications should be adjusted to match the local <code>musrfit</code> installation. For detailed information on this XML file refer to the <a href="MusrGui.html#MusrguiStartupXml">manual</a>.
|
||||
@ -333,19 +366,15 @@ If there are problems during the <code>qmake</code> step, e.g. "uic: File genera
|
||||
In order to perform a quick test for finding out if the installation has been completed successfully, a few msr files together with the corresponding data files can be found in the <code>musrfit</code> source tree at <strong>doc/examples/</strong>.<br>
|
||||
If <code>musrgui</code> has been installed, just open one of the <strong>test-*.msr</strong> files in the editor and test the <code>musrfit</code> functionalities. Otherwise, if only the terminal should be used, as an initial test for instance the following could be done:
|
||||
<pre class="bash">
|
||||
cd doc/examples
|
||||
musrview test-histo-ROOT-NPP.msr
|
||||
$ cd $HOME/Apps/musrfit/doc/examples
|
||||
$ musrview test-histo-ROOT-NPP.msr
|
||||
</pre>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
Notes
|
||||
<p></p>
|
||||
<a name="FootNote1note"></a><span class="FootNoteLabel"><a href="#FootNote1text" class="foswikiCurrentTopicLink"> <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: <!-- verbatim3 --></span>
|
||||
<p></p>
|
||||
<a name="FootNote2note"></a><span class="FootNoteLabel"><a href="#FootNote2text" class="foswikiCurrentTopicLink"> <strong>2</strong> </a></span>: <span class="FootNote"> When using <code>GCC</code> ≥ 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> ≥ 4.2 <code>musrfit</code> itself will parallelize the χ<sup>2</sup> calculation.</span>
|
||||
<p></p>
|
||||
<a name="FootNote3note"></a><span class="FootNoteLabel"><a href="#FootNote3text" class="foswikiCurrentTopicLink"> <strong>3</strong> </a></span>: <span class="FootNote">In case the normal user has no write permissions to the $ROOTSYS and the installation path the "make install" commands have to be executed as superuser.</span>
|
||||
<a name="FootNote1note"></a><span class="FootNoteLabel"><a href="#FootNote1text" class="foswikiCurrentTopicLink"> <strong>3</strong> </a></span>: <span class="FootNote">In case the normal user has no write permissions to the $ROOTSYS and the installation path the "make install" commands have to be executed as superuser.</span>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
@ -369,7 +398,7 @@ After these installations already most of the required software is present and t
|
||||
<p></p>
|
||||
Since later on the <code>boost</code> header files should be used and in the standard Cygwin installation these are found at a version specific location, the later handling will be easier if a symbolic link to these files is created now in the terminal (in case it had not been present before):
|
||||
<pre class="bash">
|
||||
ln -sf /usr/include/boost-x_yy_z/boost /usr/include/boost
|
||||
$ ln -sf /usr/include/boost-x_yy_z/boost /usr/include/boost
|
||||
</pre>
|
||||
where <strong>x_yy_z</strong> has to be substituted by the correct version number, e.g. <strong>1_33_1</strong>.
|
||||
<p></p>
|
||||
@ -378,46 +407,46 @@ where <strong>x_yy_z</strong> has to be substituted by the correct version numbe
|
||||
<p></p>
|
||||
All other libraries have to be built from the sources. The following lines will track the installation of <code>JPEG</code> <strong>6b</strong>, <code>MXML</code> <strong>2.9</strong>, <code>HDF</code> <strong>4.2.7-patch1</strong>, and <code>NeXus</code> <strong>4.3.2</strong>. The version numbers and source-code locations might of course change with time but should be easily adjustable.
|
||||
<pre class="bash">
|
||||
cd
|
||||
mkdir nexus
|
||||
cd nexus
|
||||
curl http://www.hdfgroup.org/ftp/lib-external/jpeg/src/jpegsrc.v6b.tar.gz -G | tar xz
|
||||
cd jpeg-6b
|
||||
./configure --prefix=/usr/local --enable-static
|
||||
make
|
||||
make install
|
||||
cd ..
|
||||
curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz
|
||||
cd mxml-2.9
|
||||
./configure --prefix=/usr/local --enable-static
|
||||
make
|
||||
make install
|
||||
cd ..
|
||||
curl http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.7-patch1.tar.gz -G | tar xz
|
||||
cd hdf-4.2.7-patch1
|
||||
./configure --prefix=/usr/local --enable-static --disable-fortran --with-jpeg=/usr/local
|
||||
make
|
||||
make install
|
||||
cd ..
|
||||
curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz
|
||||
cd nexus-4.3.2-20140413svn1919
|
||||
./configure --prefix=/usr/local --with-hdf4=/usr/local --with-hdf5=/usr --with-xml=/usr/local
|
||||
make
|
||||
make install
|
||||
$ cd
|
||||
$ mkdir nexus
|
||||
$ cd nexus
|
||||
$ curl http://www.hdfgroup.org/ftp/lib-external/jpeg/src/jpegsrc.v6b.tar.gz -G | tar xz
|
||||
$ cd jpeg-6b
|
||||
$ ./configure --prefix=/usr/local --enable-static
|
||||
$ make
|
||||
$ make install
|
||||
$ cd ..
|
||||
$ curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz
|
||||
$ cd mxml-2.9
|
||||
$ ./configure --prefix=/usr/local --enable-static
|
||||
$ make
|
||||
$ make install
|
||||
$ cd ..
|
||||
$ curl http://www.hdfgroup.org/ftp/HDF/HDF_Current/src/hdf-4.2.7-patch1.tar.gz -G | tar xz
|
||||
$ cd hdf-4.2.7-patch1
|
||||
$ ./configure --prefix=/usr/local --enable-static --disable-fortran --with-jpeg=/usr/local
|
||||
$ make
|
||||
$ make install
|
||||
$ cd ..
|
||||
$ curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz
|
||||
$ cd nexus-4.3.2-20140413svn1919
|
||||
$ ./configure --prefix=/usr/local --with-hdf4=/usr/local --with-hdf5=/usr --with-xml=/usr/local
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3><a name="A_4.1.3_61_61ROOT_61_61"></a> 4.1.3 <code><b>ROOT</b></code> </h3>
|
||||
In order to install the <code>ROOT</code> system, there are two possibilities: <ul>
|
||||
<li> Download the precompiled <strong>Cygwin GCC 4.3</strong> package of the most recent <code>ROOT</code> version from the <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and unpack it <span class='foswikiRedFG'>in a Cygwin shell</span> (in order to get the line endings correctly) at the final location. Suppose the package has been downloaded to <strong>C:\</strong> and the <code>ROOT</code> tree should be in <strong>C:\root</strong>, this is achieved by:<pre class="bash">
|
||||
cd /cygdrive/c
|
||||
tar xzf root_v5.xx.yy.win32gcc-gcc-4.3.tar.gz
|
||||
$ cd /cygdrive/c
|
||||
$ tar xzf root_v5.xx.yy.win32gcc-gcc-4.3.tar.gz
|
||||
</pre>
|
||||
</li> <li> If due to some reason there was no precompiled <strong>Cygwin GCC 4.3</strong> package available or <code>ROOT</code> should be built from source, one has to visit the <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a>, download the 'complete source tree for all systems' and save it for instance in <strong>C:\</strong>.<br>Then go to the Cygwin shell and unpack this source tree, configure<a name="FootNote4text"></a><span class='FootNoteTextLink' title=' When using <code>GCC</code> ≥ 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> ≥ 4.2 <code>musrfit</code> itself will parallelize the χ<sup>2</sup> calculation.'><a href="#FootNote4note" class="foswikiCurrentTopicLink">(2)</a></span> it (here using the minimal set of options) and compile it as follows right below:<pre class="bash">
|
||||
cd /cygdrive/c
|
||||
tar xzf root_v5.xx.yy.source.tar.gz
|
||||
cd root
|
||||
./configure win32gcc --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
make
|
||||
</li> <li> If due to some reason there was no precompiled <strong>Cygwin GCC 4.3</strong> package available or <code>ROOT</code> should be built from source, one has to visit the <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a>, download the 'complete source tree for all systems' and save it for instance in <strong>C:\</strong>.<br>Then go to the Cygwin shell and unpack this source tree, configure<a name="FootNote2text"></a><span class='FootNoteTextLink' title=' When using <code>GCC</code> ≥ 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> ≥ 4.2 <code>musrfit</code> itself will parallelize the χ<sup>2</sup> calculation.'><a href="#FootNote2note" class="foswikiCurrentTopicLink">(2)</a></span> it (here using the minimal set of options) and compile it as follows right below:<pre class="bash">
|
||||
$ cd /cygdrive/c
|
||||
$ tar xzf root_v5.xx.yy.source.tar.gz
|
||||
$ cd root
|
||||
$ ./configure win32gcc --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
$ make
|
||||
</pre>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -435,13 +464,13 @@ Afterwards close the Cygwin shell and reopen it again for the installation of <c
|
||||
<h2><a name="A_4.2_61_61musrfit_61_61"></a> 4.2 <code><b>musrfit</b></code> </h2>
|
||||
First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal
|
||||
<pre class="bash">
|
||||
cd
|
||||
git clone https://bitbucket.org/muonspin/musrfit.git
|
||||
$ cd
|
||||
$ git clone https://bitbucket.org/muonspin/musrfit.git
|
||||
</pre>
|
||||
or
|
||||
<pre class="bash">
|
||||
cd
|
||||
git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
$ cd
|
||||
$ git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
</pre>
|
||||
<p></p>
|
||||
<strong>Note:</strong> musrfit has moved from svn to git. In case you still have an <em>old</em> svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link:
|
||||
@ -449,8 +478,8 @@ git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
<p></p>
|
||||
If the repository had been checked out already before, one can update the local copy using:
|
||||
<pre class="bash">
|
||||
cd musrfit
|
||||
git pull
|
||||
$ cd musrfit
|
||||
$ git pull
|
||||
</pre>
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads" target="_top">musrfit at bitbucket</a>.
|
||||
@ -475,11 +504,11 @@ After the source-code extraction the <strong>autogen.sh</strong> script is calle
|
||||
Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>--prefix</strong>. The other paths should be detected automatically. If this does not work for some reason the <strong>configure</strong> script will terminate and ask for the information.
|
||||
When the <strong>configure</strong> script has been called successfully everything is ready for building the <code>musrfit</code> libraries and executables. A standard installation sequence (without <code>NeXus</code> support) might then look like:
|
||||
<pre class="bash">
|
||||
cd musrfit
|
||||
sh autogen.sh
|
||||
./configure --prefix=$ROOTSYS
|
||||
make
|
||||
make install
|
||||
$ cd musrfit
|
||||
$ sh autogen.sh
|
||||
$ ./configure --prefix=$ROOTSYS
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> (/cygdrive/c/root/bin/musrfit_startup.xml or C:\root\bin\musrfit_startup.xml). The paths have to obey the <code>POSIX</code> naming convention. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
<p></p>
|
||||
@ -487,13 +516,13 @@ In order to finish the installation of <code>musrfit</code> the paths where <cod
|
||||
<h2><a name="A_4.3_61_61musredit_61_61"></a> 4.3 <code><b>musredit</b></code> </h2>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically if <code>Qt4.5</code> or higher is set up on the machine. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:</span>
|
||||
<pre class="bash">
|
||||
cd src/musredit
|
||||
qmake-qt4 musredit.pro
|
||||
$ cd src/musredit
|
||||
$ qmake-qt4 musredit.pro
|
||||
</pre>
|
||||
If everything went fine <code>musredit</code> can be compiled and installed:
|
||||
<pre class="bash">
|
||||
make
|
||||
make install
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
Eventually, in the installed <strong>musredit_startup.xml</strong> (<strong>/cygdrive/c/root/bin/musredit_startup.xml</strong> or <strong>C:\root\bin\musredit_startup.xml</strong>) the path specifications should be adjusted to match the local <code>musrfit</code> installation. For detailed information on this XML file refer to the <a href="MusrGui.html#MusrguiStartupXml">manual</a>.
|
||||
<p></p>
|
||||
@ -518,20 +547,25 @@ If <code>Qt4.5</code> is not available but <code>Qt3</code> is set up <code>musr
|
||||
In order to perform a quick test for finding out if the installation has been completed successfully, a few msr files together with the corresponding data files can be found in the <code>musrfit</code> source tree at <strong>doc/examples/</strong>.<br>
|
||||
If <code>musrgui</code> has been installed, just open one of the <strong>test-*.msr</strong> files in the editor and test the <code>musrfit</code> functionalities. Otherwise, if only the terminal should be used, as an initial test for instance the following could be done:
|
||||
<pre class="bash">
|
||||
cd doc/examples
|
||||
musrview test-histo-ROOT-NPP.msr
|
||||
$ cd doc/examples
|
||||
$ musrview test-histo-ROOT-NPP.msr
|
||||
</pre>
|
||||
<p></p>
|
||||
<h2><a name="A_4.6_Possible_problems"></a> 4.6 Possible problems </h2>
|
||||
It might be that especially when running on Windows 7 <code>musredit</code> and <code>musrgui</code> produce errors like a "STATUS_ACCESS_VIOLATION".
|
||||
In this case, try to do the following: Close all Cygwin programs (including the terminals and X server) and run from a Windows command prompt (cmd)<pre class="bash">
|
||||
C:\cygwin\bin\ash.exe /bin/rebaseall
|
||||
$ C:\cygwin\bin\ash.exe /bin/rebaseall
|
||||
</pre>
|
||||
If this does not resolve the problem, try to change the compatibility settings of <strong>C:\cygwin\bin\sh.exe</strong> and <strong>C:\cygwin\bin\bash.exe</strong> so that they are executed with administrator privileges.
|
||||
<p></p>
|
||||
<h1><a name="A_5_Mac_OS_X"></a> 5 Mac OS X </h1>
|
||||
<p></p>
|
||||
With Mac OS X the situation is up to some extent similar like on MS Windows but still different since Mac OS X is a UNIX system. The similarity is that also on OS X a helping framework—<i>either</i> <code><a href="http://www.macports.org/" target="_top">MacPorts</a></code> <em>or</em> <code><a href="http://www.finkproject.org/" target="_top">Fink</a></code>—which provides open-source software is employed to fulfill the basic software requirements of <code>musrfit</code>. <span class='foswikiRedFG'>In the following, both possibilities (using <code>MacPorts</code> or <code>Fink</code>) are described but it is emphasized here that it should be followed <em>only one of the possible routes</em>.</span>
|
||||
With Mac OS X the situation is up to some extent similar like on MS Windows but still different since Mac OS X is a UNIX system. The similarity is that also on OS X a helping framework—<i>either</i> <code><a href="http://www.macports.org/" target="_top">MacPorts</a></code> <em>or</em> <code><a href="http://www.finkproject.org/" target="_top">Fink</a></code>—which provides open-source software is employed to fulfill the basic software requirements of <code>musrfit</code>. <span class='foswikiRedFG'>In the following, both possibilities (using <code>MacPorts</code> or <code>Fink</code>) are described but it is emphasized here that it should be followed <em>only one of the possible routes</em>.
|
||||
<p></p>
|
||||
WARNING: The instruction for <code>Fink</code> haven't been updated/tested for quite a while and likely are slightly outdated.
|
||||
</span>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<h2><a name="A_5.1_Requirements_40_61_61MacPorts_61_61_41"></a> 5.1 Requirements (<code><b>MacPorts</b></code>) </h2>
|
||||
<h3><a name="A_5.1.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"></a> 5.1.1 Everything but <code><b>ROOT</b></code> and <code><b>NeXus</b></code> </h3>
|
||||
@ -543,26 +577,26 @@ Before proceeding with the usage of the <code><a href="http://www.macports.org/"
|
||||
After installing the Xcode tools go to the <a href="http://www.macports.org/install.php" target="_top">MacPorts install page</a>, download the installer for your system and follow the installation instructions on the page. By default the <code>MacPorts</code> system will be installed in <strong>/opt/local</strong>.<br>
|
||||
To be sure that the newest version of the software is used a <code>MacPorts</code> upgrade should be performed by typing in a terminal:
|
||||
<pre class="bash">
|
||||
sudo port -v selfupdate
|
||||
$ sudo port -v selfupdate
|
||||
</pre>
|
||||
<hr />
|
||||
<strong>Remark</strong>: <code>MacPorts</code> uses <a href="http://rsync.samba.org/" target="_top">rsync</a> in order to synchronize the list of available packages. It frequently happens that this service is blocked by firewalls. In this case it should be possible to download a local version of the package repository and do the synchronization.
|
||||
If this step becomes necessary (<strong>and only then</strong>) it can be done in the following way: <ol>
|
||||
<li> Get a local version of the repository:<pre class="bash">
|
||||
svn co http://svn.macports.org/repository/macports/trunk/dports ~/dports
|
||||
$ svn co http://svn.macports.org/repository/macports/trunk/dports ~/dports
|
||||
</pre>
|
||||
</li> <li> Edit the file <strong>/opt/local/etc/macports/sources.conf</strong>: At the end of the file, comment the line beginning with "rsync://" and add a new line pointing to your local copy, e.g.<pre class="bash">
|
||||
file:///Users/username/dports
|
||||
</pre>
|
||||
</li> <li> Synchronize the packages:<pre class="bash">
|
||||
sudo port -v -d sync
|
||||
$ sudo port -v -d sync
|
||||
</pre>
|
||||
</li></ol>
|
||||
<hr />
|
||||
Then the <code>MacPorts</code> system should be set up and can be used to install additional software.<br>
|
||||
The installation of the software mentioned <a href="#ReqSw" class="foswikiCurrentTopicLink">above</a> is then done in the terminal:
|
||||
<pre class="bash">
|
||||
sudo port -v install pkgconfig autoconf automake libtool fftw-3 fftw-3-single gsl boost libxml2 qt4-mac
|
||||
$ sudo port -v install pkgconfig autoconf automake libtool fftw-3 fftw-3-single gsl boost libxml2 qt4-mac
|
||||
</pre>
|
||||
With <code><b>qt4-mac</b></code>, <code>musredit</code> will be installed. If it happens that you used <code>musrgui</code> in the past, please change over to <code>musredit</code> since there will be <strong>no</strong> further development for <code>musrgui</code> anymore!
|
||||
<p></p>
|
||||
@ -570,40 +604,52 @@ With <code><b>qt4-mac</b></code>, <code>musredit</code> will be installed. If it
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading data files in the <code>NeXus</code> format the further <a href="#ReqSwNeXus" class="foswikiCurrentTopicLink">required</a> packages are set up:
|
||||
<pre class="bash">
|
||||
sudo port -v install jpeg6b hdf4 hdf5
|
||||
$ sudo port -v install jpeg6b hdf4 hdf5
|
||||
</pre>
|
||||
Unfortunately, the <code>minixml</code> and <code>NeXus</code> libraries have to be compiled and installed directly from the source code. Given the respective version numbers of <strong>2.9</strong> and <strong>4.3.2</strong> (which are subject to change with time) this can be achieved for example by:
|
||||
<pre class="bash">
|
||||
cd
|
||||
curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz
|
||||
cd mxml-2.9
|
||||
./configure --prefix=/usr/local
|
||||
make
|
||||
sudo make install
|
||||
cd ..
|
||||
curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz
|
||||
cd nexus-4.3.2-20140413svn1919
|
||||
./configure --prefix=/usr/local
|
||||
make
|
||||
sudo make install
|
||||
$ cd
|
||||
$ curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz
|
||||
$ cd mxml-2.9
|
||||
$ ./configure --prefix=/usr/local
|
||||
$ make
|
||||
$ sudo make install
|
||||
$ cd ..
|
||||
$ curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz
|
||||
$ cd nexus-4.3.2-20140413svn1919
|
||||
$ ./configure --prefix=/usr/local
|
||||
$ make
|
||||
$ sudo make install
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3><a name="A_5.1.3_61_61ROOT_61_61"></a> 5.1.3 <code><b>ROOT</b></code> </h3>
|
||||
For installing the <code>ROOT</code> system there are two <strong>independent</strong> possibilities: <ul>
|
||||
<li> Visit the <code>ROOT</code> <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and download the packed precompiled binary version matching the OS X version. Then unpack the bundle to its final destination (e.g. /opt/root-system).
|
||||
</li> <li> If there is no precompiled binary version of <code>ROOT</code> available for your system or e.g. <code>ROOT</code> should be compiled with another version of <code>GCC</code> visit the <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and download the 'complete source tree for all systems'. Then unpack this source tree to its destination (e.g. /opt/root-system). 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 ("username" in the example) has easy write access to this directory: <pre class="bash">sudo chown -R username:staff /opt/root-system/ </pre> Finally, <code>ROOT</code> can be configured (here using the minimal set of options) and compiled as stated right below: <pre class="bash">
|
||||
cd /opt/root-system
|
||||
./configure --gminimal --enable-fink --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
make
|
||||
</pre> and for Mac OS X 10.9 (Mavericks) for now (beginning 2014, subject to be changed <strong>hopefully</strong> soon): <pre class="bash">
|
||||
cd /opt/root-system
|
||||
./configure --gminimal --enable-builtin-freetype --enable-fink --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
make
|
||||
The best way to get <code>ROOT</code> exactly the way needed for <code>musrfit</code> is to install it from source. Before describing it, please make sure that you have installed all required packages listed under <a href="#ReqSw" class="foswikiCurrentTopicLink">Requested Software</a> (e.g. fftw, gsl, etc).
|
||||
<p></p>
|
||||
For the following it is assumed that <code>ROOT</code> shall be installed under <code>$HOME/Apps</code>. If you want to install it somewhere else, just systematically replace the related terms of the following description. For the following list of commands the '$' will be given, the command prompt. Do <strong>not</strong> enter it! Also some comments will be added starting with a '#' which can be omitted. They are only there to explain what is going on.
|
||||
<pre class="bash">
|
||||
$ cd $HOME
|
||||
$ # creat the Apps directory if not already present
|
||||
$ mkdir Apps
|
||||
$ cd Apps
|
||||
$ git clone http://root.cern.ch/git/root.git
|
||||
$ cd root
|
||||
$ git tag -l
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v5-34-xx
|
||||
$ # where xx is the highest listed number, e.g. v5-34-32
|
||||
$ git checkout -b v5-34-32 v5-34-32
|
||||
$ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
|
||||
$ ./configure --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
$ # next will be the make. If running on a multicore CPU you can speed up tremendously by calling
|
||||
$ # make with the option -j <number>, where <number> is the number of threads which you want to give,
|
||||
$ # e.g. make -j8
|
||||
$ make
|
||||
</pre>
|
||||
</li> <li> In case you are just migrating to the latest Mac OS X version (<em>e.g.</em> from 10.7 to 10.8.1) often for a period of a few weeks it is necessary to work with the GIT trunk version of <code>ROOT</code>, <em>i.e.</em> that you have to checkout <code>ROOT</code> via <code>git</code>: <pre class="bash">
|
||||
git clone http://root.cern.ch/git/root.git
|
||||
</pre> For details see <a href="http://root.cern.ch/drupal/content/installing-root-source" target="_top">Installing ROOT from Source</a>.
|
||||
</li></ul>
|
||||
<p></p>
|
||||
For further details see <a href="http://root.cern.ch/drupal/content/installing-root-source" target="_top">Installing ROOT from Source</a>.
|
||||
<p></p>
|
||||
Since Apple in its wisdom decided that programs started from a shell are treated differently than apps if it is coming to system variables, we need to work harder compared to a Linux system.
|
||||
<p></p>
|
||||
<strong>For Mac OS X <= 10.8:</strong>
|
||||
<p></p>
|
||||
In order to finalize the <code>ROOT</code> installation and to prepare already the installation of <code>musrfit</code> and <code>musrgui</code> / <code>musredit</code> this is a good time for setting necessary environment variables for the use in Mac OS X. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file <strong>~/.MacOSX/environment.plist</strong> and <span class='foswikiRedFG'>re-login</span>:<br>
|
||||
<pre class="html">
|
||||
@ -612,11 +658,58 @@ In order to finalize the <code>ROOT</code> installation and to prepare already t
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>MUSRFITPATH</key>
|
||||
<string>/opt/root-system/bin</string> (where to find the musrfit executables)
|
||||
<string>$HOME/Apps/root/bin</string> (where to find the musrfit executables)
|
||||
<key>QTDIR</key>
|
||||
<string>/opt/local/lib/qt3mac</string> (where to find Qt3 (for musrgui) or Qt4 (for musredit))
|
||||
<key>ROOTSYS</key>
|
||||
<string>/opt/root-system</string> (where to find the ROOT system)
|
||||
<string>$HOME/Apps/root</string> (where to find the ROOT system)
|
||||
</dict>
|
||||
</plist>
|
||||
</pre>
|
||||
<p></p>
|
||||
<strong>For Mac OS X > 10.8:</strong>
|
||||
<p></p>
|
||||
Here we will need two files placed under <strong>~/Library/LaunchAgents</strong>, the first called <strong>setenv.ROOTSYS.plist</strong> with the content
|
||||
<pre class="html">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>setenv.ROOTSYS</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/bin/launchctl</string>
|
||||
<string>setenv</string>
|
||||
<string>ROOTSYS</string>
|
||||
<string>$HOME/Apps/root</string>
|
||||
</array>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>ServiceIPC</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
</pre>
|
||||
and the second called <strong>setenv.MUSRFITPATH.plist</strong> in the same directory with the content
|
||||
<pre class="html">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>setenv.MUSRFITPATH</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/bin/launchctl</string>
|
||||
<string>setenv</string>
|
||||
<string>MUSRFITPATH</string>
|
||||
<string>$HOME/Apps/root/bin</string>
|
||||
</array>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>ServiceIPC</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
</pre>
|
||||
@ -640,7 +733,7 @@ Trees: local/main stable/main stable/crypto unstable/main
|
||||
</pre>
|
||||
After applying the changes above to the configuration file, the <code>Fink</code> core system should be upgraded to its newest version by typing in a terminal:
|
||||
<pre class="bash">
|
||||
sudo fink selfupdate
|
||||
$ sudo fink selfupdate
|
||||
</pre>
|
||||
Then the <code>Fink</code> system should be set up and can be used to install additional software.<br>
|
||||
The <code>Fink</code> installer package also contains a graphical user interface called <code>FinkCommander</code> and it is suggested to use that for installing the following packages (or packages with revisions close to the following)—it is necessary to compile a few packages from source since no binary packages are available, however, this is done automatically by the <code>FinkCommander</code> after you have chosen the software packages for installation:
|
||||
@ -651,16 +744,16 @@ Under OS X 10.6 Snow Leopard it will not be possible to install <code><b>qt3mac<
|
||||
<p></p>
|
||||
Also, due to some not fulfilled dependencies, it might not be possible to install FFTW3 through Fink. In this case (<span class='foswikiRedFG'>and ONLY in THIS case</span>) simply download the FFTW3 source code from <a href="http://www.fftw.org/download.html" target="_top">its download page</a> and install it from a terminal using the following commands (for the FFTW version 3.x.y):
|
||||
<pre class="bash">
|
||||
tar xz fftw-3.x.y
|
||||
cd fftw-3.x.y
|
||||
./configure --enable-single --enable-shared --enable-threads --prefix=/usr/local
|
||||
make
|
||||
sudo make install
|
||||
$ tar xz fftw-3.x.y
|
||||
$ cd fftw-3.x.y
|
||||
$ ./configure --enable-single --enable-shared --enable-threads --prefix=/usr/local
|
||||
$ make
|
||||
$ sudo make install
|
||||
</pre>
|
||||
<p></p>
|
||||
Since later on the <code>boost</code> header files should be used and in the standard <code>Fink</code> installation these are found at a version specific location, the later handling will be easier if a symbolic link to this files is created now in the terminal (if it did not exist earlier), e.g.:
|
||||
<pre class="bash">
|
||||
ln -sf /sw/include/boost-x_yy_z/boost /sw/include/boost
|
||||
$ ln -sf /sw/include/boost-x_yy_z/boost /sw/include/boost
|
||||
</pre>
|
||||
where <strong>x_yy_z</strong> has to be substituted by the correct version number, e.g. <strong>1_41_0</strong>.
|
||||
<p></p>
|
||||
@ -672,34 +765,48 @@ where <strong>x_yy_z</strong> has to be substituted by the correct version numbe
|
||||
<p></p>
|
||||
Unfortunately, the <code>minixml</code> and <code>NeXus</code> libraries have to be compiled and installed directly from the source code. Given the respective version numbers of <strong>2.9</strong> and <strong>4.3.2</strong> (which are subject to change with time) this can be achieved for example by:
|
||||
<pre class="bash">
|
||||
cd
|
||||
curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz
|
||||
cd mxml-2.9
|
||||
./configure --prefix=/usr/local
|
||||
make
|
||||
sudo make install
|
||||
cd ..
|
||||
curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz
|
||||
cd nexus-4.3.2-20140413svn1919
|
||||
./configure --prefix=/usr/local
|
||||
make
|
||||
sudo make install
|
||||
$ cd
|
||||
$ curl www.msweet.org/files/project3/mxml-2.9.tar.gz -G | tar xz
|
||||
$ cd mxml-2.9
|
||||
$ ./configure --prefix=/usr/local
|
||||
$ make
|
||||
$ sudo make install
|
||||
$ cd ..
|
||||
$ curl http://download.nexusformat.org/kits/nexus-4.3.2-20140413svn1919.tar.gz -G | tar xz
|
||||
$ cd nexus-4.3.2-20140413svn1919
|
||||
$ ./configure --prefix=/usr/local
|
||||
$ make
|
||||
$ sudo make install
|
||||
</pre>
|
||||
<p></p>
|
||||
<h3><a name="A_5.2.3_61_61ROOT_61_61"></a> 5.2.3 <code><b>ROOT</b></code> </h3>
|
||||
For installing the <code>ROOT</code> system there are some <strong>independent</strong> possibilities: <ul>
|
||||
<li> Visit the <code>ROOT</code> <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and download the packed precompiled binary version matching the OS X version. Then unpack the bundle to its final destination (e.g. /opt/root-system).
|
||||
</li> <li> If there is no precompiled binary version of <code>ROOT</code> available for your system or e.g. <code>ROOT</code> should be compiled with another version of <code>GCC</code> visit the <a href="http://root.cern.ch/drupal/content/downloading-root" target="_top">web page</a> and download the 'complete source tree for all systems'. Then unpack this source tree to its destination (e.g. /opt/root-system). 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 ("username" in the example) has easy write access to this directory: <pre class="bash">sudo chown -R username:staff /opt/root-system/ </pre> Finally, <code>ROOT</code> can be configured (here using the minimal set of options) and compiled as stated right below: <pre class="bash">
|
||||
cd /opt/root-system
|
||||
./configure --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
make
|
||||
</pre> and for Mac OS X 10.9 (Mavericks) for now (beginning 2014, subject to be changed <strong>hopefully</strong> soon): <pre class="bash">
|
||||
cd /opt/root-system
|
||||
./configure --gminimal --enable-builtin-freetype --enable-fink --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
make
|
||||
The best way to get <code>ROOT</code> exactly the way needed for <code>musrfit</code> is to install it from source. Before describing it, please make sure that you have installed all required packages listed under <a href="#ReqSw" class="foswikiCurrentTopicLink">Requested Software</a> (e.g. fftw, gsl, etc).
|
||||
<p></p>
|
||||
For the following it is assumed that <code>ROOT</code> shall be installed under <code>$HOME/Apps</code>. If you want to install it somewhere else, just systematically replace the related terms of the following description. For the following list of commands the '$' will be given, the command prompt. Do <strong>not</strong> enter it! Also some comments will be added starting with a '#' which can be omitted. They are only there to explain what is going on.
|
||||
<pre class="bash">
|
||||
$ cd $HOME
|
||||
$ # creat the Apps directory if not already present
|
||||
$ mkdir Apps
|
||||
$ cd Apps
|
||||
$ git clone http://root.cern.ch/git/root.git
|
||||
$ cd root
|
||||
$ git tag -l
|
||||
$ # git tag -l will list all available tags. In the next command choose the tag v5-34-xx
|
||||
$ # where xx is the highest listed number, e.g. v5-34-32
|
||||
$ git checkout -b v5-34-32 v5-34-32
|
||||
$ # now ROOT is ready to be configured. Below you will find the minimal ROOT configuration needed.
|
||||
$ ./configure --gminimal --enable-asimage --enable-mathmore --enable-minuit2 --enable-xml
|
||||
$ # next will be the make. If running on a multicore CPU you can speed up tremendously by calling
|
||||
$ # make with the option -j <number>, where <number> is the number of threads which you want to give,
|
||||
$ # e.g. make -j8
|
||||
$ make
|
||||
</pre>
|
||||
</li> <li> <code>ROOT</code> is also available through the <code>FinkCommander</code>! Install <strong>root5</strong> or <strong>root5-devel</strong>. However, this versions also have to be compiled locally since there are no binary packages. The manual installation mentioned right above should be preferred in this case.
|
||||
</li></ul>
|
||||
<p></p>
|
||||
For further details see <a href="http://root.cern.ch/drupal/content/installing-root-source" target="_top">Installing ROOT from Source</a>.
|
||||
<p></p>
|
||||
Since Apple in its wisdom decided that programs started from a shell are treated differently than apps if it is coming to system variables, we need to work harder compared to a Linux system.
|
||||
<p></p>
|
||||
<strong>For Mac OS X <= 10.8:</strong>
|
||||
<p></p>
|
||||
In order to finalize the <code>ROOT</code> installation and to prepare already the installation of <code>musrfit</code> and <code>musrgui</code> / <code>musredit</code> this is a good time for setting necessary environment variables for the use in Mac OS X. Put the following lines (without the comments in parentheses and with the paths adjusted to your local installation) into the file <strong>~/.MacOSX/environment.plist</strong> and <span class='foswikiRedFG'>re-login</span>:<br>
|
||||
<pre class="html">
|
||||
@ -708,11 +815,58 @@ In order to finalize the <code>ROOT</code> installation and to prepare already t
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>MUSRFITPATH</key>
|
||||
<string>/opt/root-system/bin</string> (where to find the musrfit executables)
|
||||
<string>$HOME/Apps/root/bin</string> (where to find the musrfit executables)
|
||||
<key>QTDIR</key>
|
||||
<string>/sw/lib/qt3mac</string> (where to find Qt3 (for musrgui) or Qt4 (for musredit))
|
||||
<string>/opt/local/lib/qt3mac</string> (where to find Qt3 (for musrgui) or Qt4 (for musredit))
|
||||
<key>ROOTSYS</key>
|
||||
<string>/opt/root-system</string> (where to find the ROOT system)
|
||||
<string>$HOME/Apps/root</string> (where to find the ROOT system)
|
||||
</dict>
|
||||
</plist>
|
||||
</pre>
|
||||
<p></p>
|
||||
<strong>For Mac OS X > 10.8:</strong>
|
||||
<p></p>
|
||||
Here we will need two files placed under <strong>~/Library/LaunchAgents</strong>, the first called <strong>setenv.ROOTSYS.plist</strong> with the content
|
||||
<pre class="html">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>setenv.ROOTSYS</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/bin/launchctl</string>
|
||||
<string>setenv</string>
|
||||
<string>ROOTSYS</string>
|
||||
<string>$HOME/Apps/root</string>
|
||||
</array>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>ServiceIPC</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
</pre>
|
||||
and the second called <strong>setenv.MUSRFITPATH.plist</strong> in the same directory with the content
|
||||
<pre class="html">
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>Label</key>
|
||||
<string>setenv.MUSRFITPATH</string>
|
||||
<key>ProgramArguments</key>
|
||||
<array>
|
||||
<string>/bin/launchctl</string>
|
||||
<string>setenv</string>
|
||||
<string>MUSRFITPATH</string>
|
||||
<string>$HOME/Apps/root/bin</string>
|
||||
</array>
|
||||
<key>RunAtLoad</key>
|
||||
<true/>
|
||||
<key>ServiceIPC</key>
|
||||
<false/>
|
||||
</dict>
|
||||
</plist>
|
||||
</pre>
|
||||
@ -721,19 +875,17 @@ Additionally, one might want to put a line in <strong>~/.profile</strong> (or <s
|
||||
<pre class="bash">
|
||||
export PATH=$ROOTSYS/bin:$QTDIR/bin:$PATH
|
||||
</pre>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<h2><a name="A_5.3_61_61musrfit_61_61"></a> 5.3 <code><b>musrfit</b></code> </h2>
|
||||
First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/musrfit this is achieved most easily calling from the terminal
|
||||
First, the most recent source code should be downloaded. First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/Apps/musrfit this is achieved most easily calling from the terminal
|
||||
<p></p>
|
||||
<pre class="bash">
|
||||
cd
|
||||
git clone https://bitbucket.org/muonspin/musrfit.git
|
||||
$ cd ~/Apps
|
||||
$ git clone https://bitbucket.org/muonspin/musrfit.git
|
||||
</pre>
|
||||
or
|
||||
<pre class="bash">
|
||||
cd
|
||||
git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
$ cd ~/Apps
|
||||
$ git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
</pre>
|
||||
<p></p>
|
||||
<p></p>
|
||||
@ -742,8 +894,8 @@ git clone git://gitorious.psi.ch/nemu/musrfit.git
|
||||
<p></p>
|
||||
If a local repository clone is already present, one can update it using:
|
||||
<pre class="bash">
|
||||
cd musrfit
|
||||
git pull
|
||||
$ cd ~/Apps/musrfit
|
||||
$ git pull
|
||||
</pre>
|
||||
<p></p>
|
||||
<span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads" target="_top">musrfit at bitbucket</a>.
|
||||
@ -768,11 +920,11 @@ After the source-code extraction the <strong>autogen.sh</strong> script is calle
|
||||
Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>--prefix</strong>. The other paths should be detected automatically. If this does not work for some reason the <strong>configure</strong> script will terminate and ask for the information.
|
||||
When the <strong>configure</strong> script has been called successfully everything is ready for building the <code>musrfit</code> libraries and executables. A standard installation sequence (without <code>NeXus</code> support) might then look like:
|
||||
<pre class="bash">
|
||||
cd musrfit
|
||||
sh autogen.sh
|
||||
./configure --prefix=$ROOTSYS
|
||||
make
|
||||
make install
|
||||
$ cd ~/Apps/musrfit
|
||||
$ sh autogen.sh
|
||||
$ ./configure --prefix=$ROOTSYS
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> ($ROOTSYS/bin/musrfit_startup.xml). For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
|
||||
<p></p>
|
||||
@ -780,25 +932,25 @@ In order to finish the installation of <code>musrfit</code> the paths where <cod
|
||||
<h2><a name="A_5.4_61_61musredit_61_61"></a> 5.4 <code><b>musredit</b></code> </h2>
|
||||
<span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically if <code>Qt4.5</code> or higher is set up on the machine. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt4" option or install this editor separately:</span>
|
||||
<pre class="bash">
|
||||
cd src/musredit
|
||||
qmake musredit.pro
|
||||
$ cd ~/Apps/musrfit/src/musredit
|
||||
$ qmake musredit.pro
|
||||
</pre>
|
||||
If everything went fine <code>musredit</code> can be compiled and installed:
|
||||
<pre class="bash">
|
||||
make
|
||||
make install
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
The last command copies <strong>musredit.app</strong> to the standard program directory <strong>/Applications</strong> and the <strong>musredit_startup.xml</strong> to <strong>$ROOTSYS/bin/musredit_startup.xml</strong>. Eventually, in the installed <strong>musredit_startup.xml</strong> the path specifications have to be adjusted to match the local <code>musrfit</code> installation. For detailed information on this XML file refer to the <a href="MusrGui.html#MusrguiStartupXml">manual</a>.
|
||||
<p></p>
|
||||
<h2><a name="A_5.5_61_61musrgui_61_61"></a> 5.5 <code><b>musrgui</b></code> </h2>
|
||||
<h2><a name="A_5.5_61_61musrgui_61_61_40obsolete_41"></a> 5.5 <code><b>musrgui</b></code> (obsolete) </h2>
|
||||
If <code>Qt3</code> is set up the installation of the <code>musrfit</code> editor can be done as follows from within the shell:
|
||||
<pre class="bash">
|
||||
cd src/musrgui
|
||||
qmake musrgui.pro
|
||||
make
|
||||
make install
|
||||
$ cd ~/Apps/musrfit/src/musrgui
|
||||
$ qmake musrgui.pro
|
||||
$ make
|
||||
$ make install
|
||||
</pre>
|
||||
The last command copies <strong>musrgui.app</strong> to the standard program directory <strong>/Applications</strong> <a name="FootNote5text"></a><span class='FootNoteTextLink' title='In the case <code><b>qt3-mac</b></code> has not been installed, there will be no <strong>musrgui.app</strong> but only the executable <strong>musrgui</strong> which will be placed in the directory <strong>$ROOTSYS/bin</strong> and has to be called from the terminal.'><a href="#FootNote5note" class="foswikiCurrentTopicLink">(4)</a></span> and the <strong>musrgui_startup.xml</strong> to <strong>$ROOTSYS/bin/musrgui_startup.xml</strong>. Eventually, in the installed <strong>musrgui_startup.xml</strong> the path-specifications have to be adjusted to match the local <code>musrfit</code> installation. For detailed information on this XML file refer to the <a href="MusrGui.html#MusrguiStartupXml">manual</a>.
|
||||
The last command copies <strong>musrgui.app</strong> to the standard program directory <strong>/Applications</strong> <a name="FootNote3text"></a><span class='FootNoteTextLink' title='In the case <code><b>qt3-mac</b></code> has not been installed, there will be no <strong>musrgui.app</strong> but only the executable <strong>musrgui</strong> which will be placed in the directory <strong>$ROOTSYS/bin</strong> and has to be called from the terminal.'><a href="#FootNote3note" class="foswikiCurrentTopicLink">(4)</a></span> and the <strong>musrgui_startup.xml</strong> to <strong>$ROOTSYS/bin/musrgui_startup.xml</strong>. Eventually, in the installed <strong>musrgui_startup.xml</strong> the path-specifications have to be adjusted to match the local <code>musrfit</code> installation. For detailed information on this XML file refer to the <a href="MusrGui.html#MusrguiStartupXml">manual</a>.
|
||||
<p></p>
|
||||
Under some circumstances it might happen, that if <code>musrgui</code> was called from <code>Finder</code> the necessary libraries for executing <code>musrfit</code> could not be found.
|
||||
In that case, the only workaround for the moment is to export the environment variable <strong>DYLD_LIBRARY_PATH</strong> in the shell and call <code>musrgui</code> from a terminal!
|
||||
@ -812,7 +964,9 @@ alias mgui='/Applications/musrgui.app/Contents/MacOS/musrgui'
|
||||
<p></p>
|
||||
Notes
|
||||
<p></p>
|
||||
<a name="FootNote5note"></a><span class="FootNoteLabel"><a href="#FootNote5text" class="foswikiCurrentTopicLink"> <strong>4</strong> </a></span>: <span class="FootNote">In the case <code><b>qt3-mac</b></code> has not been installed, there will be no <strong>musrgui.app</strong> but only the executable <strong>musrgui</strong> which will be placed in the directory <strong>$ROOTSYS/bin</strong> and has to be called from the terminal.</span>
|
||||
<a name="FootNote2note"></a><span class="FootNoteLabel"><a href="#FootNote2text" class="foswikiCurrentTopicLink"> <strong>2</strong> </a></span>: <span class="FootNote"> When using <code>GCC</code> ≥ 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> ≥ 4.2 <code>musrfit</code> itself will parallelize the χ<sup>2</sup> calculation.</span>
|
||||
<p></p>
|
||||
<a name="FootNote3note"></a><span class="FootNoteLabel"><a href="#FootNote3text" class="foswikiCurrentTopicLink"> <strong>4</strong> </a></span>: <span class="FootNote">In the case <code><b>qt3-mac</b></code> has not been installed, there will be no <strong>musrgui.app</strong> but only the executable <strong>musrgui</strong> which will be placed in the directory <strong>$ROOTSYS/bin</strong> and has to be called from the terminal.</span>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
@ -822,11 +976,11 @@ Notes
|
||||
In order to perform a quick test for finding out if the installation has been completed successfully, a few msr files together with the corresponding data files can be found in the <code>musrfit</code> source tree at <strong>doc/examples/</strong>.<br>
|
||||
If <code>musrgui</code> has been installed, just open one of the <strong>test-*.msr</strong> files in the editor and test the <code>musrfit</code> functionalities. Otherwise, if only the terminal should be used, as an initial test for instance the following could be done:
|
||||
<pre class="bash">
|
||||
cd doc/examples
|
||||
musrview test-histo-ROOT-NPP.msr
|
||||
$ cd ~/Apps/musrfit/doc/examples
|
||||
$ musrview test-histo-ROOT-NPP.msr
|
||||
</pre>
|
||||
<p></p>
|
||||
-- <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> & <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> </div>
|
||||
-- <a href="http://www.psi.ch/low-energy-muons/people" target="_top">AS</a> & <a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a> </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -848,9 +1002,9 @@ musrview test-histo-ROOT-NPP.msr
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1432922462' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrFitSetup?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitSetup?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r60 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=59;rev2=60"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=59">r59</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=58;rev2=59"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=58">r58</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=57;rev2=58"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=57">r57</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?template=more&maxrev=60&currrev=60' 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=1439717200' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrFitSetup?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitSetup?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r61 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=60;rev2=61"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=60">r60</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=59;rev2=60"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=59">r59</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFitSetup?rev1=58;rev2=59"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFitSetup?rev=58">r58</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrFitSetup?template=more&maxrev=61&currrev=61' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r60 - 25 Oct 2014, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r61 - 03 Jul 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -894,7 +1048,7 @@ musrview test-histo-ROOT-NPP.msr
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:42 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:15 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:37 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:11 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1432922461" type="application/x-wiki" title="edit MusrGui" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1439717199" type="application/x-wiki" title="edit MusrGui" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -329,7 +329,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab7181' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrGui;render=on;1432922461'}">
|
||||
<!-- TAB --><div id='jqTab5183' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrGui;render=on;1439717199'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -351,7 +351,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1432922461' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrGui?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrGui?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r20 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=19;rev2=20"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=19">r19</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=18;rev2=19"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=18">r18</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=17;rev2=18"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=17">r17</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?template=more&maxrev=20&currrev=20' 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=1439717199' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrGui?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrGui?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r20 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=19;rev2=20"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=19">r19</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=18;rev2=19"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=18">r18</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=17;rev2=18"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=17">r17</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrGui?template=more&maxrev=20&currrev=20' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r20 - 19 Feb 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
@ -397,7 +397,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:40 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:14 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:11 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:26:47 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1432922455" type="application/x-wiki" title="edit MusrRoot" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1439717193" type="application/x-wiki" title="edit MusrRoot" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -1040,7 +1040,7 @@ Result in the <code>RunHeader/SampleEnvironmentInfo</code>:
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab2953' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrRoot;render=on;1432922455'}">
|
||||
<!-- TAB --><div id='jqTab9959' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrRoot;render=on;1439717193'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -1062,7 +1062,7 @@ Result in the <code>RunHeader/SampleEnvironmentInfo</code>:
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1432922455' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrRoot' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='MusrRootc99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrRoot?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrRoot?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r7 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrRoot?rev1=6;rev2=7"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrRoot?rev=6">r6</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrRoot?rev1=5;rev2=6"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrRoot?rev=5">r5</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrRoot?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrRoot?rev=4">r4</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?template=more&maxrev=7&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/MusrRoot?t=1439717193' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/MusrRoot' rel='nofollow' title='Attach an image or document to this topic' accesskey='a'><span class='foswikiAccessKey'>A</span>ttach</a></span><span class='foswikiSeparator'> | </span><span><a href='MusrRootc99a.html?cover=print;cover=print' rel='nofollow' title='Printable version of this topic' accesskey='p'><span class='foswikiAccessKey'>P</span>rint version</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/MusrRoot?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrRoot?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r7 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrRoot?rev1=6;rev2=7"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrRoot?rev=6">r6</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrRoot?rev1=5;rev2=6"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrRoot?rev=5">r5</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrRoot?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrRoot?rev=4">r4</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?template=backlinksweb' rel='nofollow' title='Search the MUSR Web for topics that link to here' accesskey='b'><span class='foswikiAccessKey'>B</span>acklinks</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?raw=on' rel='nofollow' title='View without formatting' accesskey='v'><span class='foswikiAccessKey'>V</span>iew wiki text</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/MusrRoot?template=more&maxrev=7&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 class="patternInfo"><span class="patternRevInfo">Topic revision: r7 - 29 Mar 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
@ -1108,7 +1108,7 @@ Result in the <code>RunHeader/SampleEnvironmentInfo</code>:
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:25 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:26:59 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:35 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:09 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1432922460" type="application/x-wiki" title="edit QuickStart" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1439717198" type="application/x-wiki" title="edit QuickStart" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -282,7 +282,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1432922460' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/QuickStart?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/QuickStart?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r7 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=6;rev2=7"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=6">r6</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=5;rev2=6"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=5">r5</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=4">r4</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?template=more&maxrev=7&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=1439717198' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/QuickStart?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/QuickStart?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r7 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=6;rev2=7"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=6">r6</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=5;rev2=6"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=5">r5</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/QuickStart?rev1=4;rev2=5"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/QuickStart?rev=4">r4</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/QuickStart?template=more&maxrev=7&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 class="patternInfo"><span class="patternRevInfo">Topic revision: r7 - 10 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -328,7 +328,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:37 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:11 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:29 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:04 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1432922459" type="application/x-wiki" title="edit TutorialSingleHisto" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1439717197" type="application/x-wiki" title="edit TutorialSingleHisto" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -283,7 +283,7 @@ This page only summarizes the very basic features and options of the programs co
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab7330' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.TutorialSingleHisto;render=on;1432922459'}">
|
||||
<!-- TAB --><div id='jqTab6000' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.TutorialSingleHisto;render=on;1439717197'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(6)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -305,7 +305,7 @@ This page only summarizes the very basic features and options of the programs co
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1432922459' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/TutorialSingleHisto?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/TutorialSingleHisto?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r9 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=8;rev2=9"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=8">r8</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=7;rev2=8"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=7">r7</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=6;rev2=7"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=6">r6</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?template=more&maxrev=9&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=1439717197' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/TutorialSingleHisto?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/TutorialSingleHisto?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r9 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=8;rev2=9"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=8">r8</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=7;rev2=8"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=7">r7</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/TutorialSingleHisto?rev1=6;rev2=7"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/TutorialSingleHisto?rev=6">r6</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/TutorialSingleHisto?template=more&maxrev=9&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 class="patternInfo"><span class="patternRevInfo">Topic revision: r9 - 02 Sep 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -351,7 +351,7 @@ This page only summarizes the very basic features and options of the programs co
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:01:35 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:09 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en_US" lang="en_US">
|
||||
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:19 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:52 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,7 +8,7 @@
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
|
||||
<link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1432922471" type="application/x-wiki" title="edit WebHome" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1439717207" type="application/x-wiki" title="edit WebHome" />
|
||||
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
|
||||
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
|
||||
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
|
||||
@ -136,7 +136,7 @@ pre {
|
||||
</li> <li> <a href="MusrFitAcknowledgements.html">Acknowledgements</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
-- <a href="http://www.psi.ch/low-energy-muons/people" target="_top">AS</a> & (<a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a>) - last update May 29, 2015 </div>
|
||||
-- <a href="http://www.psi.ch/low-energy-muons/people" target="_top">AS</a> & (<a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a>) - last update August 16, 2015 </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -158,9 +158,9 @@ pre {
|
||||
<div class="foswikiFormSteps">
|
||||
<a name="topic-actions"></a>
|
||||
<div class="patternTopicActions foswikiFormStep">
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1432922471' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/WebHome?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/WebHome?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r50 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=49;rev2=50"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=49">r49</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=48;rev2=49"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=48">r48</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=47;rev2=48"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=47">r47</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/WebHome?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/WebHome?template=more&maxrev=50&currrev=50' 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=1439717207' rel='nofollow' title='Edit this topic text' accesskey='e'><span class='foswikiAccessKey'>E</span>dit</a></span><span class='foswikiSeparator'> | </span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/attach/MUSR/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'> | </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'> | </span><span><a href='https://intranet.psi.ch/print/php/pdf.php?url=MUSR/WebHome?cover=print' title='PDF version of this topic'>PDF</a></span><span class='foswikiSeparator'> | </span><span><span class="foswikiRequiresChangePermission"><a href='https://intranet.psi.ch/wiki/bin/oops/MUSR/WebHome?template=oopshistory' rel='nofollow' title='View total topic history' accesskey='h'><span class='foswikiAccessKey'>H</span>istory</a></span>: r52 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=51;rev2=52"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=51">r51</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=50;rev2=51"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=50">r50</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=49;rev2=50"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=49">r49</a></span><span class='foswikiSeparator'> | </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'> | </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'> | </span><span><a href='https://intranet.psi.ch/MUSR/WebHome?refresh=on' title='Refresh images and LaTeX charts'>Refresh</a></span><span class='foswikiSeparator'> | </span><span><a href='https://intranet.psi.ch/MUSR/WebHome?template=more&maxrev=52&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 class="patternInfo"><span class="patternRevInfo">Topic revision: r50 - 29 May 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r52 - 16 Aug 2015, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div>
|
||||
</div><div id="patternSideBar"><div id="patternClearHeaderLeft"></div>
|
||||
<div id="patternSideBarContents">
|
||||
@ -204,7 +204,7 @@ pre {
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Fri, 29 May 2015 18:02:25 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Sun, 16 Aug 2015 09:27:57 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -3165,15 +3165,19 @@ Bool_t PMsrHandler::HandleRunEntry(PMsrLines &lines)
|
||||
if (tokens->GetEntries() < 2) {
|
||||
error = true;
|
||||
} else {
|
||||
PIntVector group;
|
||||
PUIntVector group;
|
||||
str = iter->fLine;
|
||||
if (ParseDetectorGrouping(str, group)) {
|
||||
PStringNumberList *rl = new PStringNumberList(str.Data());
|
||||
string errorMsg("");
|
||||
if (rl->Parse(errorMsg, true)) {
|
||||
group = rl->GetList();
|
||||
for (UInt_t i=0; i<group.size(); i++) {
|
||||
param.SetForwardHistoNo(group[i]);
|
||||
}
|
||||
} else {
|
||||
error = true;
|
||||
}
|
||||
delete rl;
|
||||
group.clear();
|
||||
}
|
||||
}
|
||||
@ -3186,15 +3190,19 @@ Bool_t PMsrHandler::HandleRunEntry(PMsrLines &lines)
|
||||
if (tokens->GetEntries() < 2) {
|
||||
error = true;
|
||||
} else {
|
||||
PIntVector group;
|
||||
PUIntVector group;
|
||||
str = iter->fLine;
|
||||
if (ParseDetectorGrouping(str, group)) {
|
||||
PStringNumberList *rl = new PStringNumberList(str.Data());
|
||||
string errorMsg("");
|
||||
if (rl->Parse(errorMsg, true)) {
|
||||
group = rl->GetList();
|
||||
for (UInt_t i=0; i<group.size(); i++) {
|
||||
param.SetBackwardHistoNo(group[i]);
|
||||
}
|
||||
} else {
|
||||
error = true;
|
||||
}
|
||||
delete rl;
|
||||
group.clear();
|
||||
}
|
||||
}
|
||||
@ -3892,6 +3900,9 @@ Bool_t PMsrHandler::HandlePlotEntry(PMsrLines &lines)
|
||||
param.fLifeTimeCorrection = true;
|
||||
} else if (iter1->fLine.Contains("runs", TString::kIgnoreCase)) { // handle plot runs
|
||||
TComplex run;
|
||||
PStringNumberList *rl;
|
||||
string errorMsg;
|
||||
PUIntVector runList;
|
||||
switch (param.fPlotType) {
|
||||
case -1:
|
||||
error = true;
|
||||
@ -3900,31 +3911,21 @@ Bool_t PMsrHandler::HandlePlotEntry(PMsrLines &lines)
|
||||
case MSR_PLOT_ASYM:
|
||||
case MSR_PLOT_NON_MUSR:
|
||||
case MSR_PLOT_MU_MINUS:
|
||||
tokens = iter1->fLine.Tokenize(" \t");
|
||||
if (!tokens) {
|
||||
rl = new PStringNumberList(iter1->fLine.Data());
|
||||
if (!rl->Parse(errorMsg, true)) {
|
||||
cerr << endl << ">> PMsrHandler::HandlePlotEntry: **SEVERE ERROR** Couldn't tokenize PLOT in line " << iter1->fLineNo;
|
||||
cerr << endl << ">> Error Message: " << errorMsg;
|
||||
cerr << endl << endl;
|
||||
return false;
|
||||
}
|
||||
if (tokens->GetEntries() < 2) { // runs missing
|
||||
error = true;
|
||||
} else {
|
||||
for (Int_t i=1; i<tokens->GetEntries(); i++) {
|
||||
ostr = dynamic_cast<TObjString*>(tokens->At(i));
|
||||
str = ostr->GetString();
|
||||
if (str.IsDigit()) {
|
||||
run = TComplex(str.Atoi(),-1.0);
|
||||
param.fRuns.push_back(run);
|
||||
} else {
|
||||
error = true;
|
||||
}
|
||||
}
|
||||
runList = rl->GetList();
|
||||
for (UInt_t i=0; i<runList.size(); i++) {
|
||||
run = TComplex(runList[i], -1.0);
|
||||
param.fRuns.push_back(run);
|
||||
}
|
||||
// clean up
|
||||
if (tokens) {
|
||||
delete tokens;
|
||||
tokens = 0;
|
||||
}
|
||||
runList.clear();
|
||||
delete rl;
|
||||
break;
|
||||
default:
|
||||
error = true;
|
||||
@ -5644,86 +5645,6 @@ UInt_t PMsrHandler::LastSignificant(Double_t dval, UInt_t precLimit)
|
||||
return lastSignificant;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// ParseDetectorGrouping (private)
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>
|
||||
*
|
||||
* \param str forward/backward string to be decoded
|
||||
* \param group decoded detector grouping vector
|
||||
*
|
||||
* <b>return:</b> true if parsing was successful, false otherwise.
|
||||
*/
|
||||
Bool_t PMsrHandler::ParseDetectorGrouping(TString str, PIntVector &group)
|
||||
{
|
||||
TObjArray *tok=0, *tok1=0;
|
||||
TObjString *ostr=0;
|
||||
Int_t first=0, last=0;
|
||||
|
||||
// change cn - cm to cn-cm. Will *NOT* handle cn - cm etc
|
||||
str = str.ReplaceAll(" - ", "-");
|
||||
|
||||
group.clear();
|
||||
tok = str.Tokenize(" \t");
|
||||
|
||||
// check that there are indeed enough tokens
|
||||
if (tok->GetEntries() < 2) {
|
||||
delete tok;
|
||||
return false;
|
||||
}
|
||||
|
||||
for (Int_t i=1; i<tok->GetEntries(); i++) {
|
||||
ostr = dynamic_cast<TObjString*>(tok->At(i));
|
||||
if (ostr->GetString().Contains("-")) { // hopefully a cn-cm token
|
||||
tok1 = ostr->GetString().Tokenize("-");
|
||||
if (tok1->GetEntries() == 2) {
|
||||
ostr = dynamic_cast<TObjString*>(tok1->At(0));
|
||||
if (ostr->GetString().IsDigit()) {
|
||||
first = ostr->GetString().Atoi();
|
||||
} else {
|
||||
if (tok) delete tok;
|
||||
if (tok1) delete tok1;
|
||||
return false;
|
||||
}
|
||||
ostr = dynamic_cast<TObjString*>(tok1->At(1));
|
||||
if (ostr->GetString().IsDigit()) {
|
||||
last = ostr->GetString().Atoi();
|
||||
} else {
|
||||
if (tok) delete tok;
|
||||
if (tok1) delete tok1;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (last < first) {
|
||||
if (tok) delete tok;
|
||||
return false;
|
||||
}
|
||||
|
||||
for (Int_t i=first; i<=last; i++)
|
||||
group.push_back(i);
|
||||
} else {
|
||||
if (tok) delete tok;
|
||||
if (tok1) delete tok1;
|
||||
return false;
|
||||
}
|
||||
} else { // hopefully a number
|
||||
if (ostr->GetString().IsDigit()) {
|
||||
group.push_back(ostr->GetString().Atoi());
|
||||
} else {
|
||||
if (tok) delete tok;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// clean up
|
||||
if (tok) delete tok;
|
||||
if (tok1) delete tok1;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// MakeDetectorGroupingString (private)
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
@ -28,10 +28,12 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <cassert>
|
||||
|
||||
#include <iostream>
|
||||
using namespace std;
|
||||
|
||||
#include <boost/algorithm/string.hpp>
|
||||
using namespace boost;
|
||||
|
||||
#include "PMusr.h"
|
||||
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
@ -1741,3 +1743,167 @@ void PMsrRunBlock::SetMapGlobal(UInt_t idx, Int_t ival)
|
||||
// else do nothing at the moment
|
||||
return;
|
||||
}
|
||||
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
// implementation PStringNumberList
|
||||
//+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Parse (public)
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Helper class which parses list of numbers of the following 3 forms and its combination.
|
||||
* (i) list of integers separted by spaces, e.g. 1 3 7 14
|
||||
* (ii) a range of integers of the form nS-nE, e.g. 13-27 which will generate 13, 14, 15, .., 26, 27
|
||||
* (iii) a sequence of integers of the form nS:nE:nStep, e.g. 10:20:2 which will generate 10, 12, 14, .., 18, 20
|
||||
*
|
||||
* \param errorMsg error message
|
||||
* \param ignoreFirstToken if true, the first parse token will be ignored
|
||||
*
|
||||
* @return true if parse has been successful, otherwise false
|
||||
*/
|
||||
bool PStringNumberList::Parse(string &errorMsg, bool ignoreFirstToken)
|
||||
{
|
||||
bool result=true;
|
||||
vector<string> splitVec;
|
||||
int ival;
|
||||
|
||||
// before checking tokens, remove 'forbidden' " - " and " : "
|
||||
StripSpaces();
|
||||
|
||||
// split string into space separated tokens
|
||||
split(splitVec, fString, is_any_of(" "), token_compress_on);
|
||||
|
||||
unsigned int start=0;
|
||||
if (ignoreFirstToken)
|
||||
start=1;
|
||||
|
||||
for (unsigned int i=start; i<splitVec.size(); i++) {
|
||||
if (splitVec[i].length() != 0) { // ignore empty tokens
|
||||
if (splitVec[i].find("-") != string::npos) { // check for potential range
|
||||
vector<string> subSplitVec;
|
||||
// split potential nS-nE token
|
||||
split(subSplitVec, splitVec[i], is_any_of("-"), token_compress_on);
|
||||
|
||||
int start=-1, end=-1;
|
||||
unsigned int count=0;
|
||||
for (unsigned int j=0; j<subSplitVec.size(); j++) {
|
||||
if (subSplitVec[j].length() != 0) { // ignore empty tokens
|
||||
if (!IsNumber(subSplitVec[j])) {
|
||||
result = false;
|
||||
} else {
|
||||
count++;
|
||||
if (count == 1)
|
||||
start = atoi(subSplitVec[j].c_str());
|
||||
else if (count == 2)
|
||||
end = atoi(subSplitVec[j].c_str());
|
||||
else
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((start < 0) || (end < 0)) { // check that there is a vaild start and end
|
||||
errorMsg = "**ERROR** start or end of a range is not valid";
|
||||
result = false;
|
||||
}
|
||||
if (result) { // no error, hence check start and end
|
||||
if (start > end) {
|
||||
int swap = end;
|
||||
cerr << "**WARNING** start=" << start << " > end=" << end << ", hence I will swap them" << endl;
|
||||
end = start;
|
||||
start = swap;
|
||||
}
|
||||
for (int j=start; j<=end; j++)
|
||||
fList.push_back(j);
|
||||
}
|
||||
} else if (splitVec[i].find(":") != string::npos) { // check for potential sequence
|
||||
vector<string> subSplitVec;
|
||||
// split potential rStart:rEnd:rStep token
|
||||
split(subSplitVec, splitVec[i], is_any_of(":"), token_compress_on);
|
||||
|
||||
int start=-1, end=-1, step=-1;
|
||||
unsigned int count=0;
|
||||
for (unsigned int j=0; j<subSplitVec.size(); j++) {
|
||||
if (subSplitVec[j].length() != 0) { // ignore empty tokens
|
||||
if (!IsNumber(subSplitVec[j])) {
|
||||
result = false;
|
||||
} else {
|
||||
count++;
|
||||
if (count == 1)
|
||||
start = atoi(subSplitVec[j].c_str());
|
||||
else if (count == 2)
|
||||
end = atoi(subSplitVec[j].c_str());
|
||||
else if (count == 3)
|
||||
step = atoi(subSplitVec[j].c_str());
|
||||
else
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((start < 0) || (end < 0) || (step < 0)) { // check that there is a vaild start and end
|
||||
errorMsg = "**ERROR** start, end, or step of a sequence is not valid";
|
||||
result = false;
|
||||
}
|
||||
if (result) { // no error, hence check start and end
|
||||
if (start > end) {
|
||||
int swap = end;
|
||||
cerr << "**WARNING** start=" << start << " > end=" << end << ", hence I will swap them" << endl;
|
||||
end = start;
|
||||
start = swap;
|
||||
}
|
||||
for (int j=start; j<=end; j+=step)
|
||||
fList.push_back(j);
|
||||
}
|
||||
} else if (IsNumber(splitVec[i])) {
|
||||
ival = atoi(splitVec[i].c_str());
|
||||
fList.push_back(ival);
|
||||
} else {
|
||||
errorMsg = "**ERROR** invalid token: " + splitVec[i];
|
||||
result = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// StripSpaces (private)
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>This routine removes arbitray number of spaces between '-' and ':',
|
||||
* e.g. 123 - 125 will be converted to 123-125, etc.
|
||||
*/
|
||||
void PStringNumberList::StripSpaces()
|
||||
{
|
||||
string str=fString;
|
||||
int pos=-1;
|
||||
|
||||
// backward scan
|
||||
for (int i=str.size(); i>=0; --i) { // check if first space is found
|
||||
if ((str[i] == ' ') && (pos == -1)) {
|
||||
pos = i;
|
||||
} else if ((str[i] == '-') || (str[i] == ':')) { // check for '-' or ':'
|
||||
if (pos != -1) {
|
||||
str.erase(i+1, pos-i);
|
||||
}
|
||||
} else if (str[i] != ' ') { // anything but different than a space leads to a reset of the pos counter
|
||||
pos = -1;
|
||||
}
|
||||
}
|
||||
// forward scan
|
||||
for (unsigned int i=0; i<str.size(); i++) { // check if first space is found
|
||||
if ((str[i] == ' ') && (pos == -1)) {
|
||||
pos = i;
|
||||
} else if ((str[i] == '-') || (str[i] == ':')) { // check for '-' or ':'
|
||||
if (pos != -1) {
|
||||
str.erase(pos, i-pos);
|
||||
i = pos;
|
||||
}
|
||||
} else if (str[i] != ' ') { // anything but different than a space leads to a reset of the pos counter
|
||||
pos = -1;
|
||||
}
|
||||
}
|
||||
|
||||
fString = str;
|
||||
}
|
||||
|
||||
@ -152,7 +152,6 @@ class PMsrHandler
|
||||
virtual UInt_t NeededPrecision(Double_t dval, UInt_t precLimit=13);
|
||||
virtual UInt_t LastSignificant(Double_t dval, UInt_t precLimit=6);
|
||||
|
||||
virtual Bool_t ParseDetectorGrouping(TString str, PIntVector &group);
|
||||
virtual void MakeDetectorGroupingString(TString str, PIntVector &group, TString &result, Bool_t includeDetector = true);
|
||||
|
||||
virtual void CheckLegacyLifetimecorrection();
|
||||
|
||||
@ -801,4 +801,29 @@ typedef struct {
|
||||
Double_t alphaEstimateN0; ///< relates the Bkg to N0, i.e. Bkg = alpha*N0
|
||||
} PStartupOptions;
|
||||
|
||||
//-------------------------------------------------------------
|
||||
/**
|
||||
* <p>Helper class which parses list of numbers of the following 3 forms and its combination.
|
||||
* (i) list of integers separted by spaces, e.g. 1 3 7 14
|
||||
* (ii) a range of integers of the form nS-nE, e.g. 13-27 which will generate 13, 14, 15, .., 26, 27
|
||||
* (iii) a sequence of integers of the form nS:nE:nStep, e.g. 10:20:2 which will generate 10, 12, 14, .., 18, 20
|
||||
*/
|
||||
class PStringNumberList {
|
||||
public:
|
||||
PStringNumberList(char *str) { fString = str; }
|
||||
PStringNumberList(string str) { fString = str; }
|
||||
virtual ~PStringNumberList() { fList.clear(); }
|
||||
|
||||
virtual bool Parse(string &errorMsg, bool ignoreFirstToken=false);
|
||||
virtual PUIntVector GetList() { return fList; }
|
||||
|
||||
private:
|
||||
string fString;
|
||||
bool fIsValid;
|
||||
PUIntVector fList;
|
||||
|
||||
virtual bool IsNumber(string &str) { return (str.find_first_not_of("0123456789") == string::npos); }
|
||||
virtual void StripSpaces();
|
||||
};
|
||||
|
||||
#endif // _PMUSR_H_
|
||||
|
||||
@ -37,6 +37,7 @@
|
||||
#endif
|
||||
|
||||
#include "git-revision.h"
|
||||
#include "PMusr.h"
|
||||
#include "PMsr2Data.h"
|
||||
|
||||
#include <algorithm>
|
||||
@ -87,12 +88,17 @@ void msr2data_syntax()
|
||||
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]";
|
||||
cout << endl << "usage 2: msr2data <run1> <run2> <extension> [-o<outputfile>] [new] [data] [[no]header] [nosummary] [global[+[!]]]";
|
||||
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]";
|
||||
cout << endl << "usage 3: msr2data \\[<run1> <run2> ... <runN>\\] <extension> [-o<outputfile> ] [new] [data] [[no]header] [nosummary] [global[+[!]]]";
|
||||
cout << endl << "usage 3: msr2data \\[<runList>\\] <extension> [-o<outputfile> ] [new] [data] [[no]header] [nosummary] [global[+[!]]]";
|
||||
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]";
|
||||
cout << endl << "usage 4: msr2data <runlist> <extension> [-o<outputfile>] [new] [data] [[no]header] [nosummary] [global[+[!]]]";
|
||||
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]";
|
||||
cout << endl;
|
||||
cout << endl << " <run>, <run1>, <run2>, ... <runN> : run numbers";
|
||||
cout << endl << " <runList> can be:";
|
||||
cout << endl << " (i) <run0>, <run1>, <run2>, ... <runN> : run numbers, e.g. 123 124";
|
||||
cout << endl << " (ii) <run0>-<runN> : a range, e.g. 123-125 -> 123 124 125";
|
||||
cout << endl << " (iii) <run0>:<runN>:<step> : a sequence, e.g. 123:127:2 -> 123 125 127";
|
||||
cout << endl << " <step> will give the step width and has to be a positive number!";
|
||||
cout << endl << " a <runList> can also combine (i)-(iii), e.g. 123 128-130 133, etc.";
|
||||
cout << endl << " <extension> : msr-file extension, e.g. _tf_h13 for the file name 8472_tf_h13.msr";
|
||||
cout << endl << " -o<outputfile> : specify the name of the DB or column-data output file; default: out.db/out.dat";
|
||||
cout << endl << " if the option '-o none' is used, no output file will be written.";
|
||||
@ -125,9 +131,27 @@ void msr2data_syntax()
|
||||
cout << endl << " from this pre-analysis for each run---they are not just copied from the template.";
|
||||
cout << endl << " The specification of '!' determines which fit mode (see above) is used for this pre-analysis.";
|
||||
cout << endl;
|
||||
cout << endl << " Typical examples:";
|
||||
cout << endl;
|
||||
cout << endl << " msr2data 2047 2050 _tf_histo fit-2046";
|
||||
cout << endl << " will use 2046_tf_histo.msr as templete, and subsequently generating 2047_tf_histo.msr until";
|
||||
cout << endl << " 2050_tf_histo.msr and fit them.";
|
||||
cout << endl;
|
||||
cout << endl << " msr2data 2047 2050 _tf_histo msr-2046";
|
||||
cout << endl << " will use 2046_tf_histo.msr as templete, and subsequently generating 2047_tf_histo.msr until";
|
||||
cout << endl << " 2050_tf_histo.msr, but NO fitting will be done.";
|
||||
cout << endl;
|
||||
cout << endl << " msr2data 2046 2050 _tf_histo -o fitParam.db";
|
||||
cout << endl << " will collect the fit parameters from runs 2046-2050 (msr-files 2046_tf_histo.msr etc.) and";
|
||||
cout << endl << " write them to the file fitParam.db (DB-format).";
|
||||
cout << endl;
|
||||
cout << endl << " msr2data [2047:2053:2 2056] _tf_histo fit-2045";
|
||||
cout << endl << " will use 2045_tf_histo.msr as templete, and subsequently generating msr-files from the run-list:";
|
||||
cout << endl << " 2047 2049 2051 2053 2056 (2047_tf_histo.msr etc.) and fit them.";
|
||||
cout << endl;
|
||||
cout << endl << " For further information please refer to";
|
||||
cout << endl << " https://intranet.psi.ch/MUSR/Msr2Data";
|
||||
cout << endl << " http://lmu.web.psi.ch/facilities/software/musrfit/user/intranet.psi.ch/MUSR/Msr2Data.html";
|
||||
cout << endl << " http://lmu.web.psi.ch/musrfit/user/MUSR/Msr2Data.html";
|
||||
cout << endl << " https://intranet.psi.ch/MUSR/Msr2Data";
|
||||
cout << endl << endl;
|
||||
}
|
||||
|
||||
@ -449,8 +473,26 @@ int main(int argc, char *argv[])
|
||||
return 0;
|
||||
}
|
||||
|
||||
for (unsigned int i(firstRunNumberInArg); i<=lastRunNumberInArg; ++i)
|
||||
run_vec.push_back(boost::lexical_cast<unsigned int>(arg[i]));
|
||||
// generate run_list string
|
||||
for (unsigned int i(firstRunNumberInArg); i<=lastRunNumberInArg; ++i) {
|
||||
run_list += arg[i] + " ";
|
||||
}
|
||||
// parse run_list string
|
||||
PStringNumberList *nl = new PStringNumberList(run_list);
|
||||
if (nl == 0) { // couldn't invoke object
|
||||
cerr << endl;
|
||||
cerr << ">> msr2data: **ERROR** Couldn't invoke run_list parser object! Quitting now." << endl;
|
||||
return 0;
|
||||
}
|
||||
string errorMsg("");
|
||||
if (!nl->Parse(errorMsg)) {
|
||||
cerr << endl;
|
||||
cerr << ">> msr2data: " << errorMsg << " - Quitting now." << endl;
|
||||
return 0;
|
||||
}
|
||||
// get run list vector
|
||||
run_vec = nl->GetList();
|
||||
delete nl;
|
||||
|
||||
msrExtension = arg[rightbracket + 1];
|
||||
|
||||
|
||||
@ -28,6 +28,7 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <iostream>
|
||||
#include <string>
|
||||
using namespace std;
|
||||
|
||||
#include <QTextEdit>
|
||||
@ -679,42 +680,6 @@ void PTextEdit::doConnections( PSubTextEdit *e )
|
||||
connect( e, SIGNAL( cursorPositionChanged() ), this, SLOT( currentCursorPosition() ));
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Validates a given runlist.
|
||||
*
|
||||
* \param runList run list string which should be a space separated list of run numbers.
|
||||
*/
|
||||
bool PTextEdit::validRunList(const QString runList)
|
||||
{
|
||||
bool success = true;
|
||||
|
||||
int i = 0;
|
||||
QString subStr;
|
||||
bool done = false;
|
||||
int val = 0;
|
||||
bool ok;
|
||||
while (!done) {
|
||||
subStr = runList.section(' ', i, i, QString::SectionSkipEmpty);
|
||||
if (subStr.isEmpty()) {
|
||||
done = true;
|
||||
continue;
|
||||
}
|
||||
i++;
|
||||
val = subStr.toInt(&ok);
|
||||
if (!ok) {
|
||||
done = true;
|
||||
success = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == 0) { // no token found
|
||||
success = false;
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Start the dialog to enter a msr-file title. See also https://intranet.psi.ch/MUSR/MusrFit#4_1_The_Title
|
||||
@ -1892,12 +1857,6 @@ void PTextEdit::musrMsr2Data()
|
||||
break;
|
||||
case 1: // run list
|
||||
runList = fMsr2DataParam->runList;
|
||||
if (!validRunList(runList)) {
|
||||
QMessageBox::critical(this, "**ERROR**",
|
||||
"Invalid Run List!\nThe run list needs to be a space separated list of run numbers.",
|
||||
QMessageBox::Ok, QMessageBox::NoButton);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 2: // run list file name
|
||||
runListFileName = fMsr2DataParam->runListFileName;
|
||||
|
||||
@ -77,7 +77,6 @@ private:
|
||||
void load( const QString &f, const int index=-1 );
|
||||
PSubTextEdit *currentEditor() const;
|
||||
void doConnections( PSubTextEdit *e );
|
||||
bool validRunList(const QString runList);
|
||||
void fileSystemWatcherActivation();
|
||||
|
||||
private slots:
|
||||
|
||||
@ -493,40 +493,6 @@ void PTextEdit::doConnections( PSubTextEdit *e )
|
||||
connect( e, SIGNAL( cursorPositionChanged(int, int) ), this, SLOT( currentCursorPosition(int, int) ));
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>
|
||||
*/
|
||||
bool PTextEdit::validRunList(const QString runList)
|
||||
{
|
||||
bool success = true;
|
||||
|
||||
int i = 0;
|
||||
QString subStr;
|
||||
bool done = false;
|
||||
int val;
|
||||
bool ok;
|
||||
while (!done) {
|
||||
subStr = runList.section(' ', i, i, QString::SectionSkipEmpty);
|
||||
if (subStr.isEmpty()) {
|
||||
done = true;
|
||||
continue;
|
||||
}
|
||||
i++;
|
||||
val = subStr.toInt(&ok);
|
||||
if (!ok) {
|
||||
done = true;
|
||||
success = false;
|
||||
}
|
||||
}
|
||||
|
||||
if (i == 0) { // no token found
|
||||
success = false;
|
||||
}
|
||||
|
||||
return success;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>
|
||||
@ -1500,12 +1466,6 @@ void PTextEdit::musrMsr2Data()
|
||||
break;
|
||||
case 1: // run list
|
||||
runList = fMsr2DataParam->runList;
|
||||
if (!validRunList(runList)) {
|
||||
QMessageBox::critical(this, "**ERROR**",
|
||||
"Invalid Run List!\nThe run list needs to be a space separated list of run numbers.",
|
||||
QMessageBox::Ok, QMessageBox::NoButton);
|
||||
return;
|
||||
}
|
||||
break;
|
||||
case 2: // run list file name
|
||||
runListFileName = fMsr2DataParam->runListFileName;
|
||||
|
||||
@ -64,7 +64,6 @@ private:
|
||||
void load( const QString &f, const int index=-1 );
|
||||
PSubTextEdit *currentEditor() const;
|
||||
void doConnections( PSubTextEdit *e );
|
||||
bool validRunList(const QString runList);
|
||||
|
||||
private slots:
|
||||
void fileNew();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user