merging master with root6 branch
This commit is contained in:
commit
8a371e1b6e
@ -4,10 +4,17 @@
|
||||
|
||||
changes since 0.13.0
|
||||
===================================
|
||||
NEW 2015-02-20 add a switch to musrview that it plots initially the Fouier data rather
|
||||
than the time domain data.
|
||||
NEW 2015-02-19 added a first preliminary user interface for musrFT within musredit.
|
||||
NEW 2015-02-16 changed the data export handling from musrview. It is now more
|
||||
main line and follows the implementation of musrFT.
|
||||
NEW 2015-02-13 first implementation of a standalone Fourier transform/plotter:
|
||||
musrFT. Initially it is meant to be used for HAL-9500,
|
||||
i.e. Fourier transform WITHOUT lifetime correction.
|
||||
A first simple minded lifetime correction is implemented as well.
|
||||
NEW 2015-02-04 Integration of libBNMR for fitting beta-NMR relaxation data
|
||||
into automake of musrfit.
|
||||
NEW 2015-01-17 adding a branch for ROOT 6.x. This needs some minor adaptations due
|
||||
to the new rootcint/rootclang and the stricter c++11.
|
||||
NEW 2014-12-18 first implementation of a GLOBAL block which allows to shorten
|
||||
|
||||
27
configure.ac
27
configure.ac
@ -1,7 +1,7 @@
|
||||
AC_REVISION([m4_esyscmd_s([git describe --always])])
|
||||
|
||||
AC_PREREQ(2.63)
|
||||
AC_INIT([musrfit],[0.13.0],[andreas.suter@psi.ch])
|
||||
AC_INIT([musrfit],[0.14.0],[andreas.suter@psi.ch])
|
||||
AC_CONFIG_AUX_DIR(admin)
|
||||
AC_CANONICAL_HOST
|
||||
#AC_MSG_RESULT([${host} ${host_cpu} ${host_vendor} ${host_os}])
|
||||
@ -35,7 +35,7 @@ dnl -----------------------------------------------
|
||||
|
||||
#release versioning
|
||||
MUSR_MAJOR_VERSION=0
|
||||
MUSR_MINOR_VERSION=13
|
||||
MUSR_MINOR_VERSION=14
|
||||
MUSR_MICRO_VERSION=0
|
||||
|
||||
#release versioning
|
||||
@ -733,6 +733,12 @@ dnl -----------------------------------------------
|
||||
|
||||
AC_ARG_ENABLE([ASlibs], [AS_HELP_STRING([--enable-ASlibs],[build optional AS plug-ins [default=no]])],[BUILD_AS_LIBS=1], [BUILD_AS_LIBS=0])
|
||||
|
||||
dnl -----------------------------------------------
|
||||
dnl Ask user if BNMRlibs should be built
|
||||
dnl -----------------------------------------------
|
||||
|
||||
AC_ARG_ENABLE([BNMRlibs], [AS_HELP_STRING([--enable-BNMRlibs],[build optional BNMR plug-ins [default=no]])],[BUILD_BNMR_LIBS=1], [BUILD_BNMR_LIBS=0])
|
||||
|
||||
dnl -----------------------------------------------
|
||||
dnl Set some paths and flags for PMusr, MusrRoot, TLemRunHeader, Class_MuSR_PSI, mud, NeXus (if enabled), etc.
|
||||
dnl -----------------------------------------------
|
||||
@ -780,6 +786,14 @@ if test "${PNEXUS_ENABLED}" = "1"; then
|
||||
AC_SUBST(PNEXUS_CXXFLAGS)
|
||||
fi
|
||||
|
||||
if test "${BUILD_BNMR_LIBS}" = "1"; then
|
||||
BNMRLIBS_SRCDIR="${SRCDIR}/external/libBNMR"
|
||||
BNMRLIBS_LIBS="${BNMRLIBS_SRCDIR}/libBNMR.la"
|
||||
BNMRLIBS_CFLAGS="-I${BNMRLIBS_SRCDIR}"
|
||||
AC_SUBST(BNMRLIBS_LIBS)
|
||||
AC_SUBST(BNMRLIBS_CFLAGS)
|
||||
fi
|
||||
|
||||
if test "${BUILD_BMW_LIBS}" = "1"; then
|
||||
BMWTOOLS_SRCDIR="${SRCDIR}/external/BMWtools"
|
||||
BMWTOOLS_LIBS="${BMWTOOLS_SRCDIR}/libBMWtools.la"
|
||||
@ -1114,6 +1128,7 @@ AM_CONDITIONAL([PNEXUS_ENABLED], [test "${PNEXUS_ENABLED}" = "1"])
|
||||
AM_CONDITIONAL([BUILD_CUBALIB], [test "${BUILD_CUBA}" = "1"])
|
||||
AM_CONDITIONAL([BUILD_BMWLIBS], [test "${BUILD_BMW_LIBS}" = "1"])
|
||||
AM_CONDITIONAL([BUILD_ASLIBS], [test "${BUILD_AS_LIBS}" = "1"])
|
||||
AM_CONDITIONAL([BUILD_BNMRLIBS], [test "${BUILD_BNMR_LIBS}" = "1"])
|
||||
|
||||
AC_CONFIG_FILES([Makefile \
|
||||
src/Makefile \
|
||||
@ -1154,6 +1169,9 @@ AC_CONFIG_FILES([Makefile \
|
||||
src/external/libSpinValve/classes/Makefile \
|
||||
src/external/libPhotoMeissner/Makefile \
|
||||
src/external/libPhotoMeissner/classes/Makefile \
|
||||
src/external/libBNMR/Makefile \
|
||||
src/musredit/Makefile \
|
||||
src/musrgui/Makefile \
|
||||
src/musredit/musredit_startup.xml \
|
||||
src/musrgui/musrgui_startup.xml])
|
||||
|
||||
@ -1273,6 +1291,11 @@ if test "${BUILD_AS_LIBS}" -eq 1; then
|
||||
else
|
||||
echo " ASlibs: no"
|
||||
fi
|
||||
if test "${BUILD_BNMR_LIBS}" -eq 1; then
|
||||
echo " BNMRlibs: yes"
|
||||
else
|
||||
echo " BNMRlibs: no"
|
||||
fi
|
||||
if test "${BUILD_BMW_LIBS}" -eq 1; then
|
||||
echo " BMWlibs: yes"
|
||||
else
|
||||
|
||||
@ -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], Thu, 18 Dec 2014 13:46:44 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:17 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=1418910336" type="application/x-wiki" title="edit BmwLibs" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1424353870" 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" />
|
||||
@ -144,7 +144,7 @@ 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=1418910336' 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=1424353870' 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>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r5 - 10 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -168,7 +168,7 @@ pre {
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=BmwLibs" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -181,12 +181,11 @@ pre {
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/BmwLibs" method="get"> <input type="hidden" name="redirectto" value="/MUSR/BmwLibs?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -195,7 +194,7 @@ pre {
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 18 Dec 2014 13:46:47 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:21 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], Thu, 18 Dec 2014 13:46:34 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:08 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=1418910332" type="application/x-wiki" title="edit CiteMusrFit" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1424353867" 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" />
|
||||
@ -142,7 +142,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=1418910333' 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=1424353867' 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>
|
||||
@ -166,7 +166,7 @@ Since quite some effort is going into the development and maintenance of the <co
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=CiteMusrFit" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -179,12 +179,11 @@ Since quite some effort is going into the development and maintenance of the <co
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/CiteMusrFit" method="get"> <input type="hidden" name="redirectto" value="/MUSR/CiteMusrFit?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -193,7 +192,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], Thu, 18 Dec 2014 13:46:35 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52: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/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 18 Dec 2014 13:46:37 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:10 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=1418910335" type="application/x-wiki" title="edit LibFitPofB" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1424353869" 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" />
|
||||
@ -420,7 +420,7 @@ 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=1418910335' 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=1424353869' 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>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r16 - 10 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -444,7 +444,7 @@ An example XML file looks as follows:
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=LibFitPofB" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -457,12 +457,11 @@ An example XML file looks as follows:
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/LibFitPofB" method="get"> <input type="hidden" name="redirectto" value="/MUSR/LibFitPofB?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -471,7 +470,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], Thu, 18 Dec 2014 13:46:44 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:17 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], Thu, 18 Dec 2014 13:45:53 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:25 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=1418910324" type="application/x-wiki" title="edit LibZFRelaxation" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1424353859" 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" />
|
||||
@ -225,7 +225,7 @@ 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=1418910324' 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=1424353859' 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>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r2 - 10 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -249,7 +249,7 @@ The parameters are: <ol>
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=LibZFRelaxation" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -262,12 +262,11 @@ The parameters are: <ol>
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/LibZFRelaxation" method="get"> <input type="hidden" name="redirectto" value="/MUSR/LibZFRelaxation?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -276,7 +275,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], Thu, 18 Dec 2014 13:45:57 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:30 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], Thu, 18 Dec 2014 13:46:35 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52: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/Msr2Data?t=1418910334" type="application/x-wiki" title="edit Msr2Data" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1424353868" 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" />
|
||||
@ -349,7 +349,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab2816' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1418910334'}">
|
||||
<!-- TAB --><div id='jqTab6401' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.Msr2Data;render=on;1424353868'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -371,7 +371,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/Msr2Data?t=1418910334' 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=1424353868' 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>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r38 - 20 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -395,7 +395,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=Msr2Data" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -408,12 +408,11 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/Msr2Data" method="get"> <input type="hidden" name="redirectto" value="/MUSR/Msr2Data?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -422,7 +421,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], Thu, 18 Dec 2014 13:46:37 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:10 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], Thu, 18 Dec 2014 13:46:12 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:44 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
<head>
|
||||
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
|
||||
@ -8,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=1418910331" type="application/x-wiki" title="edit MusrFit" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1424353866" 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" />
|
||||
@ -124,11 +124,12 @@ pre {
|
||||
</li> <li> <a href="MusrFit.html#A_2_Available_Executables_44_Configuration_Files_and_their_Basic_Usage"> 2 Available Executables, Configuration Files and their Basic Usage </a> <ul>
|
||||
<li> <a href="MusrFit.html#A_2.1_musrfit"> 2.1 musrfit </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.2_musrview"> 2.2 musrview </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.3_musrt0"> 2.3 musrt0 </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.4_musrfit_startup.xml"> 2.4 musrfit_startup.xml </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.5_msr2msr"> 2.5 msr2msr </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.6_any2many"> 2.6 any2many </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.7_dump_header"> 2.7 dump_header </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.3_musrFT"> 2.3 musrFT <img src="../pub/System/DocumentGraphics/new.png" alt="NEW" title="NEW" width="30" height="16" /> </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.4_musrt0"> 2.4 musrt0 </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.5_musrfit_startup.xml"> 2.5 musrfit_startup.xml </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.6_msr2msr"> 2.6 msr2msr </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.7_any2many"> 2.7 any2many </a>
|
||||
</li> <li> <a href="MusrFit.html#A_2.8_dump_header"> 2.8 dump_header </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrFit.html#A_3_Auxiliary_Programs"> 3 Auxiliary Programs </a>
|
||||
</li> <li> <a href="MusrFit.html#A_4_Description_of_the_msr_File_Format"> 4 Description of the msr File Format </a> <ul>
|
||||
@ -210,7 +211,7 @@ In the menu bar the <strong>Musrfit</strong> menu can be found. From there some
|
||||
<dt> Fourier </dt><dd> performs the Fourier transformation of the selected data and shows the result
|
||||
</dd> <dt> Difference </dt><dd> shows the difference between the selected data and the fit
|
||||
</dd> <dt> Average </dt><dd> toggle between the current view and the averaged data view. Useful if the averaged Fourier power spectrum of lots of detectors shall be shown.
|
||||
</dd> <dt> Save Data </dt><dd> saves the selected data in a simple multi-column ASCII file
|
||||
</dd> <dt> Export Data </dt><dd> saves the selected data in a simple multi-column ASCII file
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Additionally, some functions can be accessed using key-shortcuts: <dl>
|
||||
@ -221,8 +222,56 @@ Additionally, some functions can be accessed using key-shortcuts: <dl>
|
||||
</dd> <dt> u </dt><dd> reset the plotting range to the area given in the msr file ("unzoom")
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
<a name="MusrFT"></a>
|
||||
<h2><a name="A_2.3_musrFT"></a> 2.3 musrFT <img src="../pub/System/DocumentGraphics/new.png" alt="NEW" title="NEW" width="30" height="16" /> </h2>
|
||||
<code>musrFT</code> is an interactive graphical user interface for the presentation of Fourier transforms of raw μSR histograms. It's purpose is to get a quick overview for high TF-field data, as found e.g. at the HAL-9500 instrument at PSI. It Fourier transforms the raw histogram data, i.e. N(t) rather than A(t), and hence shows the lifetime contribution of the muon. This is no problem for large enough fields, but will be a severe problem at very low fields. <code>musrFT</code> is still in its early stage and should be considered a <strong>beta-version</strong>.
|
||||
<p></p>
|
||||
If called from within a shell it accepts the following parameters: <dl>
|
||||
<dt> <msr_files> </dt><dd> msr-file name(s). These msr-files are used for the Fourier transform. It can be a list of msr-files, e.g. <code>musrFT 3110.msr 3111.msr</code>
|
||||
</dd> <dt> -df, --data-file <data-file> </dt><dd> This allows to feed only μSR data file(s) to perform the Fourier transform. Since the extended <msr-file> information are missing, they will need to be provided by to options, or <code>musrFT</code> tries to guess, based on <code>musrfit_startup.xml</code> settings.
|
||||
</dd> <dt> --help </dt><dd> display a help and exit
|
||||
</dd> <dt> --version </dt><dd> output version information and exit
|
||||
</dd> <dt> -g, --graphic-format <graphic-format-extension> </dt><dd> will produce a graphic-output-file without starting a root session. The name is based either on the <msr-file> or the <data-file>, e.g. 3310.msr -> 3310_0.png. Supported graphic-format-extension: eps, pdf, gif, jpg, png, svg, xpm, root
|
||||
</dd> <dt> --dump <fln> </dt><dd> rather than starting a root session and showing Fourier graphs of the data, it will output the Fourier data in an ascii file <fln>.
|
||||
</dd> <dt> -br, --background-range <start> <end> </dt><dd> background interval used to estimate the background to be subtracted before the Fourier transform. <start>, <end> to be given in bins.
|
||||
</dd> <dt> -bg, --background <list> </dt><dd> gives the background explicit for each histogram.
|
||||
</dd> <dt> -fo, --fourier-option <fopt> </dt><dd> <fopt> can be 'real', 'imag', 'real+imag', 'power', or 'phase'. If this is not defined (neither on the command line nor in the <code>musrfit_startup.xml</code>). Default will be 'power'.
|
||||
</dd> <dt> -ap, --apodization <val> </dt><dd> <val> can be either 'none', 'weak', 'medium', 'strong'. Default will be 'none'.
|
||||
</dd> <dt> -fp, --fourier-power <N> </dt><dd> <N> being the Fourier power, i.e. 2^<N> used for zero padding. Default is -1, i.e. no zero padding will be performed.
|
||||
</dd> <dt> -u, --units <units> </dt><dd> <units> is used to define the x-axis of the Fourier transform. One may choose between the fields (Gauss) or (Tesla), the frequency (MHz), and the angular-frequency domain (Mc/s). Default will be 'MHz'.
|
||||
</dd> <dt> -ph, --phase <val> </dt><dd> defines the initial phase <val>. This only is of concern for 'real', 'imag', and 'real+imag'. Default will be 0.0.
|
||||
</dd> <dt> -fr, --fourier-range <start> <end> </dt><dd> Fourier range. <start>, <end> are interpreted in the units given. Default will be -1.0 for both which means, take the full Fourier range.
|
||||
</dd> <dt> -tr, --time-range <start> <end> </dt><dd> time domain range to be used for Fourier transform. <start>, <end> are to be given in (μsec). If nothing is given, the full time range found in the data file(s) will be used.
|
||||
</dd> <dt> --histo <list> </dt><dd> give the <list> of histograms to be used for the Fourier transform. E.g. <code>musrFT -df lem15_his_01234.root --histo 1 3</code>, will only be needed together with the option <code>--data-file</code>. If multiple data file are given, <list> will apply to all data-files given. If <code>--histo</code> is not given, all histos of a data file will be used. <list> can be anything like: 2 3 6, or 2-17, or 1-6 9, etc.
|
||||
</dd> <dt> -a, --average </dt><dd> show the average of all Fourier transformed data.
|
||||
</dd> <dt> --t0 <list> </dt><dd> A list of t0's can be provided. This in conjunction with <code>--data-file</code> and <code>--fourier-option</code> real allows to get the proper initial phase if t0's are known. If a single t0 for multiple histos is given, it is assume, that this t0 is common to all histos. <strong>Example</strong>: <code>musrFT -df lem15_his_01234.root -fo real --t0 2750 --histo 1 3</code>.
|
||||
</dd> <dt> -pa, --packing <N> </dt><dd> if <N> (an integer), the time domain data will first be packed/rebinned by <N>.
|
||||
</dd> <dt> --title <title> </dt><dd> give a global title for the plot.
|
||||
</dd> <dt> --create-msr-file <fln> </dt><dd> creates a msr-file based on the command line options provided. This will help on the way to a full fitting model.
|
||||
</dd> <dt> -lc, --lifetimecorrection <fudge> </dt><dd> try to eliminate muon life time decay. Only makes sense for low transverse fields. <fudge> is a tweaking factor (scaling factor for the estimated t0) and should be kept around 1.0.
|
||||
</dd> <dt> --timeout <timeout> </dt><dd> <timeout> given in seconds after which musrFT terminates. If <timeout> <= 0, no timeout will take place. Default <timeout> is 3600 sec.
|
||||
</dd></dl>
|
||||
<p></p> <dl>
|
||||
<dt> Example 1 </dt><dd> <pre class=bash>musrFT -df tdc_hifi_2014_00153.mdu --title "MnSi" -tr 0 10 -fr 7.0 7.6 -u Tesla --histo 2-17 -a</pre> will take time range from t=0..10μsec, will show the Fourier transform in units of Tesla from B=7.0..7.6 Tesla of the detectors 2-17. Rather than showing the 16 individual Fourier transforms, the average of all Fourier spectra will be shown. t0's will be guessed by the maximum of the time domain histogram (assuming a prompt peak).
|
||||
</dd> <dt> Example 2 </dt><dd> <pre class=bash>musrFT -df tdc_hifi_2014_00153.mdu -tr 0 10 -fr 7.0 7.6 -u Tesla --histo 2-17 --title "MnSi average, T=50K, B=7.5T" -a -g pdf</pre> as <strong>Example 1</strong> but rather than showing an interactive GUI, the output will be dumped into a pdf-file. The file name will be <code>tdc_hifi_2014_00153.pdf</code>.
|
||||
</dd> <dt> Example 3 </dt><dd> <pre class=bash>musrFT -df tdc_hifi_2014_00153.mdu -tr 0 10 -fr 7.0 7.6 -u Tesla --histo 2-17 --title "MnSi average, T=50K, B=7.5T" -a --dump MnSi.dat</pre> as <strong>Example 1</strong> but rather than showing an interactive GUI, the output will be dumped into the ascii file <code>MnSi.dat</code>.
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Within the drawn canvas all standard actions applicable to <code>ROOT</code> canvases might be performed.
|
||||
In the menu bar the <strong>MusrFT</strong> menu can be found. From there some <code>musrFT</code>-specific actions might be taken: <dl>
|
||||
<dt> Fourier </dt><dd> allows to switch between different Fourier transform representations 'Power', 'Real', ...
|
||||
</dd> <dt> Average </dt><dd> toggle between the current view and the averaged data view.
|
||||
</dd> <dt> Export Data </dt><dd> saves the selected data in a simple multi-column ASCII file
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
Additionally, some functions can be accessed using key-shortcuts: <dl>
|
||||
<dt> q </dt><dd> quits <code>musrFT</code>
|
||||
</dd> <dt> a </dt><dd> toggle between average of the presented data and single Fourier histos, e.g. the averaged Fourier power spectra of various detectors.
|
||||
</dd> <dt> u </dt><dd> reset the plotting range to the area given in the msr-file or the form the command line ("unzoom")
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
<a name="MusrT0"></a>
|
||||
<h2><a name="A_2.3_musrt0"></a> 2.3 musrt0 </h2>
|
||||
<h2><a name="A_2.4_musrt0"></a> 2.4 musrt0 </h2>
|
||||
<code>musrt0</code> is a user interface for the determination of <strong>t0</strong> and the time windows of <strong>data</strong> and <strong>background</strong> needed to be specified in the <a href="#TheRunBlock" class="foswikiCurrentTopicLink">RUN blocks</a> of the msr file. It can be operated either as an interactive program or in a non-interactive mode. In the non-interactive mode it accepts the following parameters: <dl>
|
||||
<dt> <msr_file> </dt><dd> name of an msr file
|
||||
</dd> <dt> -g, --getT0FromPromptPeak [<firstGoodBinOffset>] </dt><dd> tries to estimate <strong>t0</strong> from the <em>prompt peak</em> (maximum entry) in each histogram and writes the corresponding values to the <a href="#TimeZero" class="foswikiCurrentTopicLink">t0 lines</a> in the <a href="#TheRunBlock" class="foswikiCurrentTopicLink">RUN blocks</a> of the msr file. If an optional number <strong><firstGoodBinOffset></strong> is given, the lower limit of the <a href="#DataRange" class="foswikiCurrentTopicLink"><b>data</b> range</a> will be set to <strong>t0 + <firstGoodBinOffset></strong>.
|
||||
@ -253,7 +302,7 @@ Using the key <strong>Q</strong>, <code>musrt0</code> can be interrupted. No cha
|
||||
Closing a window by clicking the <strong>X</strong> button is equivalent to pressing <strong>Q</strong>, i.e. <code>musrt0</code> is simply terminated.
|
||||
<p></p>
|
||||
<a name="MusrfitStartupXml"></a>
|
||||
<h2><a name="A_2.4_musrfit_startup.xml"></a> 2.4 musrfit_startup.xml </h2>
|
||||
<h2><a name="A_2.5_musrfit_startup.xml"></a> 2.5 musrfit_startup.xml </h2>
|
||||
<code><b>musrfit_startup.xml</b></code> is a configuration file located at the <code>musrfit</code> binary path. In this file the following XML tags are allowed to define settings: <dl>
|
||||
<dt> <data_path>PATH_TO_DATA</data_path> </dt><dd> add the new path <strong>PATH_TO_DATA</strong> where <code>musrfit</code> and <code>musrview</code> will search for data files
|
||||
</dd> <dt> <write_per_run_block_chisq><b>y/n</b></write_per_run_block_chisq> </dt><dd> if enabled χ<sup>2</sup> for each RUN block will be written to the <a href="#TheStatisticBlock" class="foswikiCurrentTopicLink">STATISTIC block</a> of the resulting <code>msr</code> file. Additionally, in case a χ<sup>2</sup> <a href="#SingleHistogramFit" class="foswikiCurrentTopicLink">single-histogram fit</a> is done, also <a href="http://en.wikipedia.org/wiki/Pearson's_chi-square_test" target="_top">Pearson's χ<sup>2</sup></a> will be added.
|
||||
@ -309,7 +358,7 @@ An example would look like:
|
||||
</pre>
|
||||
<p></p>
|
||||
<a name="Msr2Msr"></a>
|
||||
<h2><a name="A_2.5_msr2msr"></a> 2.5 msr2msr </h2>
|
||||
<h2><a name="A_2.6_msr2msr"></a> 2.6 msr2msr </h2>
|
||||
<code>msr2msr</code> is a small utility for converting existing <code>WKM</code> msr files into <code>musrfit</code> msr files. It accepts the following parameters: <dl>
|
||||
<dt> <msr_file_in> </dt><dd> input <code>WKM</code> msr file (mandatory first parameter)
|
||||
</dd> <dt> <msr_file_out> </dt><dd> converted output <code>musrfit</code> msr file (mandatory second parameter)
|
||||
@ -321,7 +370,7 @@ A typical example then looks like:
|
||||
If the input file has already the <code>musrfit</code> msr file structure, the output file will be just a copy of the input file.
|
||||
<p></p>
|
||||
<a name="Any2Many"></a>
|
||||
<h2><a name="A_2.6_any2many"></a> 2.6 any2many </h2>
|
||||
<h2><a name="A_2.7_any2many"></a> 2.7 any2many </h2>
|
||||
<code>any2many</code> is a muSR data file converter. Currently different facilities (PSI, TRIUMF, ISIS, J-PARC) are saving their muSR data files in different formats, or even worse some instruments are using other muSR data formats than others. The aim of <code>any2many</code> is that these files can be converted into each other. Of course only a subset of header information can be converted.
|
||||
<p></p>
|
||||
Currently <code>any2many</code> can convert the following muSR data file formats: <ul>
|
||||
@ -367,7 +416,7 @@ Will take the runs 100 through 117 and convert the <code>NeXus</code> input file
|
||||
Will read the two files <code>'2010/lem10_his_0123.root'</code> and <code>'2010/lem10_his_0012.root'</code>, rebin them with 25 and export them as <code>LEM ROOT</code> files with adding <code>rebin25</code> to the name, e.g. <code>2010/lem10_his_0123_rebin25.root</code>.
|
||||
<p></p>
|
||||
<a name="DumpHeader"></a>
|
||||
<h2><a name="A_2.7_dump_header"></a> 2.7 dump_header </h2>
|
||||
<h2><a name="A_2.8_dump_header"></a> 2.8 dump_header </h2>
|
||||
<code>dump_header</code> is a little program which tries to read a μSR data file and sends the relevant information (required header info, start of the histos, etc.) to the standard output. Currently the following μSR data file formats are supported: <code>MusrROOT</code>, <code>ROOT</code> (old LEM format), <code>PSI-BIN</code>, <code>PSI-MDU</code>, <code>NeXus</code> (IDF1 and IDF2), <code>MUD</code>, and <code>WKM</code>.
|
||||
<p></p>
|
||||
<a name="AuxiliaryPrograms"></a>
|
||||
@ -1540,20 +1589,8 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab7232' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrFit;render=on;1418910331'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
</div></div><!-- //ENDTAB --><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
<!-- --><!-- --><!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
</div><!-- //ENDTABPANE -->
|
||||
</div>
|
||||
@ -1562,9 +1599,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/MusrFit?t=1418910331' 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>: r117 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=116;rev2=117"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=116">r116</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=115;rev2=116"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=115">r115</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=114;rev2=115"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=114">r114</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=117&currrev=117' 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=1424353866' 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>: r123 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=122;rev2=123"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=122">r122</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=121;rev2=122"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=121">r121</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrFit?rev1=120;rev2=121"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrFit?rev=120">r120</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=123&currrev=123' 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: r117 - 18 Dec 2014, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r123 - 19 Feb 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">
|
||||
@ -1586,7 +1623,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=MusrFit" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -1599,12 +1636,11 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFit" method="get"> <input type="hidden" name="redirectto" value="/MUSR/MusrFit?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -1613,7 +1649,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], Thu, 18 Dec 2014 13:46:34 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:08 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], Thu, 18 Dec 2014 13:46:11 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:43 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=1418910330" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1424353864" 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" />
|
||||
@ -142,7 +142,7 @@ 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=1418910330' 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=1424353865' 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>
|
||||
</div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r4 - 10 Jul 2011, wojek</span></div>
|
||||
</div>
|
||||
@ -166,7 +166,7 @@ pre {
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=MusrFitAcknowledgements" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -179,12 +179,11 @@ pre {
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitAcknowledgements" method="get"> <input type="hidden" name="redirectto" value="/MUSR/MusrFitAcknowledgements?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -193,7 +192,7 @@ pre {
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 18 Dec 2014 13:46:12 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:44 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], Thu, 18 Dec 2014 13:46:09 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51: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/MusrFitSetup?t=1418910329" type="application/x-wiki" title="edit MusrFitSetup" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1424353863" 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" />
|
||||
@ -846,7 +846,7 @@ 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=1418910329' 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=1424353863' 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>
|
||||
</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>
|
||||
@ -870,7 +870,7 @@ musrview test-histo-ROOT-NPP.msr
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=MusrFitSetup" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -883,12 +883,11 @@ musrview test-histo-ROOT-NPP.msr
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrFitSetup" method="get"> <input type="hidden" name="redirectto" value="/MUSR/MusrFitSetup?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -897,7 +896,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], Thu, 18 Dec 2014 13:46:11 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:43 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], Thu, 18 Dec 2014 13:46:06 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:38 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=1418910327" type="application/x-wiki" title="edit MusrGui" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1424353862" 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" />
|
||||
@ -116,14 +116,14 @@ pre {
|
||||
<p></p>
|
||||
<p></p>
|
||||
</div><div class="patternContent"><div class="foswikiTopic">
|
||||
<h1><a name="A_61_61musrgui_47_musredit_61_61"></a> <code><b>musrgui / musredit</b></code> </h1>
|
||||
<h1><a name="A_61_61musredit_47_40musrgui_41_61_61"></a> <code><b>musredit / (musrgui)</b></code> </h1>
|
||||
<p></p>
|
||||
<a name="foswikiTOC"></a><div class="foswikiToc"> <ul>
|
||||
<li> <a href="MusrGui.html#A_61_61musrgui_47_musredit_61_61"> musrgui / musredit </a>
|
||||
<li> <a href="MusrGui.html#A_61_61musredit_47_40musrgui_41_61_61"> musredit / (musrgui) </a>
|
||||
</li> <li> <a href="MusrGui.html#A_1_Introduction"> 1 Introduction </a>
|
||||
</li> <li> <a href="MusrGui.html#A_2_Available_Executables_44_Configuration_Files_and_their_Basic_Usage"> 2 Available Executables, Configuration Files and their Basic Usage </a> <ul>
|
||||
<li> <a href="MusrGui.html#A_2.1_musrgui_47_musredit"> 2.1 musrgui / musredit </a>
|
||||
</li> <li> <a href="MusrGui.html#A_2.2_musrgui_startup.xml_47_musredit_startup.xml"> 2.2 musrgui_startup.xml / musredit_startup.xml </a>
|
||||
<li> <a href="MusrGui.html#A_2.1_musredit_47_40musrgui_41"> 2.1 musredit / (musrgui) </a>
|
||||
</li> <li> <a href="MusrGui.html#A_2.2_musredit_startup.xml_47_musrgui_startup.xml"> 2.2 musredit_startup.xml / musrgui_startup.xml </a>
|
||||
</li></ul>
|
||||
</li> <li> <a href="MusrGui.html#A_3_61_61musrfit_61_61_Features"> 3 musrfit Features </a>
|
||||
</li> <li> <a href="MusrGui.html#A_4_Editor_Features"> 4 Editor Features </a>
|
||||
@ -132,14 +132,14 @@ pre {
|
||||
</div>
|
||||
<p></p>
|
||||
<h1><a name="A_1_Introduction"></a> 1 Introduction </h1>
|
||||
<code>musrgui</code> and <code>musredit</code> are editors which also provide a graphical user interface to the programs contained in the <code><a href="MusrFit.html">musrfit</a></code> suite and are intended to help the user handle <code>musrfit</code> msr files. They are implemented in <code>C++</code> and use the <a href="http://qt.nokia.com/" target="_top">Qt</a> framework. Principally, <code>musrgui</code> and <code>musredit</code> are doing the same, but are based on different Qt versions. <code>musrgui</code> is based on Qt 3.x and will only be maintained on bug-fixing level since the Qt 3.x licensing is less straight forward than the Qt 4.x one. <code>musredit</code> is based on Qt 4.6 (or above) and this is the program which will be developed further.<br>
|
||||
<code>musredit</code> and <code>musrgui</code> are editors which also provide a graphical user interface to the programs contained in the <code><a href="MusrFit.html">musrfit</a></code> suite and are intended to help the user handle <code>musrfit</code> msr files. They are implemented in <code>C++</code> and use the <a href="http://qt.nokia.com/" target="_top">Qt</a> framework. Principally, <code>musrgui</code> and <code>musredit</code> are doing the same, but are based on different Qt versions. <code>musrgui</code> is based on Qt 3.x and will only be maintained on bug-fixing level since the Qt 3.x licensing is less straight forward than the Qt 4.x one. <code>musredit</code> is based on Qt 4.6 (or above) and this is the program which will be developed further.<br>
|
||||
On this documentation page only the features related to <code>musrfit</code> are described—the basic editor functions which should be self-explanatory are not.
|
||||
<strong><span class='foswikiRedFG'>Before going on using <code>musrgui</code> / <code>musredit</code> it is strongly recommended to read the <a href="MusrFit.html">manual</a> of <code>musrfit</code> first!</span></strong>
|
||||
<p></p>
|
||||
<h1><a name="A_2_Available_Executables_44_Configuration_Files_and_their_Basic_Usage"></a> 2 Available Executables, Configuration Files and their Basic Usage </h1>
|
||||
<a name="MusrEdit"></a>
|
||||
<h2><a name="A_2.1_musrgui_47_musredit"></a> 2.1 musrgui / musredit </h2>
|
||||
<code>musrgui</code> / <code>musredit</code> are the editor executables. If called from within a shell they accept a few optional parameters: <dl>
|
||||
<h2><a name="A_2.1_musredit_47_40musrgui_41"></a> 2.1 musredit / (musrgui) </h2>
|
||||
<code>musredit</code> / <code>musrgui</code> are the editor executables. If called from within a shell they accept a few optional parameters: <dl>
|
||||
<dt> <msr_files> </dt><dd> file names of the msr files that should be opened in separate editor tabs on startup of <code>musrgui</code> / <code>musredit</code>.
|
||||
</dd> <dt> --help </dt><dd> displays a small help notice in the shell explaining the basic usage of the program
|
||||
</dd> <dt> --version </dt><dd> prints the version number of <code>musrgui</code> / <code>musredit</code>
|
||||
@ -148,10 +148,10 @@ On this documentation page only the features related to <code>musrfit</code> are
|
||||
If called without any parameters an empty editor window opens.
|
||||
<p></p>
|
||||
<a name="MusreditStartupXml"></a>
|
||||
<h2><a name="A_2.2_musrgui_startup.xml_47_musredit_startup.xml"></a> 2.2 musrgui_startup.xml / musredit_startup.xml </h2>
|
||||
<code><b>musrgui_startup.xml</b></code> / <code><b>musredit_startup.xml</b></code> are configuration files located at the <code>musrgui</code> / <code>musredit</code> binary path. It is also possible to have another version of this file in the working directory which then will be used!
|
||||
<h2><a name="A_2.2_musredit_startup.xml_47_musrgui_startup.xml"></a> 2.2 musredit_startup.xml / musrgui_startup.xml </h2>
|
||||
<code><b>musredit_startup.xml</b></code> / <code><b>musrgui_startup.xml</b></code> are configuration files located at the <code>musredit</code> / <code>musrgui</code> binary path. It is also possible to have another version of this file in the working directory which then will be used!
|
||||
<p></p>
|
||||
In this file the following XML tags are allowed to define settings and might proof useful for all users of <code>musrgui</code> / <code>musredit</code>: <dl>
|
||||
In this file the following XML tags are allowed to define settings and might proof useful for all users of <code>musredit</code> / <code>musrgui</code>: <dl>
|
||||
<dt> <general></general> </dt><dd> set the default paths to executables and files in this environment <dl>
|
||||
<dt> <exec_path>PATH_TO_EXEC</exec_path> </dt><dd> set the path <strong>PATH_TO_EXEC</strong> where the executables <code>musrfit</code>, <code>musrview</code>, <code>musrt0</code>, etc. can be found (inside the <general> environment)
|
||||
</dd> <dt> <default_save_path>SAV_PATH</default_save_path> </dt><dd> specify the path <strong>SAV_PATH</strong> where <code>musrgui</code> / <code>musredit</code> point by default when opening and saving msr files (inside the <general> environment)
|
||||
@ -291,6 +291,9 @@ The features of <code>musrfit</code> which can be accessed by the graphical fron
|
||||
<p></p> <dl>
|
||||
<dt> <img alt="musrt0.png" src="../pub/MUSR/MusrGui/musrt0.png" /> T0 (Alt+t) </dt><dd> <pre class="bash">musrt0 <msr_file></pre> is called for the <strong><msr_file></strong> selected in the editor. For further information refer to the <a href="MusrFit.html#MusrT0">manual</a> of <code>musrfit</code>.
|
||||
</dd></dl>
|
||||
<p></p> <dl>
|
||||
<dt> <img alt="musrFT.png" src="../pub/MUSR/MusrGui/musrFT.png" /> Raw Fourier </dt><dd> <code>musrFT <with-many-options></code> is called. For a proper documentation of it, check the <a href="MusrFit.html#MusrFT">manual</a> of <code>musrFT</code>.
|
||||
</dd></dl>
|
||||
<p></p>
|
||||
<a name="MusrPrefs"></a> <dl>
|
||||
<dt> <img alt="musrprefs.png" src="../pub/MUSR/MusrGui/musrprefs.png" /> Preferences (Alt+p) </dt><dd> Opens a window in which the optional parameters that should be passed to <code>musrfit</code> can be chosen. These options are <code><b>--keep-mn2-output</b></code>, <code><b>--dump ascii</b></code>, <code><b>--dump root</b></code>, and <code><b>--title-from-data-file</b></code>. For further information refer to the <a href="MusrFit.html#MusrFit">manual</a> of <code>musrfit</code>. Additionally, the access to <code>musrt0</code> can be enabled temporarily.
|
||||
@ -310,9 +313,9 @@ Besides the functions described above and which are mostly interfacing <code>mus
|
||||
<a name="BugTracking"></a>
|
||||
<h1><a name="A_5_Bugtracking"></a> 5 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" target="_top">Bitbucket Tracker</a>, <a href="https://tracker.psi.ch/jira/browse/MUSR/" target="_top">PSI Tracker</a> (PSI account needed) 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>
|
||||
-- <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><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -324,8 +327,8 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab1194' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrGui;render=on;1418910327'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2>
|
||||
<!-- TAB --><div id='jqTab1490' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrGui;render=on;1424353862'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(1)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
</div></div><!-- //ENDTAB --><!-- -->
|
||||
@ -346,9 +349,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/MusrGui?t=1418910327' 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>: r19 <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> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/MusrGui?rev1=16;rev2=17"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/MusrGui?rev=16">r16</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=19&currrev=19' rel='nofollow' title='Delete or rename this topic; set parent topic; view and compare revisions' accesskey='m'><span class='foswikiAccessKey'>M</span>ore topic actions</a></span></span>
|
||||
<span class="patternActionButtons"><span><a href='https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1424353862' 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: r19 - 25 May 2012, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r20 - 19 Feb 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">
|
||||
@ -370,7 +373,7 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=MusrGui" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -383,12 +386,11 @@ For reporting bugs or requesting new features and improvements please use the <a
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrGui" method="get"> <input type="hidden" name="redirectto" value="/MUSR/MusrGui?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -397,7 +399,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], Thu, 18 Dec 2014 13:46:09 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51: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/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 18 Dec 2014 13:45:37 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:12 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=1418910321" type="application/x-wiki" title="edit MusrRoot" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1424353856" 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" />
|
||||
@ -1038,7 +1038,7 @@ Result in the <code>RunHeader/SampleEnvironmentInfo</code>:
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab3140' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrRoot;render=on;1418910321'}">
|
||||
<!-- TAB --><div id='jqTab1681' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.MusrRoot;render=on;1424353856'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(2)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -1060,7 +1060,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=1418910321' 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=1424353856' 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>
|
||||
@ -1084,7 +1084,7 @@ Result in the <code>RunHeader/SampleEnvironmentInfo</code>:
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=MusrRoot" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -1097,12 +1097,11 @@ Result in the <code>RunHeader/SampleEnvironmentInfo</code>:
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/MusrRoot" method="get"> <input type="hidden" name="redirectto" value="/MUSR/MusrRoot?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -1111,7 +1110,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], Thu, 18 Dec 2014 13:45:53 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:25 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], Thu, 18 Dec 2014 13:46:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:36 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=1418910326" type="application/x-wiki" title="edit QuickStart" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1424353861" 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" />
|
||||
@ -280,7 +280,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=1418910326' 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=1424353861' 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>
|
||||
@ -304,7 +304,7 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=QuickStart" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -317,12 +317,11 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/QuickStart" method="get"> <input type="hidden" name="redirectto" value="/MUSR/QuickStart?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -331,7 +330,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], Thu, 18 Dec 2014 13:46:06 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:38 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], Thu, 18 Dec 2014 13:45:58 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:30 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=1418910325" type="application/x-wiki" title="edit TutorialSingleHisto" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1424353860" 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" />
|
||||
@ -281,7 +281,7 @@ This page only summarizes the very basic features and options of the programs co
|
||||
<!-- -->
|
||||
<!-- --><!-- -->
|
||||
<!-- -->
|
||||
<!-- TAB --><div id='jqTab2338' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.TutorialSingleHisto;render=on;1418910325'}">
|
||||
<!-- TAB --><div id='jqTab9225' class="attachments jqAjaxTab jqTab {url: 'https://intranet.psi.ch/wiki/bin/rest/RenderPlugin/template?name=metadata;expand=attachments;topic=MUSR.TutorialSingleHisto;render=on;1424353860'}">
|
||||
<h2 class='jqTabLabel'>Attachments <span class='foswikiAttachmentsCount'>(6)</span></h2>
|
||||
<div class='jqTabContents' >
|
||||
<div class='foswikiFormSteps foswikiAttachmentsProcess'><span class='jqAjaxLoader'> </span></div>
|
||||
@ -303,7 +303,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=1418910325' 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=1424353860' 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>
|
||||
@ -327,7 +327,7 @@ This page only summarizes the very basic features and options of the programs co
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=TutorialSingleHisto" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -340,12 +340,11 @@ This page only summarizes the very basic features and options of the programs co
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/TutorialSingleHisto" method="get"> <input type="hidden" name="redirectto" value="/MUSR/TutorialSingleHisto?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -354,7 +353,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], Thu, 18 Dec 2014 13:46:03 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:51:36 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], Thu, 18 Dec 2014 13:46:47 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:21 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=1418910337" type="application/x-wiki" title="edit WebHome" />
|
||||
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1424353871" 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" />
|
||||
@ -126,7 +126,7 @@ pre {
|
||||
</li> <li> <a href="MusrGui.html">Documentation of <code>musrgui</code>/<code>musredit</code>—editors interfacing <code>musrfit</code> </a>
|
||||
</li> <li> <a href="Msr2Data.html">Documentation of <code>msr2data</code>—a program for automatically processing multiple musrfit <code>msr</code> files</a>
|
||||
</li> <li> <a href="MusrFit.html#Any2Many"><code>any2many</code>—a universal μSR-file-format converter</a>
|
||||
</li> <li> <a href="MusrRoot.html"><code>MusrRoot</code>: an extensible open file format for μSR</a> <img src="../pub/System/DocumentGraphics/new.png" width="30" height="16" alt="New" border="0" />
|
||||
</li> <li> <a href="MusrRoot.html"><code>MusrRoot</code>: an extensible open file format for μSR</a>
|
||||
</li> <li> Documentation of user libs (user functions) <ul>
|
||||
<li> <a href="BmwLibs.html">Meissner-Profiles / Vortex-Lattice related functions (BMW libs)</a>
|
||||
</li> <li> Nonlocal superconductivity related Meissner screening functions (AS libs)
|
||||
@ -134,7 +134,7 @@ pre {
|
||||
</li> <li> <a href="MusrFitAcknowledgements.html">Acknowledgements</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
-- <a href="http://lmu.web.psi.ch/lem/group.html" target="_top">AS</a> & (<a href="http://www.fsf.org/register_form?referrer=8369" target="_top">BMW</a>) - last update Dec 18, 2014 </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 Feb 19, 2015 </div>
|
||||
<div class="foswikiContentFooter"></div><!-- -->
|
||||
<!-- -->
|
||||
<!-- -->
|
||||
@ -156,9 +156,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=1418910337' 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>: r46 <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=45;rev2=46"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=45">r45</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=44;rev2=45"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=44">r44</a> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=43;rev2=44"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=43">r43</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=46&currrev=46' 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=1424353871' 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>: r49 <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> <a rel="nofollow" href="https://intranet.psi.ch/wiki/bin/compare/MUSR/WebHome?rev1=46;rev2=47"><</a> <a rel="nofollow" href="https://intranet.psi.ch/MUSR/WebHome?rev=46">r46</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=49&currrev=49' 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: r46 - 18 Dec 2014, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
|
||||
</div></div><div class="patternInfo"><span class="patternRevInfo">Topic revision: r49 - 19 Feb 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">
|
||||
@ -180,7 +180,7 @@ pre {
|
||||
<li> <a href="https://intranet.psi.ch/MUSR/WebCreateNewTopic?parent=WebHome" target="_top"><span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/newtopic.png" width="16" height="16" alt="newtopic" /></span> Create New Topic</a>
|
||||
</li> <li> <a href="WebTopicList.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/index.png" width="16" height="16" alt="index" /></span> Show All Topics</a>
|
||||
</li> <li> <a href="WebSearch.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/searchtopic.png" width="16" height="16" alt="searchtopic" /></span> Search in Topics</a>
|
||||
</li> <li> <a href="WebChanges.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="https://intranet.psi.ch/search/#?fq=%20-web_search:Applications%26fq%3D%7B!tag%3Dweb%20q.op%3DOR%7Dweb:(MUSR)&sort=date%20desc"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/changes.png" width="16" height="16" alt="changes" /></span> Recent Changes</a>
|
||||
</li> <li> <a href="WebNotify.html"> <span class="foswikiIcon"><img src="../pub/System/DocumentGraphics/notify.png" width="16" height="16" alt="notify" /></span> Define Notifications</a>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
@ -193,12 +193,11 @@ pre {
|
||||
<tr><td valign="middle"><span id="foswikiLogo" class="foswikiImage"><a href="WebHome.html"><img src="../pub/Main/WebPreferences/psi_logo_150.gif" border="0" alt="Paul Scherrer Institut" style="border:none; margin: -8px 0 0 15px;" /></a></span></td>
|
||||
<td align="right" valign="top" class="patternMetaMenu" id="psimetanav">
|
||||
<p></p> <ul>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/PSI/Search"><input type="hidden" name="filter" value="web:MUSR" /><input type="text" class="foswikiInputField" id="quickSearchBox" name="search" value="" size="18" /><input type="hidden" name="scope" value="all" /><!-- <input type="hidden" name="web" value="MUSR" /> --> <noscript> <input type="submit" size="5" class="foswikiButton" name="submit" value="Search" /> </noscript><input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
<li> <form name="quickSearchForm" id="solrSearchForm" action="https://intranet.psi.ch/search/"> <input type="text" class="foswikiInputField" id="quickSearchBox" name="q" value="" size="18" /> <input type="image" class="searchsubmit" alt="Search" value="Suche..." name="sa" src="../webbase/img/search.png"> </form>
|
||||
</li> <li> <form name="changeLanguage" action="https://intranet.psi.ch/wiki/bin/oops/MUSR/WebHome" method="get"> <input type="hidden" name="redirectto" value="/MUSR/WebHome?cover=print" /> <select name="language" class="foswikiSelect" onchange="document.changeLanguage.submit()"> <option value="de">Deutsch</option> <option selected="selected" value="en">English</option></select> <input type="hidden" name="template" value="oopslanguagechanged" /> <noscript> <input class="foswikiButton" type="submit" value="Change language" /> </noscript> </form>
|
||||
</li></ul>
|
||||
<p></p>
|
||||
<p></p>
|
||||
<p></p>
|
||||
</td></tr></table>
|
||||
</div><!--/patternTopBarContents-->
|
||||
</div><!--/patternTopBarContentsWrapper-->
|
||||
@ -207,7 +206,7 @@ pre {
|
||||
</div>
|
||||
</div>
|
||||
</div></body>
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 18 Dec 2014 13:46:55 GMT -->
|
||||
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 19 Feb 2015 13:52:29 GMT -->
|
||||
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=iso-8859-1"><!-- /Added by HTTrack -->
|
||||
</html>
|
||||
<p></p>
|
||||
|
||||
@ -22,15 +22,17 @@ SUBDIRS = external/MusrRoot \
|
||||
external/mud \
|
||||
$(PNEXUSDIRS) \
|
||||
classes \
|
||||
external
|
||||
external \
|
||||
musredit \
|
||||
musrgui
|
||||
|
||||
if BUILD_MUSRGUI
|
||||
SUBDIRS += $(EDITORDIR)
|
||||
#SUBDIRS += $(EDITORDIR)
|
||||
EXTRA_DIST = $(EDITORDIR)/Makefile
|
||||
endif
|
||||
|
||||
if BUILD_MUSREDIT
|
||||
SUBDIRS += $(EDITORDIR)
|
||||
#SUBDIRS += $(EDITORDIR)
|
||||
EXTRA_DIST = $(EDITORDIR)/Makefile
|
||||
endif
|
||||
|
||||
|
||||
@ -200,6 +200,23 @@ void PFourier::Transform(UInt_t apodizationTag)
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// GetMaxFreq
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>returns the maximal frequency in units choosen, i.e. Gauss, Tesla, MHz, Mc/s
|
||||
*/
|
||||
Double_t PFourier::GetMaxFreq()
|
||||
{
|
||||
UInt_t noOfFourierBins = 0;
|
||||
if (fNoOfBins % 2 == 0)
|
||||
noOfFourierBins = fNoOfBins/2;
|
||||
else
|
||||
noOfFourierBins = (fNoOfBins+1)/2;
|
||||
|
||||
return fResolution*noOfFourierBins;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// GetRealFourier
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
@ -43,8 +43,8 @@ using namespace std;
|
||||
#define YINFO 0.2
|
||||
#define YTITLE 0.95
|
||||
|
||||
static const char *gFiletypes[] = { "All files", "*",
|
||||
"Data files", "*.dat",
|
||||
static const char *gFiletypes[] = { "Data files", "*.dat",
|
||||
"All files", "*",
|
||||
0, 0 };
|
||||
|
||||
ClassImpQ(PFourierCanvas)
|
||||
@ -119,7 +119,7 @@ PFourierCanvas::PFourierCanvas(vector<PFourier*> &fourier, const Char_t* title,
|
||||
CreateXaxisTitle();
|
||||
CreateStyle();
|
||||
InitFourierDataSets();
|
||||
InitFourierCanvas(title, wtopx, wtopy, ww, wh);
|
||||
InitFourierCanvas(fTitle, wtopx, wtopy, ww, wh);
|
||||
|
||||
gStyle->SetHistMinimumZero(kTRUE); // needed to enforce proper bar option handling
|
||||
}
|
||||
@ -163,7 +163,7 @@ PFourierCanvas::PFourierCanvas(vector<PFourier*> &fourier, const Char_t* title,
|
||||
CreateXaxisTitle();
|
||||
CreateStyle();
|
||||
InitFourierDataSets();
|
||||
InitFourierCanvas(title, wtopx, wtopy, ww, wh);
|
||||
InitFourierCanvas(fTitle, wtopx, wtopy, ww, wh);
|
||||
|
||||
gStyle->SetHistMinimumZero(kTRUE); // needed to enforce proper bar option handling
|
||||
}
|
||||
@ -856,7 +856,7 @@ void PFourierCanvas::InitFourierCanvas(const Char_t* title, Int_t wtopx, Int_t w
|
||||
if (!fBatchMode) {
|
||||
fImp = (TRootCanvas*)fMainCanvas->GetCanvasImp();
|
||||
fBar = fImp->GetMenuBar();
|
||||
fPopupMain = fBar->AddPopup("&MusrFT");
|
||||
fPopupMain = fBar->AddPopup("MusrFT");
|
||||
|
||||
fPopupFourier = new TGPopupMenu();
|
||||
|
||||
@ -918,7 +918,7 @@ void PFourierCanvas::InitFourierCanvas(const Char_t* title, Int_t wtopx, Int_t w
|
||||
fTitlePad->Draw();
|
||||
|
||||
// fourier pad
|
||||
fFourierPad = new TPad("fourierPad", "fourierPad", 0.0, YINFO, 1.0, YTITLE);
|
||||
fFourierPad = new TPad("fFourierPad", "fFourierPad", 0.0, YINFO, 1.0, YTITLE);
|
||||
if (fFourierPad == 0) {
|
||||
cerr << endl << "PFourierCanvas::PFourierCanvas: **PANIC ERROR**: Couldn't invoke fFourierPad";
|
||||
cerr << endl;
|
||||
@ -1345,8 +1345,8 @@ void PFourierCanvas::DecrementFourierPhase()
|
||||
if ((fFourierHistos[i].dataFourierRe != 0) && (fFourierHistos[i].dataFourierIm != 0)) {
|
||||
for (Int_t j=0; j<fFourierHistos[i].dataFourierRe->GetNbinsX(); j++) { // loop over a fourier data set
|
||||
// calculate new fourier data set value
|
||||
re = fFourierHistos[i].dataFourierRe->GetBinContent(j) * cp + fFourierHistos[i].dataFourierIm->GetBinContent(j) * sp;
|
||||
im = fFourierHistos[i].dataFourierIm->GetBinContent(j) * cp - fFourierHistos[i].dataFourierRe->GetBinContent(j) * sp;
|
||||
re = fFourierHistos[i].dataFourierRe->GetBinContent(j) * cp - fFourierHistos[i].dataFourierIm->GetBinContent(j) * sp;
|
||||
im = fFourierHistos[i].dataFourierIm->GetBinContent(j) * cp + fFourierHistos[i].dataFourierRe->GetBinContent(j) * sp;
|
||||
// overwrite fourier data set value
|
||||
fFourierHistos[i].dataFourierRe->SetBinContent(j, re);
|
||||
fFourierHistos[i].dataFourierIm->SetBinContent(j, im);
|
||||
|
||||
@ -2861,29 +2861,6 @@ Bool_t PMsrHandler::HandleGlobalEntry(PMsrLines &lines)
|
||||
fGlobal = global;
|
||||
}
|
||||
|
||||
/*
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: fittype : " << fGlobal.GetFitType();
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: data bin range: ";
|
||||
for (UInt_t i=0; i<4; i++) {
|
||||
cout << fGlobal.GetDataRange(i) << ", ";
|
||||
}
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: t0's : ";
|
||||
for (UInt_t i=0; i<fGlobal.GetT0BinSize(); i++)
|
||||
cout << fGlobal.GetT0Bin(i) << ", ";
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: addt0's : ";
|
||||
for (UInt_t i=0; i<fGlobal.GetAddT0BinEntries(); i++) {
|
||||
cout << endl << " debug> --> " << i << ": ";
|
||||
for (UInt_t j=0; j<(UInt_t)fGlobal.GetAddT0BinSize(i); j++) {
|
||||
cout << fGlobal.GetAddT0Bin(i,j) << ", ";
|
||||
}
|
||||
}
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: fit in bin: " << fGlobal.IsFitRangeInBin();
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: fit offset: " << fGlobal.GetFitRangeOffset(0) << ", " << fGlobal.GetFitRangeOffset(1);
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: fit : " << fGlobal.GetFitRange(0) << ", " << fGlobal.GetFitRange(1);
|
||||
cout << endl << "debug> PMsrHandler::HandleGlobalEntry: Global: packing : " << fGlobal.GetPacking();
|
||||
cout << endl;
|
||||
*/
|
||||
|
||||
return !error;
|
||||
}
|
||||
|
||||
@ -5054,7 +5031,7 @@ Bool_t PMsrHandler::CheckRunBlockIntegrity()
|
||||
cerr << endl << ">> forward parameter number not defined. Necessary for single histogram fits." << endl;
|
||||
return false;
|
||||
}
|
||||
if (fRuns[i].GetNormParamNo() > static_cast<Int_t>(fParam.size())) {
|
||||
if ((fRuns[i].GetNormParamNo() > static_cast<Int_t>(fParam.size())) && !fFourierOnly) {
|
||||
// check if forward histogram number is a function
|
||||
if (fRuns[i].GetNormParamNo() - MSR_PARAM_FUN_OFFSET > static_cast<Int_t>(fParam.size())) {
|
||||
cerr << endl << ">> PMsrHandler::CheckRunBlockIntegrity(): **ERROR** in RUN block number " << i+1;
|
||||
@ -5338,6 +5315,9 @@ Bool_t PMsrHandler::CheckFuncs()
|
||||
{
|
||||
Bool_t result = true;
|
||||
|
||||
if (fFourierOnly)
|
||||
return result;
|
||||
|
||||
PIntVector funVec;
|
||||
PIntVector funBlock;
|
||||
PIntVector funLineBlockNo;
|
||||
|
||||
@ -35,10 +35,15 @@ using namespace std;
|
||||
#include <TRandom.h>
|
||||
#include <TROOT.h>
|
||||
#include <TObjString.h>
|
||||
#include <TGFileDialog.h>
|
||||
|
||||
#include "PMusrCanvas.h"
|
||||
#include "PFourier.h"
|
||||
|
||||
static const char *gFiletypes[] = { "Data files", "*.dat",
|
||||
"All files", "*",
|
||||
0, 0 };
|
||||
|
||||
ClassImp(PMusrCanvasPlotRange)
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
@ -128,7 +133,6 @@ PMusrCanvas::PMusrCanvas()
|
||||
fImp = 0;
|
||||
fBar = 0;
|
||||
fPopupMain = 0;
|
||||
fPopupSave = 0;
|
||||
fPopupFourier = 0;
|
||||
|
||||
fStyle = 0;
|
||||
@ -181,8 +185,8 @@ PMusrCanvas::PMusrCanvas()
|
||||
*/
|
||||
PMusrCanvas::PMusrCanvas(const Int_t number, const Char_t* title,
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
|
||||
const Bool_t batch) :
|
||||
fBatchMode(batch), fPlotNumber(number)
|
||||
const Bool_t batch, const Bool_t fourier) :
|
||||
fStartWithFourier(fourier), fBatchMode(batch), fPlotNumber(number)
|
||||
{
|
||||
fTimeout = 0;
|
||||
fTimeoutTimer = 0;
|
||||
@ -236,8 +240,8 @@ PMusrCanvas::PMusrCanvas(const Int_t number, const Char_t* title,
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
|
||||
PMsrFourierStructure fourierDefault,
|
||||
const PIntVector markerList, const PIntVector colorList,
|
||||
const Bool_t batch) :
|
||||
fBatchMode(batch),
|
||||
const Bool_t batch, const Bool_t fourier) :
|
||||
fStartWithFourier(fourier), fBatchMode(batch),
|
||||
fPlotNumber(number), fFourier(fourierDefault),
|
||||
fMarkerList(markerList), fColorList(colorList)
|
||||
{
|
||||
@ -703,7 +707,62 @@ void PMusrCanvas::UpdateDataTheoryPad()
|
||||
}
|
||||
|
||||
// generate the histo plot
|
||||
if (!fStartWithFourier || (fPlotType == MSR_PLOT_NON_MUSR)) {
|
||||
PlotData();
|
||||
} else { // show Fourier straight ahead.
|
||||
// set the menu properly
|
||||
if (!fBatchMode)
|
||||
fPopupMain->UnCheckEntry(P_MENU_ID_DATA+P_MENU_PLOT_OFFSET*fPlotNumber);
|
||||
|
||||
// filter proper Fourier plot tag, and set the menu tags properly
|
||||
switch (fFourier.fPlotTag) {
|
||||
case FOURIER_PLOT_REAL:
|
||||
fCurrentPlotView = PV_FOURIER_REAL;
|
||||
if (!fBatchMode) {
|
||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL);
|
||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
||||
}
|
||||
break;
|
||||
case FOURIER_PLOT_IMAG:
|
||||
fCurrentPlotView = PV_FOURIER_IMAG;
|
||||
if (!fBatchMode) {
|
||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_IMAG);
|
||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
||||
}
|
||||
break;
|
||||
case FOURIER_PLOT_REAL_AND_IMAG:
|
||||
fCurrentPlotView = PV_FOURIER_REAL_AND_IMAG;
|
||||
if (!fBatchMode) {
|
||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_REAL_AND_IMAG);
|
||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_PLUS);
|
||||
fPopupFourier->EnableEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE_MINUS);
|
||||
}
|
||||
break;
|
||||
case FOURIER_PLOT_POWER:
|
||||
fCurrentPlotView = PV_FOURIER_PWR;
|
||||
if (!fBatchMode) {
|
||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR);
|
||||
}
|
||||
break;
|
||||
case FOURIER_PLOT_PHASE:
|
||||
fCurrentPlotView = PV_FOURIER_PHASE;
|
||||
if (!fBatchMode) {
|
||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PHASE);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
fCurrentPlotView = PV_FOURIER_PWR;
|
||||
if (!fBatchMode) {
|
||||
fPopupFourier->CheckEntry(P_MENU_ID_FOURIER+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_FOURIER_PWR);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
HandleFourier();
|
||||
PlotFourier();
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
@ -1282,8 +1341,16 @@ void PMusrCanvas::HandleMenuPopup(Int_t id)
|
||||
cout << "**INFO** averaging of a single data set doesn't make any sense, will ignore 'a' ..." << endl;
|
||||
return;
|
||||
}
|
||||
} else if (id == P_MENU_ID_SAVE_DATA+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_SAVE_ASCII) {
|
||||
SaveDataAscii();
|
||||
} else if (id == P_MENU_ID_EXPORT_DATA+P_MENU_PLOT_OFFSET*fPlotNumber) {
|
||||
static TString dir(".");
|
||||
TGFileInfo fi;
|
||||
fi.fFileTypes = gFiletypes;
|
||||
fi.fIniDir = StrDup(dir);
|
||||
fi.fOverwrite = true;
|
||||
new TGFileDialog(0, fImp, kFDSave, &fi);
|
||||
if (fi.fFilename && strlen(fi.fFilename)) {
|
||||
ExportData(fi.fFilename);
|
||||
}
|
||||
}
|
||||
|
||||
// check if phase increment/decrement needs to be ghost
|
||||
@ -1362,13 +1429,20 @@ void PMusrCanvas::SaveGraphicsAndQuit(Char_t *fileName, Char_t *graphicsFormat)
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// SaveDataAscii
|
||||
// ExportData
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Saves the currently seen data (data, difference, Fourier spectra, ...) in ascii column format.
|
||||
*
|
||||
* \param fileName file name to be used to save the data.
|
||||
*/
|
||||
void PMusrCanvas::SaveDataAscii()
|
||||
void PMusrCanvas::ExportData(const Char_t *fileName)
|
||||
{
|
||||
if (fileName == 0) { // path file name NOT provided, generate a default path file name
|
||||
cerr << endl << ">> PMusrCanvas::ExportData **ERROR** NO path file name provided. Will do nothing." << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
// collect relevant data
|
||||
PMusrCanvasAsciiDump dump;
|
||||
PMusrCanvasAsciiDumpVector dumpVector;
|
||||
@ -2014,35 +2088,13 @@ void PMusrCanvas::SaveDataAscii()
|
||||
break;
|
||||
}
|
||||
|
||||
// generate output filename
|
||||
|
||||
// in order to handle names with "." correctly this slightly odd data-filename generation
|
||||
TObjArray *tokens = fMsrHandler->GetFileName().Tokenize(".");
|
||||
TObjString *ostr;
|
||||
TString str;
|
||||
TString fln = TString("");
|
||||
for (Int_t i=0; i<tokens->GetEntries()-1; i++) {
|
||||
ostr = dynamic_cast<TObjString*>(tokens->At(i));
|
||||
fln += ostr->GetString() + TString(".");
|
||||
}
|
||||
if (!fDifferenceView) {
|
||||
fln += "data.ascii";
|
||||
} else {
|
||||
fln += "diff.ascii";
|
||||
}
|
||||
|
||||
if (tokens) {
|
||||
delete tokens;
|
||||
tokens = 0;
|
||||
}
|
||||
|
||||
// open file
|
||||
ofstream fout;
|
||||
|
||||
// open output data-file
|
||||
fout.open(fln.Data(), iostream::out);
|
||||
fout.open(fileName, iostream::out);
|
||||
if (!fout.is_open()) {
|
||||
cerr << endl << ">> PMusrCanvas::SaveDataAscii: **ERROR** couldn't open file " << fln.Data() << " for writing." << endl;
|
||||
cerr << endl << ">> PMusrCanvas::ExportData: **ERROR** couldn't open file " << fileName << " for writing." << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
@ -2366,7 +2418,6 @@ void PMusrCanvas::InitMusrCanvas(const Char_t* title, Int_t wtopx, Int_t wtopy,
|
||||
fImp = 0;
|
||||
fBar = 0;
|
||||
fPopupMain = 0;
|
||||
fPopupSave = 0;
|
||||
fPopupFourier = 0;
|
||||
|
||||
fMainCanvas = 0;
|
||||
@ -2415,10 +2466,7 @@ void PMusrCanvas::InitMusrCanvas(const Char_t* title, Int_t wtopx, Int_t wtopy,
|
||||
fPopupMain->AddEntry("Average", P_MENU_ID_AVERAGE+P_MENU_PLOT_OFFSET*fPlotNumber);
|
||||
fPopupMain->AddSeparator();
|
||||
|
||||
fPopupSave = new TGPopupMenu();
|
||||
fPopupSave->AddEntry("Save ascii", P_MENU_ID_SAVE_DATA+P_MENU_PLOT_OFFSET*fPlotNumber+P_MENU_ID_SAVE_ASCII);
|
||||
|
||||
fPopupMain->AddPopup("&Save Data", fPopupSave);
|
||||
fPopupMain->AddEntry("Export Data", P_MENU_ID_EXPORT_DATA+P_MENU_PLOT_OFFSET*fPlotNumber);
|
||||
fBar->MapSubwindows();
|
||||
fBar->Layout();
|
||||
|
||||
@ -3358,10 +3406,14 @@ void PMusrCanvas::HandleFourier()
|
||||
// check if fourier needs to be calculated
|
||||
if (fData[0].dataFourierRe == 0) {
|
||||
Int_t bin;
|
||||
double startTime = fXmin;
|
||||
double endTime = fXmax;
|
||||
if (!fStartWithFourier) { // fHistoFrame presen, hence get start/end from it
|
||||
bin = fHistoFrame->GetXaxis()->GetFirst();
|
||||
double startTime = fHistoFrame->GetBinCenter(bin);
|
||||
startTime = fHistoFrame->GetBinCenter(bin);
|
||||
bin = fHistoFrame->GetXaxis()->GetLast();
|
||||
double endTime = fHistoFrame->GetBinCenter(bin);
|
||||
endTime = fHistoFrame->GetBinCenter(bin);
|
||||
}
|
||||
for (UInt_t i=0; i<fData.size(); i++) {
|
||||
// calculate fourier transform of the data
|
||||
PFourier fourierData(fData[i].data, fFourier.fUnits, startTime, endTime, fFourier.fDCCorrected, fFourier.fFourierPower);
|
||||
@ -3800,7 +3852,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].data->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].data, fData[0].data->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].data, fData[0].data->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.data->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3814,7 +3866,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].dataFourierRe->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierRe, fData[0].dataFourierRe->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierRe, fData[0].dataFourierRe->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.dataFourierRe->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3828,7 +3880,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].dataFourierIm->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierIm, fData[0].dataFourierIm->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierIm, fData[0].dataFourierIm->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.dataFourierIm->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3842,7 +3894,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].dataFourierPwr->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierPwr, fData[0].dataFourierPwr->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierPwr, fData[0].dataFourierPwr->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.dataFourierPwr->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3856,7 +3908,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].dataFourierPhase->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierPhase, fData[0].dataFourierPhase->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].dataFourierPhase, fData[0].dataFourierPhase->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.dataFourierPhase->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3870,7 +3922,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].theory->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].theory, fData[0].theory->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].theory, fData[0].theory->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.theory->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3880,7 +3932,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].theoryFourierRe->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierRe, fData[0].theoryFourierRe->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierRe, fData[0].theoryFourierRe->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.theoryFourierRe->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3894,7 +3946,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].theoryFourierIm->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierIm, fData[0].theoryFourierIm->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierIm, fData[0].theoryFourierIm->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.theoryFourierIm->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3908,7 +3960,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].theoryFourierPwr->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierPwr, fData[0].theoryFourierPwr->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierPwr, fData[0].theoryFourierPwr->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.theoryFourierPwr->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3922,7 +3974,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].theoryFourierPhase->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierPhase, fData[0].theoryFourierPhase->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].theoryFourierPhase, fData[0].theoryFourierPhase->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.theoryFourierPhase->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3936,7 +3988,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].diff->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].diff, fData[0].diff->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].diff, fData[0].diff->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.diff->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3950,7 +4002,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].diffFourierRe->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierRe, fData[0].diffFourierRe->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierRe, fData[0].diffFourierRe->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.diffFourierRe->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3964,7 +4016,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].diffFourierIm->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierIm, fData[0].diffFourierIm->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierIm, fData[0].diffFourierIm->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.diffFourierIm->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3978,7 +4030,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].diffFourierPwr->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierPwr, fData[0].diffFourierPwr->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierPwr, fData[0].diffFourierPwr->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.diffFourierPwr->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
@ -3992,7 +4044,7 @@ void PMusrCanvas::HandleAverage()
|
||||
for (Int_t i=0; i<fData[0].diffFourierPhase->GetNbinsX(); i++) {
|
||||
dval = 0.0;
|
||||
for (UInt_t j=0; j<fData.size(); j++) {
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierPhase, fData[0].diffFourierPhase->GetBinContent(i));
|
||||
dval += GetInterpolatedValue(fData[j].diffFourierPhase, fData[0].diffFourierPhase->GetBinCenter(i));
|
||||
}
|
||||
fDataAvg.diffFourierPhase->SetBinContent(i, dval/fData.size());
|
||||
}
|
||||
|
||||
@ -27,6 +27,8 @@
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
|
||||
#include <cmath>
|
||||
|
||||
#include "PPrepFourier.h"
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
@ -48,10 +50,11 @@ PPrepFourier::PPrepFourier()
|
||||
/**
|
||||
* <p>Constructor.
|
||||
*/
|
||||
PPrepFourier::PPrepFourier(const Int_t *bkgRange, const Int_t packing) :
|
||||
PPrepFourier::PPrepFourier(const Int_t packing, const Int_t *bkgRange, PDoubleVector bkg) :
|
||||
fPacking(packing)
|
||||
{
|
||||
SetBkgRange(bkgRange);
|
||||
SetBkg(bkg);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
@ -112,6 +115,20 @@ void PPrepFourier::SetBkgRange(const Int_t *bkgRange)
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// SetBkgRange
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>set the background values for all the histos.
|
||||
*
|
||||
* \param bkg vector
|
||||
*/
|
||||
void PPrepFourier::SetBkg(PDoubleVector bkg)
|
||||
{
|
||||
for (unsigned int i=0; i<bkg.size(); i++)
|
||||
fBkg.push_back(bkg[i]);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// SetPacking
|
||||
//--------------------------------------------------------------------------
|
||||
@ -157,10 +174,11 @@ void PPrepFourier::DoBkgCorrection()
|
||||
}
|
||||
|
||||
// if no bkg-range is given, nothing needs to be done
|
||||
if ((fBkgRange[0] == -1) && (fBkgRange[1] == -1)) {
|
||||
if ((fBkgRange[0] == -1) && (fBkgRange[1] == -1) && (fBkg.size() == 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if ((fBkgRange[0] != -1) && (fBkgRange[1] != -1)) { // background range is given
|
||||
// make sure that the bkg range is ok
|
||||
for (unsigned int i=0; i<fRawData.size(); i++) {
|
||||
if ((fBkgRange[0] >= fRawData[i].rawData.size()) || (fBkgRange[1] >= fRawData[i].rawData.size())) {
|
||||
@ -176,11 +194,27 @@ void PPrepFourier::DoBkgCorrection()
|
||||
bkg += fRawData[i].rawData[j];
|
||||
}
|
||||
bkg /= (fBkgRange[1]-fBkgRange[0]+1);
|
||||
cout << "debug> background " << i << ": " << bkg << endl;
|
||||
|
||||
// correct data
|
||||
for (unsigned int j=0; j<fData[i].size(); j++)
|
||||
fData[i][j] -= bkg;
|
||||
}
|
||||
} else { // there might be an explicit background list
|
||||
// check if there is a background list
|
||||
if (fBkg.size() == 0)
|
||||
return;
|
||||
|
||||
// check if there are as many background values than data values
|
||||
if (fBkg.size() != fData.size()) {
|
||||
cerr << endl << "PPrepFourier::DoBkgCorrection() **ERROR** #bkg values != #histos. Will do nothing here." << endl;
|
||||
return;
|
||||
}
|
||||
|
||||
for (unsigned int i=0; i<fData.size(); i++)
|
||||
for (unsigned int j=0; j<fData[i].size(); j++)
|
||||
fData[i][j] -= fBkg[i];
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
@ -218,20 +252,6 @@ void PPrepFourier::DoPacking()
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// DoFiltering
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Not implemented yet.
|
||||
*/
|
||||
void PPrepFourier::DoFiltering()
|
||||
{
|
||||
// make sure fData are already present, and if not create the necessary data sets
|
||||
if (fData.size() != fRawData.size()) {
|
||||
InitData();
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// DoLifeTimeCorrection
|
||||
//--------------------------------------------------------------------------
|
||||
@ -417,7 +437,7 @@ TH1F *PPrepFourier::GetData(const UInt_t idx)
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// InitData
|
||||
// InitData (private)
|
||||
//--------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Copy raw-data to internal data from t0 to the size of raw-data.
|
||||
|
||||
6
src/external/Makefile.am
vendored
6
src/external/Makefile.am
vendored
@ -19,4 +19,8 @@ if BUILD_BMWLIBS
|
||||
libCalcMeanFieldsLEM
|
||||
endif
|
||||
|
||||
SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS)
|
||||
if BUILD_BNMRLIBS
|
||||
BNMRDIRS = libBNMR
|
||||
endif
|
||||
|
||||
SUBDIRS = $(ASDIRS) $(CUBADIRS) $(BMWDIRS) $(BNMRDIRS)
|
||||
|
||||
52
src/external/libBNMR/Makefile.am
vendored
Normal file
52
src/external/libBNMR/Makefile.am
vendored
Normal file
@ -0,0 +1,52 @@
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
h_sources = \
|
||||
TBNMR.h
|
||||
|
||||
h_linkdef = \
|
||||
TBNMRLinkDef.h
|
||||
|
||||
dict_h_sources = \
|
||||
TBNMRDict.h
|
||||
|
||||
cpp_sources = \
|
||||
TBNMR.cpp
|
||||
|
||||
dict_cpp_sources = \
|
||||
TBNMRDict.cpp
|
||||
|
||||
include_HEADERS = $(h_sources)
|
||||
noinst_HEADERS = $(h_linkdef) $(dict_h_sources)
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir)/src/include $(PMUSR_CFLAGS) -I$(ROOTINCDIR)
|
||||
AM_CXXFLAGS = $(LOCAL_LIB_CXXFLAGS)
|
||||
|
||||
BUILT_SOURCES = $(dict_cpp_sources) $(dict_h_sources)
|
||||
AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
|
||||
CLEANFILES = *Dict.cpp *Dict.h *~ core
|
||||
|
||||
%Dict.cpp %Dict.h: %.h %LinkDef.h
|
||||
@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
|
||||
|
||||
lib_LTLIBRARIES = libBNMR.la
|
||||
|
||||
libBNMR_la_SOURCES = $(h_sources) $(cpp_sources) $(dict_h_sources) $(dict_cpp_sources)
|
||||
libBNMR_la_LIBADD = $(ROOT_LIBS)
|
||||
libBNMR_la_LDFLAGS = -version-info $(PLUGIN_LIBRARY_VERSION) -release $(PLUGIN_RELEASE) $(AM_LDFLAGS)
|
||||
|
||||
## However, create some symbolic links to the shared library
|
||||
## in order to unify the function call on different operating systems
|
||||
|
||||
if IS_DARWIN
|
||||
install-exec-hook:
|
||||
$(LN_S) -f $(libdir)/libBNMR.dylib $(libdir)/libBNMR.so
|
||||
uninstall-hook:
|
||||
rm -f $(libdir)/libBNMR.so
|
||||
endif
|
||||
|
||||
if IS_CYGWIN
|
||||
install-exec-hook:
|
||||
$(LN_S) -f $(bindir)/cygBNMR-$(PLUGIN_MAJOR_VERSION)-$(PLUGIN_MINOR_VERSION)-$(PLUGIN_MAJOR_VERSION).dll $(libdir)/libBNMR.so
|
||||
uninstall-hook:
|
||||
rm -f $(libdir)/libBNMR.so
|
||||
endif
|
||||
@ -55,6 +55,7 @@ class PFourier
|
||||
virtual const char* GetDataTitle() { return fData->GetTitle(); }
|
||||
virtual const Int_t GetUnitTag() { return fUnitTag; }
|
||||
virtual Double_t GetResolution() { return fResolution; }
|
||||
virtual Double_t GetMaxFreq();
|
||||
virtual TH1F* GetRealFourier(const Double_t scale = 1.0);
|
||||
virtual TH1F* GetImaginaryFourier(const Double_t scale = 1.0);
|
||||
virtual TH1F* GetPowerFourier(const Double_t scale = 1.0);
|
||||
|
||||
@ -127,7 +127,6 @@ class PFourierCanvas : public TObject, public TQObject
|
||||
TRootCanvas *fImp; ///< ROOT native GUI version of main window with menubar and drawing area
|
||||
TGMenuBar *fBar; ///< menu bar
|
||||
TGPopupMenu *fPopupMain; ///< popup menu MusrFT in the main menu bar
|
||||
// TGPopupMenu *fPopupSave; ///< popup menu of the MusrFT/Save Data sub menu
|
||||
TGPopupMenu *fPopupFourier; ///< popup menu of the MusrFT/Fourier sub menu
|
||||
|
||||
// canvas related variables
|
||||
|
||||
@ -36,6 +36,12 @@ using namespace std;
|
||||
|
||||
#include <TString.h>
|
||||
|
||||
// the following ifdef is needed for GCC 4.6 or higher, fftw 3.3 or higher and root 5.30.03 or lower
|
||||
#ifdef __CINT__
|
||||
typedef struct { char a[7]; } __float128; // needed since cint doesn't know it
|
||||
#endif
|
||||
#include "fftw3.h"
|
||||
|
||||
#define PMUSR_SUCCESS 0
|
||||
#define PMUSR_WRONG_STARTUP_SYNTAX -1
|
||||
#define PMUSR_MSR_FILE_NOT_FOUND -2
|
||||
|
||||
@ -67,7 +67,7 @@
|
||||
#define P_MENU_ID_FOURIER 10002
|
||||
#define P_MENU_ID_DIFFERENCE 10003
|
||||
#define P_MENU_ID_AVERAGE 10004
|
||||
#define P_MENU_ID_SAVE_DATA 10005
|
||||
#define P_MENU_ID_EXPORT_DATA 10005
|
||||
|
||||
#define P_MENU_PLOT_OFFSET 1000
|
||||
|
||||
@ -79,8 +79,6 @@
|
||||
#define P_MENU_ID_FOURIER_PHASE_PLUS 105
|
||||
#define P_MENU_ID_FOURIER_PHASE_MINUS 106
|
||||
|
||||
#define P_MENU_ID_SAVE_ASCII 200
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>
|
||||
@ -204,11 +202,13 @@ class PMusrCanvas : public TObject, public TQObject
|
||||
public:
|
||||
PMusrCanvas();
|
||||
PMusrCanvas(const Int_t number, const Char_t* title,
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh, const Bool_t batch);
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh, const Bool_t batch,
|
||||
const Bool_t fourier=false);
|
||||
PMusrCanvas(const Int_t number, const Char_t* title,
|
||||
Int_t wtopx, Int_t wtopy, Int_t ww, Int_t wh,
|
||||
PMsrFourierStructure fourierDefault,
|
||||
const PIntVector markerList, const PIntVector colorList, const Bool_t batch);
|
||||
const PIntVector markerList, const PIntVector colorList, const Bool_t batch,
|
||||
const Bool_t fourier=false);
|
||||
virtual ~PMusrCanvas();
|
||||
|
||||
virtual Bool_t IsValid() { return fValid; }
|
||||
@ -229,9 +229,10 @@ class PMusrCanvas : public TObject, public TQObject
|
||||
virtual void LastCanvasClosed(); // SLOT
|
||||
|
||||
virtual void SaveGraphicsAndQuit(Char_t *fileName, Char_t *graphicsFormat);
|
||||
virtual void SaveDataAscii();
|
||||
virtual void ExportData(const Char_t *fileName);
|
||||
|
||||
private:
|
||||
Bool_t fStartWithFourier; ///< flag if true, the Fourier transform will be presented bypassing the time domain representation
|
||||
Int_t fTimeout; ///< timeout after which the Done signal should be emited. If timeout <= 0, no timeout is taking place
|
||||
Bool_t fScaleN0AndBkg; ///< true=N0 and background is scaled to (1/ns), otherwise (1/bin) for the single histogram case
|
||||
Bool_t fBatchMode; ///< musrview in ROOT batch mode
|
||||
@ -259,7 +260,6 @@ class PMusrCanvas : public TObject, public TQObject
|
||||
TRootCanvas *fImp; ///< ROOT native GUI version of main window with menubar and drawing area
|
||||
TGMenuBar *fBar; ///< menu bar
|
||||
TGPopupMenu *fPopupMain; ///< popup menu Musrfit in the main menu bar
|
||||
TGPopupMenu *fPopupSave; ///< popup menu of the Musrfit/Save Data sub menu
|
||||
TGPopupMenu *fPopupFourier; ///< popup menu of the Musrfit/Fourier sub menu
|
||||
|
||||
// canvas related variables
|
||||
|
||||
@ -34,7 +34,8 @@
|
||||
#include <vector>
|
||||
using namespace std;
|
||||
|
||||
#include "TH1F.h"
|
||||
#include <TH1F.h>
|
||||
#include <TMath.h>
|
||||
|
||||
#include "PMusr.h"
|
||||
|
||||
@ -59,16 +60,16 @@ typedef struct {
|
||||
class PPrepFourier {
|
||||
public:
|
||||
PPrepFourier();
|
||||
PPrepFourier(const Int_t *bkgRange, const Int_t packing);
|
||||
PPrepFourier(const Int_t packing, const Int_t *bkgRange, PDoubleVector bkg);
|
||||
virtual ~PPrepFourier();
|
||||
|
||||
void SetBkgRange(const Int_t *bkgRange);
|
||||
void SetPacking(const Int_t packing);
|
||||
void AddData(musrFT_data &data);
|
||||
void DoBkgCorrection();
|
||||
void DoPacking();
|
||||
void DoFiltering();
|
||||
void DoLifeTimeCorrection(Double_t fudge);
|
||||
virtual void SetBkgRange(const Int_t *bkgRange);
|
||||
virtual void SetBkg(PDoubleVector bkg);
|
||||
virtual void SetPacking(const Int_t packing);
|
||||
virtual void AddData(musrFT_data &data);
|
||||
virtual void DoBkgCorrection();
|
||||
virtual void DoPacking();
|
||||
virtual void DoLifeTimeCorrection(Double_t fudge);
|
||||
|
||||
TString GetInfo(const UInt_t idx);
|
||||
UInt_t GetNoOfData() { return fRawData.size(); }
|
||||
@ -79,9 +80,10 @@ class PPrepFourier {
|
||||
vector<musrFT_data> fRawData;
|
||||
vector<PDoubleVector>fData;
|
||||
Int_t fBkgRange[2];
|
||||
PDoubleVector fBkg;
|
||||
Int_t fPacking;
|
||||
|
||||
void InitData();
|
||||
virtual void InitData();
|
||||
};
|
||||
|
||||
#endif // _PPREPFOURIER_H_
|
||||
|
||||
112
src/musrFT.cpp
112
src/musrFT.cpp
@ -65,7 +65,8 @@ typedef struct {
|
||||
TString graphicFormat; ///< format for the graphical output dump
|
||||
TString dumpFln; ///< dump file name for Fourier data output
|
||||
TString msrFlnOut; ///< dump file name for msr-file generation
|
||||
int bkg[2]; ///< background range
|
||||
int bkg_range[2]; ///< background range
|
||||
vector<double> bkg; ///< background value
|
||||
TString fourierOpt; ///< Fourier options, i.e. real, imag, power, phase
|
||||
TString apodization; ///< apodization setting: none, weak, medium, strong
|
||||
int fourierPower; ///< Fourier power for zero padding, i.e. 2^fourierPower points
|
||||
@ -95,7 +96,7 @@ void musrFT_syntax()
|
||||
cout << endl << " -df, --data-file <data-file> : This allows to feed only muSR data file(s) to";
|
||||
cout << endl << " perform the Fourier transform. Since the extended <msr-file> information";
|
||||
cout << endl << " are missing, they will need to be provided by to options, or musrFT";
|
||||
cout << endl << " tries to guess, based on musrFT_startup.xml settings.";
|
||||
cout << endl << " tries to guess, based on musrfit_startup.xml settings.";
|
||||
cout << endl << " Options: ";
|
||||
cout << endl << " --help : display this help and exit";
|
||||
cout << endl << " --version : output version information and exit";
|
||||
@ -106,13 +107,13 @@ void musrFT_syntax()
|
||||
cout << endl << " Supported graphic-format-extension: eps, pdf, gif, jpg, png, svg, xpm, root";
|
||||
cout << endl << " --dump <fln> : rather than starting a root session and showing Fourier graphs of the data,";
|
||||
cout << endl << " it will output the Fourier data in an ascii file <fln>.";
|
||||
cout << endl << " --filter : filter and filter-specific-information -- ***TO BE WRITTEN YET***.";
|
||||
cout << endl << " -b, --background <start> <end>: background interval used to estimate the backround to be";
|
||||
cout << endl << " -br, --background-range <start> <end>: background interval used to estimate the background to be";
|
||||
cout << endl << " subtracted before the Fourier transform. <start>, <end> to be given in bins.";
|
||||
cout << endl << " -bg, --background <list> : gives the background explicit for each histogram.";
|
||||
cout << endl << " -fo, --fourier-option <fopt>: <fopt> can be 'real', 'imag', 'real+imag', 'power', or 'phase'.";
|
||||
cout << endl << " If this is not defined (neither on the command line nor in the musrFT_startup.xml),";
|
||||
cout << endl << " If this is not defined (neither on the command line nor in the musrfit_startup.xml),";
|
||||
cout << endl << " default will be 'power'.";
|
||||
cout << endl << " -apod, --apodization <val> : <val> can be either 'none', 'weak', 'medium', 'strong'.";
|
||||
cout << endl << " -ap, --apodization <val> : <val> can be either 'none', 'weak', 'medium', 'strong'.";
|
||||
cout << endl << " Default will be 'none'.";
|
||||
cout << endl << " -fp, --fourier-power <N> : <N> being the Fourier power, i.e. 2^<N> used for zero padding.";
|
||||
cout << endl << " Default is -1, i.e. no zero padding will be performed.";
|
||||
@ -132,9 +133,10 @@ void musrFT_syntax()
|
||||
cout << endl << " E.g. musrFT -df lem15_his_01234.root --histo 1 3, will only be needed together with";
|
||||
cout << endl << " the option --data-file. If multiple data file are given, <list> will apply";
|
||||
cout << endl << " to all data-files given. If --histo is not given, all histos of a data file will be used.";
|
||||
cout << endl << " <list> can be anything like: 2 3 6, or 2-17, or 1-6 9, etc.";
|
||||
cout << endl << " -a, --average : show the average of all Fourier transformed data.";
|
||||
cout << endl << " --t0 <list> : A list of t0's can be provided. This in conjunction with --data-file and";
|
||||
cout << endl << " --fourier-option real allows to get the proper inital phase if t0's are known.";
|
||||
cout << endl << " --fourier-option real allows to get the proper initial phase if t0's are known.";
|
||||
cout << endl << " If a single t0 for multiple histos is given, it is assume, that this t0 is common";
|
||||
cout << endl << " to all histos.";
|
||||
cout << endl << " Example: musrFT -df lem15_his_01234.root -fo real --t0 2750 --histo 1 3";
|
||||
@ -160,8 +162,8 @@ void musrFT_init(musrFT_startup_param &startupParam)
|
||||
startupParam.graphicFormat = TString("");
|
||||
startupParam.dumpFln = TString("");
|
||||
startupParam.msrFlnOut = TString("");
|
||||
startupParam.bkg[0] = -1;
|
||||
startupParam.bkg[1] = -1;
|
||||
startupParam.bkg_range[0] = -1;
|
||||
startupParam.bkg_range[1] = -1;
|
||||
startupParam.fourierOpt = TString("??");
|
||||
startupParam.apodization = TString("none");
|
||||
startupParam.fourierPower = -1;
|
||||
@ -321,27 +323,44 @@ int musrFT_parse_options(int argc, char *argv[], musrFT_startup_param &startupPa
|
||||
}
|
||||
startupParam.dumpFln = argv[i+1];
|
||||
i++;
|
||||
} else if (tstr.Contains("--filter")) {
|
||||
cout << endl << "debug> found option filter. NOT YET ANY FUNCTIONALITY." << endl;
|
||||
} else if (tstr.Contains("-b") || tstr.Contains("--background")) {
|
||||
} else if (tstr.Contains("-br") || tstr.Contains("--background-range")) {
|
||||
if (i+2 >= argc) { // something is wrong since there needs to be two arguments here
|
||||
cerr << endl << ">> musrFT **ERROR** found option --background with wrong number of arguments." << endl;
|
||||
cerr << endl << ">> musrFT **ERROR** found option --background-range with wrong number of arguments." << endl;
|
||||
return 2;
|
||||
}
|
||||
TString bkg[2];
|
||||
bkg[0] = argv[i+1];
|
||||
bkg[1] = argv[i+2];
|
||||
if (!bkg[0].IsDigit()) {
|
||||
cerr << endl << ">> musrFT **ERROR** <start> bin of option --background is NOT an int-number! ('" << bkg[0] << "')." << endl;
|
||||
TString bkgRange[2];
|
||||
bkgRange[0] = argv[i+1];
|
||||
bkgRange[1] = argv[i+2];
|
||||
if (!bkgRange[0].IsDigit()) {
|
||||
cerr << endl << ">> musrFT **ERROR** <start> bin of option --background-range is NOT an int-number! ('" << bkgRange[0] << "')." << endl;
|
||||
return 2;
|
||||
}
|
||||
if (!bkg[1].IsDigit()) {
|
||||
cerr << endl << ">> musrFT **ERROR** <end> bin of option --background is NOT an int-number! ('" << bkg[1] << "')." << endl;
|
||||
if (!bkgRange[1].IsDigit()) {
|
||||
cerr << endl << ">> musrFT **ERROR** <end> bin of option --background-range is NOT an int-number! ('" << bkgRange[1] << "')." << endl;
|
||||
return 2;
|
||||
}
|
||||
startupParam.bkg[0] = bkg[0].Atoi();
|
||||
startupParam.bkg[1] = bkg[1].Atoi();
|
||||
startupParam.bkg_range[0] = bkgRange[0].Atoi();
|
||||
startupParam.bkg_range[1] = bkgRange[1].Atoi();
|
||||
i += 2;
|
||||
} else if (tstr.BeginsWith("-bg") || !tstr.CompareTo("--background")) {
|
||||
TString topt("");
|
||||
while (++i < argc) {
|
||||
if (argv[i][0] == '-') {
|
||||
--i;
|
||||
break;
|
||||
} else {
|
||||
topt = argv[i];
|
||||
if (!topt.IsFloat()) {
|
||||
cerr << endl << ">> musrFT **ERROR** found option --background='" << topt << "' which is not a float" << endl;
|
||||
return 2;
|
||||
}
|
||||
startupParam.bkg.push_back(topt.Atoi());
|
||||
}
|
||||
}
|
||||
if (startupParam.bkg.size() == 0) { // something is wrong since there needs to be an argument here
|
||||
cerr << endl << ">> musrFT **ERROR** found option --background without argument!" << endl;
|
||||
return 2;
|
||||
}
|
||||
} else if (tstr.BeginsWith("-fo") || tstr.BeginsWith("--fourier-option")) {
|
||||
if (i+1 >= argc) { // something is wrong since there needs to be two arguments here
|
||||
cerr << endl << ">> musrFT **ERROR** found option --fourier-option without arguments." << endl;
|
||||
@ -354,7 +373,7 @@ int musrFT_parse_options(int argc, char *argv[], musrFT_startup_param &startupPa
|
||||
}
|
||||
startupParam.fourierOpt = topt;
|
||||
i++;
|
||||
} else if (tstr.BeginsWith("-apod") || tstr.BeginsWith("--apodization")) {
|
||||
} else if (tstr.BeginsWith("-ap") || tstr.BeginsWith("--apodization")) {
|
||||
if (i+1 >= argc) { // something is wrong since there needs to be two arguments here
|
||||
cerr << endl << ">> musrFT **ERROR** found option --apodization without arguments." << endl;
|
||||
return 2;
|
||||
@ -453,7 +472,7 @@ int musrFT_parse_options(int argc, char *argv[], musrFT_startup_param &startupPa
|
||||
startupParam.t0.push_back(topt.Atoi());
|
||||
}
|
||||
}
|
||||
if (startupParam.dataFln.size() == 0) { // something is wrong since there needs to be an argument here
|
||||
if (startupParam.t0.size() == 0) { // something is wrong since there needs to be an argument here
|
||||
cerr << endl << ">> musrFT **ERROR** found option --t0 without argument!" << endl;
|
||||
return 2;
|
||||
}
|
||||
@ -550,11 +569,11 @@ int musrFT_parse_options(int argc, char *argv[], musrFT_startup_param &startupPa
|
||||
cerr << endl << ">> musrFT **ERROR** neither <msr-file> nor <data-file> defined." << endl;
|
||||
return 2;
|
||||
}
|
||||
if (startupParam.bkg[0] > startupParam.bkg[1]) {
|
||||
cerr << endl << ">> musrFT **WARNING** in --background, start=" << startupParam.bkg[0] << " > end=" << startupParam.bkg[1] << ", will swap them." << endl;
|
||||
double swap = startupParam.bkg[0];
|
||||
startupParam.bkg[0] = startupParam.bkg[1];
|
||||
startupParam.bkg[1] = swap;
|
||||
if (startupParam.bkg_range[0] > startupParam.bkg_range[1]) {
|
||||
cerr << endl << ">> musrFT **WARNING** in --background-range, start=" << startupParam.bkg_range[0] << " > end=" << startupParam.bkg_range[1] << ", will swap them." << endl;
|
||||
double swap = startupParam.bkg_range[0];
|
||||
startupParam.bkg_range[0] = startupParam.bkg_range[1];
|
||||
startupParam.bkg_range[1] = swap;
|
||||
}
|
||||
if (startupParam.fourierRange[0] > startupParam.fourierRange[1]) {
|
||||
cerr << endl << ">> musrFT **WARNING** in --fourier-range, start=" << startupParam.fourierRange[0] << " > end=" << startupParam.fourierRange[1] << ", will swap them." << endl;
|
||||
@ -875,8 +894,8 @@ void musrFT_dumpMsrFile(musrFT_startup_param ¶m)
|
||||
if ((param.t0.size() > 1) && (j < param.t0.size())) {
|
||||
fout << "t0 " << param.t0[j] << endl;
|
||||
}
|
||||
if ((param.bkg[0] > -1) && (param.bkg[1] > -1))
|
||||
fout << "background " << param.bkg[0] << " " << param.bkg[1] << endl;
|
||||
if ((param.bkg_range[0] > -1) && (param.bkg_range[1] > -1))
|
||||
fout << "background " << param.bkg_range[0] << " " << param.bkg_range[1] << endl;
|
||||
fout << "#--------------------------------------------------------------" << endl;
|
||||
}
|
||||
}
|
||||
@ -1027,7 +1046,7 @@ int main(int argc, char *argv[])
|
||||
startupHandler->SetStartupOptions(startup_options);
|
||||
|
||||
// defines the raw time-domain data vector
|
||||
PPrepFourier data(startupParam.bkg, startupParam.packing);
|
||||
PPrepFourier data(startupParam.packing, startupParam.bkg_range, startupParam.bkg);
|
||||
|
||||
// load msr-file(s)
|
||||
vector<PMsrHandler*> msrHandler;
|
||||
@ -1146,6 +1165,24 @@ int main(int argc, char *argv[])
|
||||
if (fourierBlock->fFourierBlockPresent) {
|
||||
// get units
|
||||
unitTag = fourierBlock->fUnits;
|
||||
if (startupParam.fourierUnits.BeginsWith("??")) {
|
||||
switch (unitTag) {
|
||||
case FOURIER_UNIT_GAUSS:
|
||||
startupParam.fourierUnits = TString("Gauss");
|
||||
break;
|
||||
case FOURIER_UNIT_TESLA:
|
||||
startupParam.fourierUnits = TString("Tesla");
|
||||
break;
|
||||
case FOURIER_UNIT_FREQ:
|
||||
startupParam.fourierUnits = TString("MHz");
|
||||
break;
|
||||
case FOURIER_UNIT_CYCLES:
|
||||
startupParam.fourierUnits = TString("Mc/s");
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
// get fourier power
|
||||
if (startupParam.fourierPower == -1) { // no Fourier power given from the command line, hence check FOURIER block
|
||||
if (fourierBlock->fFourierPower > 1)
|
||||
@ -1277,9 +1314,6 @@ int main(int argc, char *argv[])
|
||||
// calculate background levels and subtract them from the data
|
||||
data.DoBkgCorrection();
|
||||
|
||||
// do the time domain filtering now
|
||||
data.DoFiltering();
|
||||
|
||||
// do lifetime correction
|
||||
if (startupParam.lifetimecorrection != 0.0)
|
||||
data.DoLifeTimeCorrection(startupParam.lifetimecorrection);
|
||||
@ -1321,7 +1355,13 @@ int main(int argc, char *argv[])
|
||||
fourier[i]->Transform(apodTag);
|
||||
}
|
||||
double end = millitime();
|
||||
cout << endl << "debug> after FFT. calculation time: " << (end-start)/1.0e3 << " (sec)." << endl;
|
||||
cout << endl << "info> after FFT. calculation time: " << (end-start)/1.0e3 << " (sec)." << endl;
|
||||
|
||||
// make sure that a Fourier range is provided, if not calculate one
|
||||
if ((startupParam.fourierRange[0] == -1.0) && (startupParam.fourierRange[1] == -1.0)) {
|
||||
startupParam.fourierRange[0] = 0.0;
|
||||
startupParam.fourierRange[1] = fourier[0]->GetMaxFreq();
|
||||
}
|
||||
|
||||
PFourierCanvas *fourierCanvas = 0;
|
||||
|
||||
|
||||
5
src/musredit/Makefile.am
Normal file
5
src/musredit/Makefile.am
Normal file
@ -0,0 +1,5 @@
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
CLEANFILES = *~ core
|
||||
|
||||
|
||||
@ -85,6 +85,8 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
|
||||
fKeyWord = eDefaultSavePath;
|
||||
} else if (qName == "title_from_data_file") {
|
||||
fKeyWord = eTitleFromDataFile;
|
||||
} else if (qName == "musrview_show_fourier") {
|
||||
fKeyWord = eMusrviewShowFourier;
|
||||
} else if (qName == "enable_musrt0") {
|
||||
fKeyWord = eEnableMusrT0;
|
||||
} else if (qName == "keep_minuit2_output") {
|
||||
@ -131,6 +133,8 @@ bool PAdminXMLParser::startElement( const QString&, const QString&,
|
||||
fKeyWord = eHelpStatistic;
|
||||
} else if (qName == "musr_web_msr2data") {
|
||||
fKeyWord = eHelpMsr2Data;
|
||||
} else if (qName == "musr_web_musrFT") {
|
||||
fKeyWord = eHelpMusrFT;
|
||||
} else if (qName == "chain_fit") {
|
||||
fKeyWord = eChainFit;
|
||||
} else if (qName == "write_data_header") {
|
||||
@ -240,6 +244,13 @@ bool PAdminXMLParser::characters(const QString& str)
|
||||
flag = false;
|
||||
fAdmin->setTitleFromDataFileFlag(flag);
|
||||
break;
|
||||
case eMusrviewShowFourier:
|
||||
if (str == "y")
|
||||
flag = true;
|
||||
else
|
||||
flag = false;
|
||||
fAdmin->setMusrviewShowFourierFlag(flag);
|
||||
break;
|
||||
case eEnableMusrT0:
|
||||
if (str == "y")
|
||||
flag = true;
|
||||
@ -338,6 +349,9 @@ bool PAdminXMLParser::characters(const QString& str)
|
||||
case eHelpMsr2Data:
|
||||
fAdmin->setHelpUrl("msr2data", str);
|
||||
break;
|
||||
case eHelpMusrFT:
|
||||
fAdmin->setHelpUrl("musrFT", str);
|
||||
break;
|
||||
case eChainFit:
|
||||
if (str == "y")
|
||||
flag = true;
|
||||
@ -598,6 +612,8 @@ PAdmin::PAdmin() : QObject()
|
||||
fInstitute = QString("");
|
||||
fFileFormat = QString("");
|
||||
|
||||
fMusrviewShowFourier = false;
|
||||
|
||||
fTitleFromDataFile = false;
|
||||
fEnableMusrT0 = false;
|
||||
fLifetimeCorrection = true;
|
||||
|
||||
@ -69,12 +69,12 @@ class PAdminXMLParser : public QXmlDefaultHandler
|
||||
|
||||
private:
|
||||
enum EAdminKeyWords {eEmpty, eTimeout, eKeepMinuit2Output, eDumpAscii, eDumpRoot,
|
||||
eTitleFromDataFile, eChisqPreRunBlock, eEstimateN0, eEnableMusrT0,
|
||||
eTitleFromDataFile, eChisqPreRunBlock, eEstimateN0, eMusrviewShowFourier, eEnableMusrT0,
|
||||
eFontName, eFontSize, eExecPath, eDefaultSavePath,
|
||||
eRecentFile, eBeamline, eInstitute, eFileFormat, eLifetimeCorrection, eMsrDefaultFilePath,
|
||||
eTheoFuncPixmapPath, eFunc, eFuncName, eFuncComment, eFuncLabel,
|
||||
eFuncPixmap, eFuncParams, eHelpMain, eHelpTitle, eHelpParameters, eHelpTheory, eHelpFunctions,
|
||||
eHelpRun, eHelpCommand, eHelpFourier, eHelpPlot, eHelpStatistic, eHelpMsr2Data,
|
||||
eHelpRun, eHelpCommand, eHelpFourier, eHelpPlot, eHelpStatistic, eHelpMsr2Data, eHelpMusrFT,
|
||||
eChainFit, eWriteDataHeader, eIgnoreDataHeaderInfo, eWriteColumnData,
|
||||
eRecreateDataFile, eOpenFileAfterFitting, eCreateMsrFileOnly, eFitOnly, eGlobal, eGlobalPlus};
|
||||
|
||||
@ -118,6 +118,7 @@ class PAdmin : public QObject
|
||||
QString getExecPath() { return fExecPath; }
|
||||
QString getDefaultSavePath() { return fDefaultSavePath; }
|
||||
bool getTitleFromDataFileFlag() { return fTitleFromDataFile; }
|
||||
bool getMusrviewShowFourierFlag() { return fMusrviewShowFourier; }
|
||||
bool getEnableMusrT0Flag() { return fEnableMusrT0; }
|
||||
bool getKeepMinuit2OutputFlag() { return fKeepMinuit2Output; }
|
||||
bool getDumpAsciiFlag() { return fDumpAscii; }
|
||||
@ -139,6 +140,7 @@ class PAdmin : public QObject
|
||||
|
||||
void setTimeout(const int ival) { fTimeout = ival; }
|
||||
void setTitleFromDataFileFlag(const bool flag) { fTitleFromDataFile = flag; }
|
||||
void setMusrviewShowFourierFlag(const bool flag) { fMusrviewShowFourier = flag; }
|
||||
void setEnableMusrT0Flag(const bool flag) { fEnableMusrT0 = flag; }
|
||||
void setKeepMinuit2OutputFlag(const bool flag) { fKeepMinuit2Output = flag; }
|
||||
void setDumpAsciiFlag(const bool flag) { fDumpAscii = flag; }
|
||||
@ -180,6 +182,7 @@ class PAdmin : public QObject
|
||||
|
||||
QVector<QString> fRecentFile; ///< keep vector of recent path-file names
|
||||
|
||||
bool fMusrviewShowFourier; ///< flag indicating if musrview should show at startup data (=false) or Fourier of data (=true).
|
||||
bool fKeepMinuit2Output; ///< flag indicating if the Minuit2 output shall be kept (default: no)
|
||||
bool fDumpAscii; ///< flag indicating if musrfit shall make an ascii-dump file (for debugging purposes, default: no).
|
||||
bool fDumpRoot; ///< flag indicating if musrfit shall make an root-dump file (for debugging purposes, default: no).
|
||||
|
||||
565
src/musredit/PGetMusrFTOptionsDialog.cpp
Normal file
565
src/musredit/PGetMusrFTOptionsDialog.cpp
Normal file
@ -0,0 +1,565 @@
|
||||
/****************************************************************************
|
||||
|
||||
PGetMusrFTOptionsDialog.cpp
|
||||
|
||||
Author: Andreas Suter
|
||||
e-mail: andreas.suter@psi.ch
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2009-2015 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
|
||||
#include <QLineEdit>
|
||||
#include <QValidator>
|
||||
#include <QComboBox>
|
||||
#include <QMessageBox>
|
||||
|
||||
#include "PHelp.h"
|
||||
|
||||
#include "PGetMusrFTOptionsDialog.h"
|
||||
|
||||
#define MUSRFT_OPT_UNDEF 0
|
||||
#define MUSRFT_OPT_REAL 1
|
||||
#define MUSRFT_OPT_IMAG 2
|
||||
#define MUSRFT_OPT_REAL_AND_IMAG 3
|
||||
#define MUSRFT_OPT_POWER 4
|
||||
#define MUSRFT_OPT_PHASE 5
|
||||
|
||||
#define MUSRFT_APOD_UNDEF 0
|
||||
#define MUSRFT_APOD_WEAK 1
|
||||
#define MUSRFT_APOD_MEDIUM 2
|
||||
#define MUSRFT_APOD_STRONG 3
|
||||
|
||||
#define MUSRFT_UNIT_UNDEF 0
|
||||
#define MUSRFT_UNIT_GAUSS 1
|
||||
#define MUSRFT_UNIT_TESLA 2
|
||||
#define MUSRFT_UNIT_FREQ 3
|
||||
#define MUSRFT_UNIT_CYCLE 4
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Constructor.
|
||||
*
|
||||
* \param currentMsrFile path-file name of the currently active msr-file in musredit
|
||||
* \param prevCmd list of the last (potential) previously call.
|
||||
* \param helpUrl help url for the asymmetry run block
|
||||
*/
|
||||
PGetMusrFTOptionsDialog::PGetMusrFTOptionsDialog(QString currentMsrFile, QStringList &prevCmd, const QString helpUrl) :
|
||||
fCurrentMsrFileName(currentMsrFile), fHelpUrl(helpUrl)
|
||||
{
|
||||
setupUi(this);
|
||||
setModal(true);
|
||||
|
||||
fBkgRangeStartBin_lineEdit->setValidator( new QIntValidator(fBkgRangeStartBin_lineEdit) );
|
||||
fBkgRangeEndBin_lineEdit->setValidator( new QIntValidator(fBkgRangeEndBin_lineEdit) );
|
||||
fPacking_lineEdit->setValidator( new QIntValidator(fPacking_lineEdit) );
|
||||
fTimeRangeStart_lineEdit->setValidator( new QDoubleValidator(fTimeRangeStart_lineEdit) );
|
||||
fTimeRangeEnd_lineEdit->setValidator( new QDoubleValidator(fTimeRangeEnd_lineEdit) );
|
||||
fFourierPower_lineEdit->setValidator( new QIntValidator(fFourierPower_lineEdit) );
|
||||
fLifetimeCorrection_lineEdit->setValidator( new QDoubleValidator(fLifetimeCorrection_lineEdit) );
|
||||
fFourierRangeStart_lineEdit->setValidator( new QDoubleValidator(fFourierRangeStart_lineEdit) );
|
||||
fFourierRangeEnd_lineEdit->setValidator( new QDoubleValidator(fFourierRangeEnd_lineEdit) );
|
||||
fPacking_lineEdit->setText("1");
|
||||
|
||||
// populate dialog with the previous cmd call
|
||||
bool msrTag = true;
|
||||
QString str, str1, line;
|
||||
int idx;
|
||||
for (int i=0; i<prevCmd.size(); i++) {
|
||||
// collect msr-file-names
|
||||
if (msrTag) {
|
||||
line = "";
|
||||
while (prevCmd[i].contains(".msr") && (i<prevCmd.size())) {
|
||||
// split msr-file path-name into path and name
|
||||
str = prevCmd[i];
|
||||
idx = str.lastIndexOf("/");
|
||||
str1 = str;
|
||||
str.remove(idx, str.length()-idx);
|
||||
fMsrFilePaths << str;
|
||||
str1.remove(0, idx+1);
|
||||
fMsrFileNames << str1;
|
||||
line += str1 + " ";
|
||||
i++;
|
||||
}
|
||||
line.remove(line.length()-1, 1);
|
||||
fMsrFileSelector_lineEdit->setText(line);
|
||||
msrTag = false;
|
||||
}
|
||||
// collect data-file-names
|
||||
if (prevCmd[i] == "-df") {
|
||||
i++;
|
||||
line = "";
|
||||
while (!prevCmd[i].startsWith("-") && (i<prevCmd.size())) {
|
||||
// split msr-file path-name into path and name
|
||||
str = prevCmd[i];
|
||||
idx = str.lastIndexOf("/");
|
||||
str1 = str;
|
||||
str.remove(idx, str.length()-idx);
|
||||
fDataFilePaths << str;
|
||||
str1.remove(0, idx+1);
|
||||
fDataFileNames << str1;
|
||||
line += str1 + " ";
|
||||
i++;
|
||||
}
|
||||
line.remove(line.length()-1, 1);
|
||||
fDataFileSelector_lineEdit->setText(line);
|
||||
}
|
||||
// background-range
|
||||
if (prevCmd[i] == "-br") {
|
||||
fBkgRangeStartBin_lineEdit->setText(prevCmd[++i]);
|
||||
fBkgRangeEndBin_lineEdit->setText(prevCmd[++i]);
|
||||
}
|
||||
// fourier-option
|
||||
if (prevCmd[i] == "-fo") {
|
||||
if (prevCmd[i+1] == "real")
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_REAL);
|
||||
else if (prevCmd[i+1] == "imag")
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_IMAG);
|
||||
else if (prevCmd[i+1] == "real+imag")
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_REAL_AND_IMAG);
|
||||
else if (prevCmd[i+1] == "power")
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_POWER);
|
||||
else if (prevCmd[i+1] == "phase")
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_PHASE);
|
||||
else
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_UNDEF);
|
||||
i++;
|
||||
}
|
||||
// apodization
|
||||
if (prevCmd[i] == "-ap") {
|
||||
if (prevCmd[i+1] == "weak")
|
||||
fApodization_comboBox->setCurrentIndex(MUSRFT_APOD_WEAK);
|
||||
else if (prevCmd[i+1] == "medium")
|
||||
fApodization_comboBox->setCurrentIndex(MUSRFT_APOD_MEDIUM);
|
||||
else if (prevCmd[i+1] == "strong")
|
||||
fApodization_comboBox->setCurrentIndex(MUSRFT_APOD_STRONG);
|
||||
else
|
||||
fApodization_comboBox->setCurrentIndex(MUSRFT_APOD_UNDEF);
|
||||
i++;
|
||||
}
|
||||
// fourier-power
|
||||
if (prevCmd[i] == "-fp") {
|
||||
fFourierPower_lineEdit->setText(prevCmd[++i]);
|
||||
}
|
||||
// units
|
||||
if (prevCmd[i] == "-u") {
|
||||
if (prevCmd[i+1] == "Gauss")
|
||||
fFourierUnits_comboBox->setCurrentIndex(MUSRFT_UNIT_GAUSS);
|
||||
else if (prevCmd[i+1] == "Tesla")
|
||||
fFourierUnits_comboBox->setCurrentIndex(MUSRFT_UNIT_TESLA);
|
||||
else if (prevCmd[i+1] == "MHz")
|
||||
fFourierUnits_comboBox->setCurrentIndex(MUSRFT_UNIT_FREQ);
|
||||
else if (prevCmd[i+1] == "Mc/s")
|
||||
fFourierUnits_comboBox->setCurrentIndex(MUSRFT_UNIT_CYCLE);
|
||||
else
|
||||
fFourierUnits_comboBox->setCurrentIndex(MUSRFT_UNIT_UNDEF);
|
||||
i++;
|
||||
}
|
||||
// phase
|
||||
if (prevCmd[i] == "-ph") {
|
||||
// NOT YET IMPLEMENTED
|
||||
}
|
||||
// fourier-range
|
||||
if (prevCmd[i] == "-fr") {
|
||||
fFourierRangeStart_lineEdit->setText(prevCmd[++i]);
|
||||
fFourierRangeEnd_lineEdit->setText(prevCmd[++i]);
|
||||
}
|
||||
// time-range
|
||||
if (prevCmd[i] == "-tr") {
|
||||
fTimeRangeStart_lineEdit->setText(prevCmd[++i]);
|
||||
fTimeRangeEnd_lineEdit->setText(prevCmd[++i]);
|
||||
}
|
||||
// histo list
|
||||
if (prevCmd[i] == "--histo") {
|
||||
i++;
|
||||
line = "";
|
||||
while (!prevCmd[i].startsWith("-") && (i<prevCmd.size())) {
|
||||
line += prevCmd[i++] + " ";
|
||||
}
|
||||
line.remove(line.length()-1, 1);
|
||||
fHistoList_lineEdit->setText(line);
|
||||
}
|
||||
// average tag
|
||||
if (prevCmd[i] == "-a") {
|
||||
fAveragedView_checkBox->setCheckState(Qt::Checked);
|
||||
}
|
||||
// t0 list
|
||||
if (prevCmd[i] == "--t0") {
|
||||
i++;
|
||||
line = "";
|
||||
while (!prevCmd[i].startsWith("-") && (i<prevCmd.size())) {
|
||||
line += prevCmd[i++] + " ";
|
||||
}
|
||||
line.remove(line.length()-1, 1);
|
||||
fT0_lineEdit->setText(line);
|
||||
}
|
||||
// packing
|
||||
if (prevCmd[i] == "-pa") {
|
||||
fPacking_lineEdit->setText(prevCmd[++i]);
|
||||
}
|
||||
// title
|
||||
if (prevCmd[i] == "--title") {
|
||||
fFourierTitle_lineEdit->setText(prevCmd[i+1]);
|
||||
}
|
||||
// create msr-file tag
|
||||
if (prevCmd[i] == "--create-msr-file") {
|
||||
fCreateMsrFileName = prevCmd[++i];
|
||||
fCreateMsrFile_checkBox->setCheckState(Qt::Checked);
|
||||
}
|
||||
// lifetime correction
|
||||
if (prevCmd[i] == "-lc") {
|
||||
fLifetimeCorrection_lineEdit->setText(prevCmd[++i]);
|
||||
}
|
||||
}
|
||||
|
||||
// connect all necessary single and slots
|
||||
connect(fCurrentMsrFile_checkBox, SIGNAL( stateChanged(int) ), this, SLOT( currentMsrFileTagChanged(int) ) );
|
||||
connect(fAllMsrFiles_checkBox, SIGNAL( stateChanged(int) ), this, SLOT( allMsrFileTagChanged(int) ) );
|
||||
connect(fMsrFileSelector_pushButton, SIGNAL( clicked() ), this, SLOT( selectMsrFileNames() ) );
|
||||
connect(fDataFileSelector_pushButton, SIGNAL( clicked() ), this, SLOT( selectDataFileNames() ) );
|
||||
connect(fCreateMsrFile_checkBox, SIGNAL( stateChanged(int) ), this, SLOT( createMsrFileChanged(int) ) );
|
||||
connect(fMsrFileNameClear_pushButton, SIGNAL (clicked() ), this, SLOT( clearMsrFileNames() ) );
|
||||
connect(fDataFileNameClear_pushButton, SIGNAL (clicked() ), this, SLOT( clearDataFileNames() ) );
|
||||
connect(fResetAll_pushButton, SIGNAL( clicked() ), this, SLOT( resetAll() ) );
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>returns the musrFT command line options.
|
||||
*/
|
||||
QStringList PGetMusrFTOptionsDialog::getMusrFTOptions()
|
||||
{
|
||||
QStringList cmd;
|
||||
QString str("");
|
||||
QStringList strList;
|
||||
|
||||
// check if currently active msr-file shall be used
|
||||
if (fCurrentMsrFile_checkBox->checkState() == Qt::Checked) {
|
||||
cmd << fCurrentMsrFileName;
|
||||
} else {
|
||||
// msr-files
|
||||
for (int i=0; i<fMsrFilePaths.size(); i++) {
|
||||
str = fMsrFilePaths[i]+"/"+fMsrFileNames[i];
|
||||
cmd << str;
|
||||
}
|
||||
|
||||
// data-files
|
||||
if (fDataFilePaths.size() > 0) {
|
||||
cmd << "-df";
|
||||
for (int i=0; i<fDataFilePaths.size(); i++) {
|
||||
str = fDataFilePaths[i]+"/"+fDataFileNames[i];
|
||||
cmd << str;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// background range
|
||||
if ((fBkgRangeStartBin_lineEdit->text().length() > 0) && (fBkgRangeEndBin_lineEdit->text().length() > 0)) {
|
||||
cmd << "-br";
|
||||
cmd << fBkgRangeStartBin_lineEdit->text();
|
||||
cmd << fBkgRangeEndBin_lineEdit->text();
|
||||
}
|
||||
|
||||
// background values
|
||||
if (fBkgList_lineEdit->text().length() > 0) {
|
||||
|
||||
}
|
||||
|
||||
// fourier-option
|
||||
if (fFourierOption_comboBox->currentText() != "UnDef") {
|
||||
cmd << "-fo";
|
||||
cmd << fFourierOption_comboBox->currentText();
|
||||
}
|
||||
|
||||
// apodization
|
||||
cmd << "-ap";
|
||||
cmd << fApodization_comboBox->currentText();
|
||||
|
||||
// fourier-power
|
||||
if (fFourierPower_lineEdit->text().length() > 0) {
|
||||
cmd << "-fp";
|
||||
cmd << fFourierPower_lineEdit->text();
|
||||
}
|
||||
|
||||
// units
|
||||
if (fFourierUnits_comboBox->currentText() != "UnDef") {
|
||||
cmd << "-u";
|
||||
cmd << fFourierUnits_comboBox->currentText();
|
||||
}
|
||||
|
||||
// phase
|
||||
|
||||
// fourier-range
|
||||
if ((fFourierRangeStart_lineEdit->text().length() > 0) && (fFourierRangeEnd_lineEdit->text().length() > 0)) {
|
||||
cmd << "-fr";
|
||||
cmd << fFourierRangeStart_lineEdit->text();
|
||||
cmd << fFourierRangeEnd_lineEdit->text();
|
||||
}
|
||||
|
||||
// time-range
|
||||
if ((fTimeRangeStart_lineEdit->text().length() > 0) && (fTimeRangeEnd_lineEdit->text().length() > 0)) {
|
||||
cmd << "-tr";
|
||||
cmd << fTimeRangeStart_lineEdit->text();
|
||||
cmd << fTimeRangeEnd_lineEdit->text();
|
||||
}
|
||||
|
||||
// histo list
|
||||
if (fHistoList_lineEdit->text().length() > 0) {
|
||||
cmd << "--histo";
|
||||
strList = fHistoList_lineEdit->text().split(" ", QString::SkipEmptyParts);
|
||||
for (int i=0; i<strList.size(); i++)
|
||||
cmd << strList[i];
|
||||
}
|
||||
|
||||
// averaged view
|
||||
if (fAveragedView_checkBox->checkState() == Qt::Checked)
|
||||
cmd << "-a";
|
||||
|
||||
// t0 list
|
||||
if (fT0_lineEdit->text().length() > 0) {
|
||||
cmd << "--t0";
|
||||
strList = fT0_lineEdit->text().split(" ", QString::SkipEmptyParts);
|
||||
for (int i=0; i<strList.size(); i++)
|
||||
cmd << strList[i];
|
||||
}
|
||||
|
||||
// packing
|
||||
if (fPacking_lineEdit->text().length() > 0) {
|
||||
cmd << "-pa";
|
||||
cmd << fPacking_lineEdit->text();
|
||||
}
|
||||
|
||||
// title
|
||||
if (fFourierTitle_lineEdit->text().length() > 0) {
|
||||
cmd << "--title";
|
||||
cmd << fFourierTitle_lineEdit->text();
|
||||
}
|
||||
|
||||
// create-msr-file
|
||||
if (fCreateMsrFile_checkBox->checkState() == Qt::Checked) {
|
||||
cmd << "--create-msr-file";
|
||||
cmd << fCreateMsrFileName;
|
||||
}
|
||||
|
||||
// lifetimecorrection
|
||||
if (fLifetimeCorrection_lineEdit->text().length() > 0) {
|
||||
cmd << "-lc";
|
||||
cmd << fLifetimeCorrection_lineEdit->text();
|
||||
}
|
||||
|
||||
return cmd;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when fCurrentMsrFile_checkBox is checked/unchecked. If checked, it will clean up
|
||||
* the msr-file path-file list and the data-file path-file list.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::currentMsrFileTagChanged(int state)
|
||||
{
|
||||
if (state == Qt::Checked) {
|
||||
fAllMsrFiles_checkBox->setCheckState(Qt::Unchecked);
|
||||
|
||||
// remove all msr-data-file-names and data-path-file-names
|
||||
fMsrFilePaths.clear();
|
||||
fMsrFileNames.clear();
|
||||
fMsrFileSelector_lineEdit->setText("");
|
||||
fDataFilePaths.clear();
|
||||
fDataFileNames.clear();
|
||||
fDataFileSelector_lineEdit->setText("");
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when fAllMsrFiles_checkBox is checked/unchecked. Currently it has no functionality.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::allMsrFileTagChanged(int state)
|
||||
{
|
||||
if (state == Qt::Checked) {
|
||||
fCurrentMsrFile_checkBox->setCheckState(Qt::Unchecked);
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when fMsrFileSelector_pushButton is clicked. Collects the msr-file path-name list.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::selectMsrFileNames()
|
||||
{
|
||||
QStringList flns = QFileDialog::getOpenFileNames( this, tr("Open msr-File(s)"), tr( "./" ),
|
||||
tr( "msr-Files (*.msr);;All Files (*)" ));
|
||||
|
||||
QString str(""), str1("");
|
||||
int idx;
|
||||
if (flns.size() > 0) {
|
||||
// delete already present elements
|
||||
fMsrFilePaths.clear();
|
||||
fMsrFileNames.clear();
|
||||
|
||||
// split path-name into path and name
|
||||
for (int i=0; i<flns.size(); i++) {
|
||||
str = flns[i];
|
||||
idx = str.lastIndexOf("/");
|
||||
str1 = str;
|
||||
str.remove(idx, str.length()-idx);
|
||||
fMsrFilePaths << str;
|
||||
str1.remove(0, idx+1);
|
||||
fMsrFileNames << str1;
|
||||
}
|
||||
|
||||
// populate fMsrFileSelector_lineEdit
|
||||
str = QString("");
|
||||
for (int i=0; i<fMsrFileNames.size()-1; i++) {
|
||||
str += fMsrFileNames[i] + " ";
|
||||
}
|
||||
str += fMsrFileNames[fMsrFileNames.size()-1];
|
||||
|
||||
fMsrFileSelector_lineEdit->setText(str);
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when the fMsrFileNameClear_pushButton is clicked.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::clearMsrFileNames()
|
||||
{
|
||||
fMsrFileSelector_lineEdit->setText("");
|
||||
fMsrFilePaths.clear();
|
||||
fMsrFileNames.clear();
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when fDataFileSelector_pushButton is clicked. Collects the data-file path-name list.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::selectDataFileNames()
|
||||
{
|
||||
QStringList flns = QFileDialog::getOpenFileNames( this, tr("Open msr-File(s)"), tr( "./" ),
|
||||
tr( "data-Files (*.root *.bin *.msr *.nxs *.mdu);;All Files (*)" ));
|
||||
|
||||
QString str(""), str1("");
|
||||
int idx;
|
||||
if (flns.size() > 0) {
|
||||
// delete already present elements
|
||||
fDataFilePaths.clear();
|
||||
fDataFileNames.clear();
|
||||
|
||||
// split path-name into path and name
|
||||
for (int i=0; i<flns.size(); i++) {
|
||||
str = flns[i];
|
||||
idx = str.lastIndexOf("/");
|
||||
str1 = str;
|
||||
str.remove(idx, str.length()-idx);
|
||||
fDataFilePaths << str;
|
||||
str1.remove(0, idx+1);
|
||||
fDataFileNames << str1;
|
||||
}
|
||||
|
||||
// populate fMsrFileSelector_lineEdit
|
||||
str = QString("");
|
||||
for (int i=0; i<fDataFileNames.size()-1; i++) {
|
||||
str += fDataFileNames[i] + " ";
|
||||
}
|
||||
str += fDataFileNames[fDataFileNames.size()-1];
|
||||
|
||||
fDataFileSelector_lineEdit->setText(str);
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when the fDataFileNameClear_pushButton is clicked.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::clearDataFileNames()
|
||||
{
|
||||
fDataFileSelector_lineEdit->setText("");
|
||||
fDataFilePaths.clear();
|
||||
fDataFileNames.clear();
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when the create-msr-file tag has changed
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::createMsrFileChanged(int state)
|
||||
{
|
||||
if (state == Qt::Checked) {
|
||||
fCreateMsrFileName = QFileDialog::getSaveFileName(this, tr("Create msr-file"), "./", tr("msr-Files (*.msr);;All Files (*)"));
|
||||
if (fCreateMsrFileName.length() == 0)
|
||||
fCreateMsrFile_checkBox->setCheckState(Qt::Unchecked);
|
||||
} else {
|
||||
fCreateMsrFileName = "";
|
||||
}
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>SLOT called when the Reset All button is pressed. Will remove all settings.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::resetAll()
|
||||
{
|
||||
fCurrentMsrFile_checkBox->setCheckState(Qt::Unchecked);
|
||||
fAllMsrFiles_checkBox->setCheckState(Qt::Unchecked);
|
||||
fMsrFilePaths.clear();
|
||||
fMsrFileNames.clear();
|
||||
fMsrFileSelector_lineEdit->setText("");
|
||||
fDataFilePaths.clear();
|
||||
fDataFileNames.clear();
|
||||
fDataFileSelector_lineEdit->setText("");
|
||||
fBkgRangeStartBin_lineEdit->setText("");
|
||||
fBkgRangeEndBin_lineEdit->setText("");
|
||||
fBkgList_lineEdit->setText("");
|
||||
fApodization_comboBox->setCurrentIndex(MUSRFT_APOD_UNDEF);
|
||||
fPacking_lineEdit->setText("");
|
||||
fTimeRangeStart_lineEdit->setText("");
|
||||
fTimeRangeEnd_lineEdit->setText("");
|
||||
fHistoList_lineEdit->setText("");
|
||||
fT0_lineEdit->setText("");
|
||||
fFourierOption_comboBox->setCurrentIndex(MUSRFT_OPT_UNDEF);
|
||||
fFourierUnits_comboBox->setCurrentIndex(MUSRFT_UNIT_UNDEF);
|
||||
fFourierPower_lineEdit->setText("");
|
||||
fLifetimeCorrection_lineEdit->setText("");
|
||||
fFourierRangeStart_lineEdit->setText("");
|
||||
fFourierRangeEnd_lineEdit->setText("");
|
||||
fAveragedView_checkBox->setCheckState(Qt::Unchecked);
|
||||
fCreateMsrFile_checkBox->setCheckState(Qt::Unchecked);
|
||||
fFourierTitle_lineEdit->setText("");
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Generates a help content window showing the description for musrFT.
|
||||
*/
|
||||
void PGetMusrFTOptionsDialog::helpContent()
|
||||
{
|
||||
if (fHelpUrl.isEmpty()) {
|
||||
QMessageBox::information(this, "**INFO**", "Will eventually show a help window");
|
||||
} else {
|
||||
#ifdef _WIN32GCC
|
||||
QMessageBox::information(this, "**INFO**", "If a newer Qt version was available, a help window would be shown!");
|
||||
#else
|
||||
PHelp *help = new PHelp(fHelpUrl);
|
||||
help->show();
|
||||
#endif // _WIN32GCC
|
||||
}
|
||||
}
|
||||
69
src/musredit/PGetMusrFTOptionsDialog.h
Normal file
69
src/musredit/PGetMusrFTOptionsDialog.h
Normal file
@ -0,0 +1,69 @@
|
||||
/****************************************************************************
|
||||
|
||||
PGetMusrFTOptionsDialog.h
|
||||
|
||||
Author: Andreas Suter
|
||||
e-mail: andreas.suter@psi.ch
|
||||
|
||||
*****************************************************************************/
|
||||
|
||||
/***************************************************************************
|
||||
* Copyright (C) 2010-2015 by Andreas Suter *
|
||||
* andreas.suter@psi.ch *
|
||||
* *
|
||||
* This program is free software; you can redistribute it and/or modify *
|
||||
* it under the terms of the GNU General Public License as published by *
|
||||
* the Free Software Foundation; either version 2 of the License, or *
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
* This program is distributed in the hope that it will be useful, *
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
|
||||
* GNU General Public License for more details. *
|
||||
* *
|
||||
* You should have received a copy of the GNU General Public License *
|
||||
* along with this program; if not, write to the *
|
||||
* Free Software Foundation, Inc., *
|
||||
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
|
||||
***************************************************************************/
|
||||
|
||||
#ifndef _PGETMUSRFTOPTIONSDIALOG_H_
|
||||
#define _PGETMUSRFTOPTIONSDIALOG_H_
|
||||
|
||||
#include <QDialog>
|
||||
#include <QStringList>
|
||||
|
||||
#include "ui_PGetMusrFTOptionsDialog.h"
|
||||
|
||||
class PGetMusrFTOptionsDialog : public QDialog, private Ui::PGetMusrFTOptionsDialog
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
PGetMusrFTOptionsDialog(QString currentMsrFile, QStringList &prevCmd, const QString helpUrl);
|
||||
QStringList getMusrFTOptions();
|
||||
|
||||
public slots:
|
||||
void helpContent();
|
||||
|
||||
private slots:
|
||||
void currentMsrFileTagChanged(int state);
|
||||
void allMsrFileTagChanged(int state);
|
||||
void selectMsrFileNames();
|
||||
void clearMsrFileNames();
|
||||
void selectDataFileNames();
|
||||
void clearDataFileNames();
|
||||
void createMsrFileChanged(int state);
|
||||
void resetAll();
|
||||
|
||||
private:
|
||||
QStringList fMsrFilePaths; ///< list keeping all the paths from the msr-file path-name list
|
||||
QStringList fMsrFileNames; ///< list keeping all the names from the msr-file path-name list
|
||||
QStringList fDataFilePaths; ///< list keeping all the paths from the data-file path-name list
|
||||
QStringList fDataFileNames; ///< list keeping all the names from the data-file path-name list
|
||||
QString fCreateMsrFileName; ///< keeps the msr-path-file name for msr-file creation
|
||||
QString fCurrentMsrFileName; ///< keeps the msr-path-file name of the currently active msr-file in musredit.
|
||||
QString fHelpUrl; ///< help url for the asymmetry run block
|
||||
};
|
||||
|
||||
#endif // _PGETMUSRFTOPTIONSDIALOG_H_
|
||||
@ -61,6 +61,7 @@ PPrefsDialog::PPrefsDialog(PAdmin *admin) : fAdmin(admin)
|
||||
fEnableMusrT0_checkBox->setChecked(fAdmin->getEnableMusrT0Flag());
|
||||
fPerRunBlockChisq_checkBox->setChecked(fAdmin->getChisqPerRunBlockFlag());
|
||||
fEstimateN0_checkBox->setChecked(fAdmin->getEstimateN0Flag());
|
||||
fFourier_checkBox->setChecked(fAdmin->getMusrviewShowFourierFlag());
|
||||
|
||||
fTimeout_lineEdit->setText(QString("%1").arg(fAdmin->getTimeout()));
|
||||
fTimeout_lineEdit->setValidator(new QIntValidator(fTimeout_lineEdit));
|
||||
|
||||
@ -46,6 +46,7 @@ class PPrefsDialog : public QDialog, private Ui::PPrefsDialog
|
||||
public:
|
||||
PPrefsDialog(PAdmin *admin);
|
||||
|
||||
bool getMusrviewShowFourierFlag() { return fFourier_checkBox->isChecked(); }
|
||||
bool getKeepMinuit2OutputFlag() { return fKeepMn2Output_checkBox->isChecked(); }
|
||||
bool getTitleFromDataFileFlag() { return fTitleFromData_checkBox->isChecked(); }
|
||||
bool getEnableMusrT0Flag() { return fEnableMusrT0_checkBox->isChecked(); }
|
||||
|
||||
@ -55,6 +55,7 @@ using namespace std;
|
||||
#include <QTextBlock>
|
||||
#include <QTextDocumentFragment>
|
||||
#include <QTextList>
|
||||
#include <QProcess>
|
||||
|
||||
#include <QtDebug>
|
||||
|
||||
@ -68,6 +69,7 @@ using namespace std;
|
||||
#include "PFitOutputHandler.h"
|
||||
#include "PDumpOutputHandler.h"
|
||||
#include "PPrefsDialog.h"
|
||||
#include "PGetMusrFTOptionsDialog.h"
|
||||
#include "PGetDefaultDialog.h"
|
||||
#include "PMusrEditAbout.h"
|
||||
#include "PMsr2DataDialog.h"
|
||||
@ -550,6 +552,12 @@ void PTextEdit::setupMusrActions()
|
||||
menu->addAction(fMusrT0Action);
|
||||
fMusrT0Action->setEnabled(fAdmin->getEnableMusrT0Flag());
|
||||
|
||||
a = new QAction( QIcon( QPixmap (":/images/musrFT.xpm") ), tr( "Raw Fourier" ), this );
|
||||
a->setStatusTip( tr("Start musrFT") );
|
||||
connect( a, SIGNAL( triggered() ), this, SLOT( musrFT() ) );
|
||||
tb->addAction(a);
|
||||
menu->addAction(a);
|
||||
|
||||
a = new QAction( QIcon( QPixmap( ":/images/musrprefs.xpm" ) ), tr( "&Preferences" ), this );
|
||||
a->setStatusTip( tr("Show Preferences") );
|
||||
connect( a, SIGNAL( triggered() ), this, SLOT( musrPrefs() ) );
|
||||
@ -2183,7 +2191,10 @@ void PTextEdit::musrView()
|
||||
str = *fFilenames.find( currentEditor() );
|
||||
QString numStr;
|
||||
numStr.setNum(fAdmin->getTimeout());
|
||||
cmd += str + "\" --timeout " + numStr + " &";
|
||||
cmd += str + "\" --timeout " + numStr;
|
||||
if (fAdmin->getMusrviewShowFourierFlag())
|
||||
cmd += " -f ";
|
||||
cmd += " &";
|
||||
|
||||
int status=system(cmd.toLatin1());
|
||||
}
|
||||
@ -2223,6 +2234,33 @@ void PTextEdit::musrT0()
|
||||
QString fln = *fFilenames.find( currentEditor() );
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Calls musrFT via selection/option dialog. It will ask the user if he/she wants to overwrite some
|
||||
* of the default settings.
|
||||
*/
|
||||
void PTextEdit::musrFT()
|
||||
{
|
||||
|
||||
PGetMusrFTOptionsDialog *dlg = new PGetMusrFTOptionsDialog(*fFilenames.find( currentEditor() ), fMusrFTPrevCmd, fAdmin->getHelpUrl("musrFT"));
|
||||
|
||||
if (dlg == 0) {
|
||||
QMessageBox::critical(this, "**ERROR** musrFT", "Couldn't invoke musrFT Options Dialog.");
|
||||
return;
|
||||
}
|
||||
|
||||
if (dlg->exec() == QDialog::Accepted) {
|
||||
fMusrFTPrevCmd = dlg->getMusrFTOptions();
|
||||
QProcess proc(this);
|
||||
proc.setStandardOutputFile("musrFT.log");
|
||||
proc.setStandardErrorFile("musrFT.log");
|
||||
proc.startDetached("musrFT", fMusrFTPrevCmd);
|
||||
}
|
||||
|
||||
delete dlg;
|
||||
dlg = 0;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------------------------------------
|
||||
/**
|
||||
* <p>Calls the preferences dialog which is used to set some global options.
|
||||
@ -2237,6 +2275,7 @@ void PTextEdit::musrPrefs()
|
||||
}
|
||||
|
||||
if (dlg->exec() == QDialog::Accepted) {
|
||||
fAdmin->setMusrviewShowFourierFlag(dlg->getMusrviewShowFourierFlag());
|
||||
fAdmin->setKeepMinuit2OutputFlag(dlg->getKeepMinuit2OutputFlag());
|
||||
fAdmin->setTitleFromDataFileFlag(dlg->getTitleFromDataFileFlag());
|
||||
fAdmin->setEnableMusrT0Flag(dlg->getEnableMusrT0Flag());
|
||||
|
||||
@ -131,6 +131,7 @@ private slots:
|
||||
void musrMsr2Data();
|
||||
void musrView();
|
||||
void musrT0();
|
||||
void musrFT();
|
||||
void musrPrefs();
|
||||
void musrSwapMsrMlog();
|
||||
void musrDump();
|
||||
@ -157,6 +158,7 @@ private:
|
||||
bool fFileSystemWatcherActive; ///< flag to enable/disable the file system watcher
|
||||
QTimer fFileSystemWatcherTimeout; ///< timer used to re-enable file system watcher. Needed to delay the re-enabling
|
||||
QString fLastDirInUse; ///< string holding the path from where the last file was loaded.
|
||||
QStringList fMusrFTPrevCmd;
|
||||
|
||||
QAction *fMusrT0Action;
|
||||
|
||||
|
||||
842
src/musredit/forms/PGetMusrFTOptionsDialog.ui
Normal file
842
src/musredit/forms/PGetMusrFTOptionsDialog.ui
Normal file
@ -0,0 +1,842 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>PGetMusrFTOptionsDialog</class>
|
||||
<widget class="QDialog" name="PGetMusrFTOptionsDialog">
|
||||
<property name="windowModality">
|
||||
<enum>Qt::WindowModal</enum>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>711</width>
|
||||
<height>650</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>musrFT Options</string>
|
||||
</property>
|
||||
<widget class="QGroupBox" name="fFourier_groupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>400</y>
|
||||
<width>671</width>
|
||||
<height>201</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string> Fourier </string>
|
||||
</property>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>30</y>
|
||||
<width>641</width>
|
||||
<height>156</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_22">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_13">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierOptions_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Options</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="fFourierOption_comboBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>UnDef</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>real</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>imag</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>real+imag</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>power</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>phase</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_6">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>218</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_14">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierUnits_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Units</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="fFourierUnits_comboBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>UnDef</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Gauss</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Tesla</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>MHz</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>Mc/s</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_23">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_19">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierPower_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Power</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fFourierPower_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_5">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>88</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_17">
|
||||
<item>
|
||||
<widget class="QLabel" name="fLifetimeCorrection_label">
|
||||
<property name="text">
|
||||
<string>Lifetime Correction</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fLifetimeCorrection_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_20">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierRange_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Range</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_16">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierRangeStart_label">
|
||||
<property name="text">
|
||||
<string>Start</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fFourierRangeStart_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_15">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierRangeEnd_label">
|
||||
<property name="text">
|
||||
<string>End</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fFourierRangeEnd_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_3">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>118</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_18">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fAveragedView_checkBox">
|
||||
<property name="text">
|
||||
<string>Averaged View</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_7">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>278</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fCreateMsrFile_checkBox">
|
||||
<property name="text">
|
||||
<string>Create msr-File</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_21">
|
||||
<item>
|
||||
<widget class="QLabel" name="fFourierTitle_label">
|
||||
<property name="text">
|
||||
<string>Title</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fFourierTitle_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QGroupBox" name="fHistoInfo_groupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>160</y>
|
||||
<width>671</width>
|
||||
<height>231</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string> Histo Info </string>
|
||||
</property>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>30</y>
|
||||
<width>641</width>
|
||||
<height>188</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<item>
|
||||
<widget class="QLabel" name="fBkgRange_label">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Background Range (in Bins)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="fBkgStartBin_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:600; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">StartBin</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fBkgRangeStartBin_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<item>
|
||||
<widget class="QLabel" name="fBkgEndBin_label">
|
||||
<property name="text">
|
||||
<string>EndBin:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fBkgRangeEndBin_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_4">
|
||||
<item>
|
||||
<widget class="QLabel" name="fBkgList_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Background List</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fBkgList_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_7">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_6">
|
||||
<item>
|
||||
<widget class="QLabel" name="fApodization_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Apodization</span></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="fApodization_comboBox">
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>none</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>weak</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>medium</string>
|
||||
</property>
|
||||
</item>
|
||||
<item>
|
||||
<property name="text">
|
||||
<string>strong</string>
|
||||
</property>
|
||||
</item>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_5">
|
||||
<item>
|
||||
<widget class="QLabel" name="fPacking_label">
|
||||
<property name="text">
|
||||
<string>Packing</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fPacking_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>168</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_10">
|
||||
<item>
|
||||
<widget class="QLabel" name="fTimeRange_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:600; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Time Range (usec)</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_2">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_9">
|
||||
<item>
|
||||
<widget class="QLabel" name="fTimeRangeStart_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:600; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Start</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fTimeRangeStart_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_8">
|
||||
<item>
|
||||
<widget class="QLabel" name="fTimeRangeEnd_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:600; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">End</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fTimeRangeEnd_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_11">
|
||||
<item>
|
||||
<widget class="QLabel" name="fHistoList_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:600; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Histo List</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fHistoList_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_12">
|
||||
<item>
|
||||
<widget class="QLabel" name="fT0_label">
|
||||
<property name="text">
|
||||
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
|
||||
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
|
||||
p, li { white-space: pre-wrap; }
|
||||
</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:600; font-style:normal;">
|
||||
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">T0's</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fT0_lineEdit"/>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QGroupBox" name="fFileSelection_groupBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>10</y>
|
||||
<width>671</width>
|
||||
<height>141</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="title">
|
||||
<string>File Selection</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>19</x>
|
||||
<y>31</y>
|
||||
<width>641</width>
|
||||
<height>96</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_3">
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_27">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fCurrentMsrFile_checkBox">
|
||||
<property name="text">
|
||||
<string>Current msr-File</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QCheckBox" name="fAllMsrFiles_checkBox">
|
||||
<property name="text">
|
||||
<string>ALL msr-Files</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_8">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>318</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_25">
|
||||
<item>
|
||||
<widget class="QPushButton" name="fMsrFileSelector_pushButton">
|
||||
<property name="text">
|
||||
<string>Select msr-File(s)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fMsrFileSelector_lineEdit"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="fMsrFileNameClear_pushButton">
|
||||
<property name="toolTip">
|
||||
<string>clear msr-file name list</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Clear</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_26">
|
||||
<item>
|
||||
<widget class="QPushButton" name="fDataFileSelector_pushButton">
|
||||
<property name="text">
|
||||
<string>Select data-File(s)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="fDataFileSelector_lineEdit"/>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="fDataFileNameClear_pushButton">
|
||||
<property name="toolTip">
|
||||
<string>clear data-file name list</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Clear</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>610</y>
|
||||
<width>671</width>
|
||||
<height>29</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_24">
|
||||
<item>
|
||||
<widget class="QPushButton" name="fHelp_pushButton">
|
||||
<property name="text">
|
||||
<string>Help</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_4">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>78</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="fResetAll_pushButton">
|
||||
<property name="font">
|
||||
<font>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Reset All</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="horizontalSpacer_9">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>20</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<tabstops>
|
||||
<tabstop>fCurrentMsrFile_checkBox</tabstop>
|
||||
<tabstop>fAllMsrFiles_checkBox</tabstop>
|
||||
<tabstop>fMsrFileSelector_pushButton</tabstop>
|
||||
<tabstop>fMsrFileSelector_lineEdit</tabstop>
|
||||
<tabstop>fMsrFileNameClear_pushButton</tabstop>
|
||||
<tabstop>fDataFileSelector_pushButton</tabstop>
|
||||
<tabstop>fDataFileSelector_lineEdit</tabstop>
|
||||
<tabstop>fDataFileNameClear_pushButton</tabstop>
|
||||
<tabstop>fBkgRangeStartBin_lineEdit</tabstop>
|
||||
<tabstop>fBkgRangeEndBin_lineEdit</tabstop>
|
||||
<tabstop>fBkgList_lineEdit</tabstop>
|
||||
<tabstop>fApodization_comboBox</tabstop>
|
||||
<tabstop>fPacking_lineEdit</tabstop>
|
||||
<tabstop>fTimeRangeStart_lineEdit</tabstop>
|
||||
<tabstop>fTimeRangeEnd_lineEdit</tabstop>
|
||||
<tabstop>fHistoList_lineEdit</tabstop>
|
||||
<tabstop>fT0_lineEdit</tabstop>
|
||||
<tabstop>fFourierOption_comboBox</tabstop>
|
||||
<tabstop>fFourierUnits_comboBox</tabstop>
|
||||
<tabstop>fFourierPower_lineEdit</tabstop>
|
||||
<tabstop>fLifetimeCorrection_lineEdit</tabstop>
|
||||
<tabstop>fFourierRangeStart_lineEdit</tabstop>
|
||||
<tabstop>fFourierRangeEnd_lineEdit</tabstop>
|
||||
<tabstop>fAveragedView_checkBox</tabstop>
|
||||
<tabstop>fCreateMsrFile_checkBox</tabstop>
|
||||
<tabstop>fFourierTitle_lineEdit</tabstop>
|
||||
<tabstop>fResetAll_pushButton</tabstop>
|
||||
<tabstop>fHelp_pushButton</tabstop>
|
||||
<tabstop>buttonBox</tabstop>
|
||||
</tabstops>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>PGetMusrFTOptionsDialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>683</x>
|
||||
<y>611</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>PGetMusrFTOptionsDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>689</x>
|
||||
<y>611</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>286</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>fHelp_pushButton</sender>
|
||||
<signal>clicked()</signal>
|
||||
<receiver>PGetMusrFTOptionsDialog</receiver>
|
||||
<slot>helpContent()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>85</x>
|
||||
<y>627</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>147</x>
|
||||
<y>624</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<slots>
|
||||
<slot>helpContent()</slot>
|
||||
</slots>
|
||||
</ui>
|
||||
@ -33,9 +33,9 @@
|
||||
<item>
|
||||
<widget class="QTabWidget" name="fTabWidget">
|
||||
<property name="currentIndex">
|
||||
<number>1</number>
|
||||
<number>0</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tab_3">
|
||||
<widget class="QWidget" name="fGeneral_tab">
|
||||
<attribute name="title">
|
||||
<string>general</string>
|
||||
</attribute>
|
||||
@ -75,7 +75,7 @@
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab">
|
||||
<widget class="QWidget" name="fMusrfit_tab">
|
||||
<attribute name="title">
|
||||
<string>musrfit</string>
|
||||
</attribute>
|
||||
@ -158,7 +158,25 @@
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab_2">
|
||||
<widget class="QWidget" name="fMusrview_tab">
|
||||
<attribute name="title">
|
||||
<string>musrview</string>
|
||||
</attribute>
|
||||
<widget class="QCheckBox" name="fFourier_checkBox">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>141</width>
|
||||
<height>22</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>start with Fourier</string>
|
||||
</property>
|
||||
</widget>
|
||||
</widget>
|
||||
<widget class="QWidget" name="fMusrt0_tab">
|
||||
<attribute name="title">
|
||||
<string>musrt0</string>
|
||||
</attribute>
|
||||
|
||||
28
src/musredit/images/musrFT.xpm
Normal file
28
src/musredit/images/musrFT.xpm
Normal file
@ -0,0 +1,28 @@
|
||||
/* XPM */
|
||||
static char *dummy[]={
|
||||
"22 22 3 1",
|
||||
". c None",
|
||||
"# c #000000",
|
||||
"a c #ff0000",
|
||||
"..##....###...##......",
|
||||
"......................",
|
||||
"######################",
|
||||
"......................",
|
||||
".........a............",
|
||||
".........a............",
|
||||
".........a............",
|
||||
".........a............",
|
||||
".........aa...........",
|
||||
"........aaa...........",
|
||||
"........aaa...........",
|
||||
"........a.a...........",
|
||||
"........a.a...........",
|
||||
".......aa.aa..........",
|
||||
".......aa..aa.........",
|
||||
"a.aaa..a....aaa...aa..",
|
||||
"aa.aaa.a......aaa.aaaa",
|
||||
"......a..........aa...",
|
||||
"######################",
|
||||
"......................",
|
||||
".#######.####..####...",
|
||||
"......................"};
|
||||
@ -83,6 +83,7 @@ HEADERS = musredit.h \
|
||||
PFitOutputHandler.h \
|
||||
PDumpOutputHandler.h \
|
||||
PPrefsDialog.h \
|
||||
PGetMusrFTOptionsDialog.h \
|
||||
PGetDefaultDialog.h \
|
||||
PGetTitleBlockDialog.h \
|
||||
PGetParameterBlockDialog.h \
|
||||
@ -106,6 +107,7 @@ SOURCES = PHelp.cpp \
|
||||
PFitOutputHandler.cpp \
|
||||
PDumpOutputHandler.cpp \
|
||||
PPrefsDialog.cpp \
|
||||
PGetMusrFTOptionsDialog.cpp \
|
||||
PGetDefaultDialog.cpp \
|
||||
PGetTitleBlockDialog.cpp \
|
||||
PGetParameterBlockDialog.cpp \
|
||||
@ -126,6 +128,7 @@ FORMS = forms/PFindDialog.ui \
|
||||
forms/PGetDefaultDialog.ui \
|
||||
forms/PMusrEditAbout.ui \
|
||||
forms/PPrefsDialog.ui \
|
||||
forms/PGetMusrFTOptionsDialog.ui \
|
||||
forms/PGetTitleBlockDialog.ui \
|
||||
forms/PGetParameterBlockDialog.ui \
|
||||
forms/PGetTheoryBlockDialog.ui \
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<RCC>
|
||||
<qresource>
|
||||
<qresource prefix="/">
|
||||
<file>images/editcopy.xpm</file>
|
||||
<file>images/editcut.xpm</file>
|
||||
<file>images/editfind.xpm</file>
|
||||
@ -22,6 +22,7 @@
|
||||
<file>images/musrswap.xpm</file>
|
||||
<file>images/musrt0.xpm</file>
|
||||
<file>images/musrview.xpm</file>
|
||||
<file>images/musrFT.xpm</file>
|
||||
<file>images/musrdump.xpm</file>
|
||||
<file>latex_images/abragam.png</file>
|
||||
<file>latex_images/asymmetry.png</file>
|
||||
|
||||
@ -31,6 +31,7 @@
|
||||
<musr_web_plot>file://@DOCDIR@/html/user/MUSR/MusrFit.html#ThePlotBlock</musr_web_plot>
|
||||
<musr_web_statistic>file://@DOCDIR@/html/user/MUSR/MusrFit.html#TheStatisticBlock</musr_web_statistic>
|
||||
<musr_web_msr2data>file://@DOCDIR@/html/user/MUSR/Msr2Data.html</musr_web_msr2data>
|
||||
<musr_web_musrFT>file://@DOCDIR@/html/user/MUSR/MusrFit.html#A_2.3_musrFT</musr_web_musrFT>
|
||||
</help_section>
|
||||
<font_settings>
|
||||
<font_name>Courier New</font_name>
|
||||
|
||||
5
src/musrgui/Makefile.am
Normal file
5
src/musrgui/Makefile.am
Normal file
@ -0,0 +1,5 @@
|
||||
## Process this file with automake to create Makefile.in
|
||||
|
||||
CLEANFILES = *~ core
|
||||
|
||||
|
||||
@ -57,9 +57,12 @@ using namespace std;
|
||||
*/
|
||||
void musrview_syntax()
|
||||
{
|
||||
cout << endl << "usage: musrview <msr-file> [--<graphic-format-extension>] [--timeout <timeout>] | --version | --help";
|
||||
cout << endl << "usage: musrview <msr-file> [Options]";
|
||||
cout << endl << " <msr-file>: msr/mlog input file";
|
||||
cout << endl << " 'musrview <msr-file>' will execute musrview";
|
||||
cout << endl << " Options:";
|
||||
cout << endl << " --help : display this help and exit.";
|
||||
cout << endl << " --version : output version information and exit.";
|
||||
cout << endl << " -f, --fourier: will directly present the Fourier transform of the <msr-file>.";
|
||||
cout << endl << " --<graphic-format-extension>: ";
|
||||
cout << endl << " will produce a graphics-output-file without starting a root session.";
|
||||
cout << endl << " the name is based on the <msr-file>, e.g. 3310.msr -> 3310_0.png";
|
||||
@ -71,9 +74,6 @@ void musrview_syntax()
|
||||
cout << endl << " will produce an ascii dump of the data and fit as plotted.";
|
||||
cout << endl << " --timeout <timeout>: <timeout> given in seconds after which musrview terminates.";
|
||||
cout << endl << " If <timeout> <= 0, no timeout will take place. Default <timeout> is 0.";
|
||||
cout << endl;
|
||||
cout << endl << " 'musrview' or 'musrview --help' will show this help";
|
||||
cout << endl << " 'musrview --version' will print the musrview version";
|
||||
cout << endl << endl;
|
||||
}
|
||||
|
||||
@ -101,6 +101,7 @@ int main(int argc, char *argv[])
|
||||
int status;
|
||||
bool success = true;
|
||||
char fileName[128];
|
||||
bool fourier = false;
|
||||
bool graphicsOutput = false;
|
||||
bool asciiOutput = false;
|
||||
char graphicsExtension[128];
|
||||
@ -132,6 +133,8 @@ int main(int argc, char *argv[])
|
||||
} else if (!strcmp(argv[i], "--help")) {
|
||||
show_syntax = true;
|
||||
break;
|
||||
} else if (!strcmp(argv[i], "-f") || !strcmp(argv[i], "--fourier")) {
|
||||
fourier = true;
|
||||
} else if (!strcmp(argv[i], "--eps") || !strcmp(argv[i], "--pdf") || !strcmp(argv[i], "--gif") ||
|
||||
!strcmp(argv[i], "--jpg") || !strcmp(argv[i], "--png") || !strcmp(argv[i], "--svg") ||
|
||||
!strcmp(argv[i], "--xpm") || !strcmp(argv[i], "--root")) {
|
||||
@ -304,10 +307,13 @@ int main(int argc, char *argv[])
|
||||
startupHandler->GetFourierDefaults(),
|
||||
startupHandler->GetMarkerList(),
|
||||
startupHandler->GetColorList(),
|
||||
graphicsOutput||asciiOutput);
|
||||
graphicsOutput||asciiOutput,
|
||||
fourier);
|
||||
else
|
||||
musrCanvas = new PMusrCanvas(i, msrHandler->GetMsrTitle()->Data(),
|
||||
10+i*100, 10+i*100, 800, 600, graphicsOutput||asciiOutput);
|
||||
10+i*100, 10+i*100, 800, 600,
|
||||
graphicsOutput||asciiOutput,
|
||||
fourier);
|
||||
|
||||
if (!musrCanvas->IsValid()) {
|
||||
cerr << endl << ">> musrview **SEVERE ERROR** Couldn't invoke all necessary objects, will quit.";
|
||||
@ -340,8 +346,12 @@ int main(int argc, char *argv[])
|
||||
}
|
||||
|
||||
if (asciiOutput) {
|
||||
// generate export data file name
|
||||
TString str(fileName);
|
||||
str.Remove(str.Last('.'));
|
||||
str += ".dat";
|
||||
// save data in batch mode
|
||||
musrCanvas->SaveDataAscii();
|
||||
musrCanvas->ExportData(str.Data());
|
||||
musrCanvas->Done(0);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user