From afd4bdb792ac26629efe5d4e783978acb9a4416f Mon Sep 17 00:00:00 2001
From: Andreas Suter <andreas.suter@psi.ch>
Date: Fri, 8 Jun 2018 15:56:24 +0200
Subject: [PATCH] update docu.

---
 doc/html/user/MUSR/BmwLibs.html               |  20 +-
 doc/html/user/MUSR/CiteMusrFit.html           |  18 +-
 doc/html/user/MUSR/LibFitPofB.html            |  14 +-
 doc/html/user/MUSR/LibZFRelaxation.html       |  22 +-
 doc/html/user/MUSR/Msr2Data.html              |  28 +-
 doc/html/user/MUSR/MusrFit.html               |  28 +-
 .../user/MUSR/MusrFitAcknowledgements.html    |  22 +-
 doc/html/user/MUSR/MusrFitSetup.html          | 254 ++++++++++++++----
 doc/html/user/MUSR/MusrFitSetupDKS.html       |  72 +++--
 doc/html/user/MUSR/MusrGui.html               |  28 +-
 doc/html/user/MUSR/MusrRoot.html              |  30 +--
 doc/html/user/MUSR/QuickStart.html            |  18 +-
 doc/html/user/MUSR/TutorialSingleHisto.html   |  26 +-
 doc/html/user/MUSR/WebHome.html               |  20 +-
 14 files changed, 390 insertions(+), 210 deletions(-)
diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html
index 091724f1..cde4b3cb 100644
--- a/doc/html/user/MUSR/BmwLibs.html
+++ b/doc/html/user/MUSR/BmwLibs.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:26 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:27 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1503504096" type="application/x-wiki" title="edit BmwLibs" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1528465298" type="application/x-wiki" title="edit BmwLibs" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<base  /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -105,10 +105,10 @@
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
 <!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
-<!--JQUERYPLUGIN::COMMENT-->
 <!--JavascriptFiles/foswikiPref-->
+<!--JQUERYPLUGIN::COMMENT-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
+<!--JavascriptFiles/foswikiForm-->
 <!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -149,5 +149,5 @@ Topic revision:  <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:27 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:27 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/CiteMusrFit.html b/doc/html/user/MUSR/CiteMusrFit.html
index 5afdc2e7..49429215 100644
--- a/doc/html/user/MUSR/CiteMusrFit.html
+++ b/doc/html/user/MUSR/CiteMusrFit.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:19 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,13 +14,13 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1503504095" type="application/x-wiki" title="edit CiteMusrFit" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1528465297" type="application/x-wiki" title="edit CiteMusrFit" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<base  /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
 <link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 <link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
@@ -102,14 +102,14 @@
 <!--<![endif]-->
 <!--JQUERYPLUGIN-->
 <!--JQUERYPLUGIN::MIGRATE-->
-<!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
+<!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 <!--JavascriptFiles/foswikiPref-->
+<!--JavascriptFiles/foswikiForm-->
 <!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JQUERYPLUGIN::COMMENT-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -153,5 +153,5 @@ Topic revision:  <span class='patternRevInfo'>22 Aug 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:19 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/LibFitPofB.html b/doc/html/user/MUSR/LibFitPofB.html
index 57f6d630..2e6ab790 100644
--- a/doc/html/user/MUSR/LibFitPofB.html
+++ b/doc/html/user/MUSR/LibFitPofB.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:20 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:21 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1503504096" type="application/x-wiki" title="edit LibFitPofB" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1528465298" type="application/x-wiki" title="edit LibFitPofB" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
 <base  /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
 <link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -105,13 +105,13 @@
 <!--JQUERYPLUGIN::FOSWIKI-->
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiPref-->
 <!--JavascriptFiles/foswikiForm-->
+<!--JavascriptFiles/foswikiPref-->
 <!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT-->
 <!--JQUERYPLUGIN::METADATA-->
 
 <!--JQUERYPLUGIN::CHILI-->
+<!--JQUERYPLUGIN::COMMENT-->
 <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -428,5 +428,5 @@ Topic revision:  <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:26 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:26 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/LibZFRelaxation.html b/doc/html/user/MUSR/LibZFRelaxation.html
index ef12ce50..eeee0b02 100644
--- a/doc/html/user/MUSR/LibZFRelaxation.html
+++ b/doc/html/user/MUSR/LibZFRelaxation.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:43 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:45 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1503504093" type="application/x-wiki" title="edit LibZFRelaxation" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1528465295" type="application/x-wiki" title="edit LibZFRelaxation" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<base  /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 <link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -105,14 +105,14 @@
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
 <!--JQUERYPLUGIN::METADATA-->
-<!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
 <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
-<!--JavascriptFiles/foswikiPref-->
-<!--PatternSkin/pattern-->
+<!--JavascriptFiles/foswikiString-->
 <!--JQUERYPLUGIN::COMMENT-->
+<!--JavascriptFiles/foswikiPref-->
 
-<!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JQUERYPLUGIN::CHILI-->
+<!--JavascriptFiles/foswikiForm-->
+<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -233,5 +233,5 @@ Topic revision:  <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:45 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:47 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/Msr2Data.html b/doc/html/user/MUSR/Msr2Data.html
index 7ccec2f0..0dd02f28 100644
--- a/doc/html/user/MUSR/Msr2Data.html
+++ b/doc/html/user/MUSR/Msr2Data.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:19 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,13 +14,11 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1503504095" type="application/x-wiki" title="edit Msr2Data" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1528465298" type="application/x-wiki" title="edit Msr2Data" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
-<style class='head TABLEPLUGIN_default' type="text/css" media="all">
+<base  /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all">
 body .foswikiTable {border-width:1px}
 body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
 body .foswikiTable td {border-style:solid none; vertical-align:top}
@@ -34,9 +32,6 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
 body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
 body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
 </style><!--TABLEPLUGIN_default-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
 <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
 body .foswikiTable#tableMsr2Data1 td {vertical-align:middle; vertical-align:top}
 body .foswikiTable#tableMsr2Data1 td.foswikiTableCol0 {text-align:left}
@@ -55,7 +50,12 @@ body .foswikiTable#tableMsr2Data1 th.foswikiSortedCol {background-color:#eeeeee}
 body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
 body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
 </style><!--TABLEPLUGIN_specific-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -138,16 +138,16 @@ body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
+<!--JQUERYPLUGIN::COMMENT-->
 <!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiPref-->
-<!--JQUERYPLUGIN::COMMENT-->
-<!--JavascriptFiles/foswikiForm-->
-<!--PatternSkin/pattern-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 <!--JQUERYPLUGIN::METADATA-->
 
 <!--JQUERYPLUGIN::CHILI-->
 <!--JQUERYPLUGIN::TWISTY-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JavascriptFiles/foswikiForm-->
+<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -435,5 +435,5 @@ Topic revision:  <span class='patternRevInfo'>28 Apr 2016, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:20 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/MusrFit.html b/doc/html/user/MUSR/MusrFit.html
index 1f6e256e..b786e9a8 100644
--- a/doc/html/user/MUSR/MusrFit.html
+++ b/doc/html/user/MUSR/MusrFit.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:56 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,15 +14,11 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1503504095" type="application/x-wiki" title="edit MusrFit" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1528465297" type="application/x-wiki" title="edit MusrFit" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<style class='head TABLEPLUGIN_default' type="text/css" media="all">
+<base  /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all">
 body .foswikiTable {border-width:1px}
 body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
 body .foswikiTable td {border-style:solid none; vertical-align:top}
@@ -36,7 +32,11 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
 body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
 body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
 </style><!--TABLEPLUGIN_default-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -120,14 +120,14 @@ body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-col
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
 <!--JQUERYPLUGIN::METADATA-->
-<!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 
 <!--JQUERYPLUGIN::CHILI-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
+<!--JQUERYPLUGIN::COMMENT-->
+<!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiPref-->
-<!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JavascriptFiles/foswikiForm-->
+<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -1770,5 +1770,5 @@ Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:19 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:20 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/MusrFitAcknowledgements.html b/doc/html/user/MUSR/MusrFitAcknowledgements.html
index 65379b62..c59f9df9 100644
--- a/doc/html/user/MUSR/MusrFitAcknowledgements.html
+++ b/doc/html/user/MUSR/MusrFitAcknowledgements.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:56 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1503504094" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1528465297" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<base  /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -104,12 +104,12 @@
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
-<!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
+<!--JQUERYPLUGIN::COMMENT-->
 <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
+<!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiPref-->
-<!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JavascriptFiles/foswikiForm-->
+<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -148,5 +148,5 @@ Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:56 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html
index 88862323..4292e7ff 100644
--- a/doc/html/user/MUSR/MusrFitSetup.html
+++ b/doc/html/user/MUSR/MusrFitSetup.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:56 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1503504094" type="application/x-wiki" title="edit MusrFitSetup" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1528465297" type="application/x-wiki" title="edit MusrFitSetup" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<base  /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -104,15 +104,15 @@
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
-<!--JQUERYPLUGIN::METADATA-->
+<!--JQUERYPLUGIN::COMMENT-->
 <!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
+<!--JavascriptFiles/foswikiPref-->
+<!--JQUERYPLUGIN::METADATA-->
 
 <!--JQUERYPLUGIN::CHILI-->
-<!--JavascriptFiles/foswikiPref-->
-<!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JavascriptFiles/foswikiForm-->
+<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -134,7 +134,11 @@
 </li> <li> <a href="MusrFitSetup.html#A_3.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 3.1.2  Installation of NeXus requirements (optional) </a>
 </li> <li> <a href="MusrFitSetup.html#A_3.1.3_61_61ROOT_61_61"> 3.1.3 ROOT </a>
 </li></ul> 
-</li> <li> <a href="MusrFitSetup.html#A_3.2_61_61musrfit_61_61"> 3.2  musrfit </a>
+</li> <li> <a href="MusrFitSetup.html#A_3.2_61_61musrfit_61_61"> 3.2  musrfit </a> <ul>
+<li> <a href="MusrFitSetup.html#A_3.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 3.2.1  musrfit build with automake </a>
+</li> <li> <a href="MusrFitSetup.html#A_3.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 3.2.2  musrfit build with cmake </a>
+</li> <li> <a href="MusrFitSetup.html#A_3.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 3.2.3  musrfit last step of the installation </a>
+</li></ul> 
 </li> <li> <a href="MusrFitSetup.html#A_3.3_61_61musredit_61_61"> 3.3  musredit </a>
 </li> <li> <a href="MusrFitSetup.html#A_3.4_61_61musrgui_61_61_40obsolete_41"> 3.4  musrgui (obsolete) </a>
 </li> <li> <a href="MusrFitSetup.html#A_3.5_Check_of_the_installation"> 3.5  Check of the installation </a>
@@ -145,7 +149,11 @@
 </li> <li> <a href="MusrFitSetup.html#A_4.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 4.1.2  Installation of NeXus requirements (optional) </a>
 </li> <li> <a href="MusrFitSetup.html#A_4.1.3_61_61ROOT_61_61"> 4.1.3 ROOT </a>
 </li></ul> 
-</li> <li> <a href="MusrFitSetup.html#A_4.2_61_61musrfit_61_61"> 4.2  musrfit </a>
+</li> <li> <a href="MusrFitSetup.html#A_4.2_61_61musrfit_61_61"> 4.2  musrfit </a> <ul>
+<li> <a href="MusrFitSetup.html#A_4.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 4.2.1  musrfit build with automake </a>
+</li> <li> <a href="MusrFitSetup.html#A_4.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 4.2.2  musrfit build with cmake </a>
+</li> <li> <a href="MusrFitSetup.html#A_4.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 4.2.3  musrfit last step of the installation </a>
+</li></ul> 
 </li> <li> <a href="MusrFitSetup.html#A_4.3_61_61musredit_61_61"> 4.3  musredit </a>
 </li> <li> <a href="MusrFitSetup.html#A_4.4_61_61musrgui_61_61"> 4.4  musrgui </a>
 </li> <li> <a href="MusrFitSetup.html#A_4.5_Check_of_the_installation"> 4.5  Check of the installation </a>
@@ -170,7 +178,11 @@
 </li> <li> <a href="MusrFitSetup.html#A_5.2.3.3_Setting_up_Environment_Variables_for_61_61ROOT_61_61_and_61_61musrfit_61_61"> 5.2.3.3  Setting up Environment Variables for ROOT and musrfit </a>
 </li></ul> 
 </li></ul> 
-</li> <li> <a href="MusrFitSetup.html#A_5.3_61_61musrfit_61_61"> 5.3  musrfit </a>
+</li> <li> <a href="MusrFitSetup.html#A_5.3_61_61musrfit_61_61"> 5.3  musrfit </a> <ul>
+<li> <a href="MusrFitSetup.html#A_5.3.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 5.3.1  musrfit build with automake </a>
+</li> <li> <a href="MusrFitSetup.html#A_5.3.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 5.3.2  musrfit build with cmake </a>
+</li> <li> <a href="MusrFitSetup.html#A_5.3.3_61_61musrfit_61_61_last_step_of_the_installation"> 5.3.3  musrfit last step of the installation </a>
+</li></ul> 
 </li> <li> <a href="MusrFitSetup.html#A_5.4_61_61musredit_61_61"> 5.4  musredit </a>
 </li> <li> <a href="MusrFitSetup.html#A_5.5_61_61musrgui_61_61_40obsolete_41"> 5.5  musrgui (obsolete) </a>
 </li> <li> <a href="MusrFitSetup.html#A_5.6_Check_of_the_installation"> 5.6  Check of the installation </a>
@@ -183,22 +195,25 @@
 This page is intended to demonstrate for the interested user which steps are necessary to set up the <a href="http://www.gnu.org/philosophy/free-sw.html">free software</a> &mu;SR data analysis framework <code><a href="MusrFit.html">musrfit</a></code>. While the preferred way is to run the software on <strong>GNU/Linux</strong> or <strong>MacOS X</strong>, with some restrictions it can also be set up under <strong>MS Windows</strong> (cygwin, only for the very brave, probably it is easier for most MS Windows users to install a Virtual Machine running Linux). <span class='foswikiRedFG'>In case <code>musrfit</code> should be installed according to the description found on this page, the user is strongly encouraged to <em>read completely</em> each section dealing with the present installation step <em>before</em> starting the installation process!</span>
 <p></p>
 <span id="ReqSw"></span>
-Apart from <a href="http://gcc.gnu.org/">GCC, the GNU Compiler Collection</a> (gcc, g++), the GNU build tools <a href="http://www.gnu.org/software/autoconf/">autoconf</a>, <a href="http://www.gnu.org/software/automake/">automake</a> and <a href="http://www.gnu.org/software/libtool/">libtool</a> as well as the helper tool <a href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a> <code>musrfit</code> requires the installation of a few open-source libraries and programs including their header packages:
-   $ <a href="http://www.boost.org/">boost C++ libraries</a>: The powerful <code>Spirit</code> parser framework used by <code>musrfit</code> is included in that collection of libraries. <em>Required version &#8805; 1.33</em>
-   $ <a href="http://www.gnu.org/software/gsl/">GNU Scientific Library</a>: A numerical <code>C</code> and <code>C++</code> library which provides efficient implementations of various mathematical routines. <em>Required version &#8805; 1.9</em>
-   $ <a href="http://www.fftw.org/">FFTW</a>: A <code>C</code> implementation for the fast computation of discrete Fourier transforms. <em>Required version &#8805; 3.1</em>
-   $ <a href="http://root.cern.ch/">ROOT</a>: A <code>C++</code> data analysis framework developed at <a href="http://www.cern.ch/">CERN</a>. <em>Required version &#8805; 5.22</em>
-   $ <a href="http://xmlsoft.org/">libxml2</a>: The <code>XML</code> <code>C</code> parser and toolkit of <a href="http://www.gnome.org/">Gnome</a>. <em>Required version &#8805; 2.0</em>
+Apart from <a href="http://gcc.gnu.org/">GCC, the GNU Compiler Collection</a> (gcc, g++), the GNU build tools <a href="http://www.gnu.org/software/autoconf/">autoconf</a>, <a href="http://www.gnu.org/software/automake/">automake</a> and <a href="http://www.gnu.org/software/libtool/">libtool</a> are needed if you want to build <code>musrfit</code> via the automake toolchain, or <a href="https://cmake.org/">cmake</a> if you plan to use the cmake toolchain. Furthermore the helper tool <a href="http://pkg-config.freedesktop.org/wiki/">pkg-config</a> is needed and <code>musrfit</code> requires the installation of a few open-source libraries and programs including their header packages:
+<p></p> <dl>
+<dt> boost C++ libraries </dt><dd> The powerful <code>Spirit</code> parser framework used by <code>musrfit</code> is included in that collection of libraries. <em>Required version &#8805; 1.33</em> (see <a href="http://www.boost.org/">boost C++ libraries</a>)
+</dd> <dt> GNU Scientific Library </dt><dd> A numerical <code>C</code> and <code>C++</code> library which provides efficient implementations of various mathematical routines. <em>Required version &#8805; 1.9</em> (see <a href="http://www.gnu.org/software/gsl/">GNU Scientific Library</a>)
+</dd> <dt> FFTW </dt><dd> A <code>C</code> implementation for the fast computation of discrete Fourier transforms. <em>Required version &#8805; 3.1</em>   $ <a href="http://root.cern.ch/">ROOT</a>: A <code>C++</code> data analysis framework developed at <a href="http://www.cern.ch/">CERN</a>. <em>Required version &#8805; 5.22</em> (see <a href="http://www.fftw.org/">FFTW</a>)
+</dd> <dt> libxml2 </dt><dd> The <code>XML</code> <code>C</code> parser and toolkit of <a href="http://www.gnome.org/">Gnome</a>. <em>Required version &#8805; 2.0</em> (see <a href="http://xmlsoft.org/">libxml2</a>)
+</dd></dl> 
 <p></p>
 <span id="ReqSwNeXus"></span>
-Additionally, <span class='foswikiRedFG'>only if</span> <code>musrfit</code> should support reading of data files in the <code>NeXus</code> format the following libraries are needed:
-   $ <a href="http://www.hdfgroup.org/products/hdf4/">HDF4</a>: A library and multi-object file format for storing and managing data.
-   $ <a href="http://www.hdfgroup.org/HDF5/">HDF5</a>: A data model, library, and file format for storing and managing data.
-   $ <a href="http://www.minixml.org/">minixml</a>: A small <code>XML</code> library that can be used to read and write <code>XML</code> and <code>XML</code> -like data files. <em>Required version &#8805; 2.2</em>
-   $ <a href="http://www.nexusformat.org/">NeXus</a>: A common data format for neutron, x-ray, and muon science. <em>Required version &#8805; 4.4</em>
+Additionally, <span class='foswikiRedFG'>only if</span> <code>musrfit</code> should support reading of data files in the <code>NeXus</code> format the following libraries are needed: <dl>
+<dt> HDF4 </dt><dd> A library and multi-object file format for storing and managing data (see <a href="http://www.hdfgroup.org/products/hdf4/">HDF4</a>). HDF4 is "outdated" and its support will soon be dropped.
+</dd> <dt> HDF5 </dt><dd> A data model, library, and file format for storing and managing data (see <a href="http://www.hdfgroup.org/HDF5/">HDF5</a>).
+</dd> <dt> minixml </dt><dd> A small <code>XML</code> library that can be used to read and write <code>XML</code> and <code>XML</code> -like data files. <em>Required version &#8805; 2.2</em> (see <a href="http://www.minixml.org/">minixml</a>).
+</dd> <dt> NeXus </dt><dd> A common data format for neutron, x-ray, and muon science. <em>Required version &#8805; 4.4</em> (see <a href="http://www.nexusformat.org/">NeXus</a>).
+</dd></dl> 
 <p></p>
-If optionally the editor and graphical user interface <code><a href="MusrGui.html">musrgui</a></code> / <code><a href="MusrGui.html">musredit</a></code> is going to be installed there is one further requirement:
-   $ <a href="http://qt.nokia.com/">Qt</a>: A cross-platform application and user interface framework. <em>Required version &#8805; 3.3 &#38; &#8810; 4.0 (<code>musrgui</code>) <strong>OR</strong> &#8805; 4.6 (<code>musredit</code>)</em> 
+If optionally the editor and graphical user interface <code><a href="MusrGui.html">musrgui</a></code> / <code><a href="MusrGui.html">musredit</a></code> is going to be installed there is one further requirement: <dl>
+<dt> Qt </dt><dd> A cross-platform application and user interface framework. &#8805; 4.6 (<code>musredit</code>) (see <a href="http://qt.io/">Qt</a>).
+</dd></dl> 
 <p></p>
 Each of the following sections focusing on the installation of <code>musrfit</code> on the different operating systems will also give a brief introduction on the installation of the requirements before the actual <code>musrfit</code> installation is described.
 <p></p>
@@ -232,28 +247,27 @@ When dealing with a distribution that uses the dpkg/apt package manager like <a
 <p></p>
 For <strong>Qt4</strong>:
 <pre class="bash">
-&#36; apt-get install git cmake libboost-dev libgsl0-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-dev
+&#36; apt-get install git cmake libboost-dev libgsl-dev libfftw3-dev libxml2-dev libqt4-dev libqtwebkit-dev
 </pre>
 <p></p>
 For <strong>Qt5</strong>:
 <pre class="bash">
-&#36; apt-get install git cmake libboost-dev libgsl0-dev libfftw3-dev libxml2-dev qt5-default qtbase5-dev libqt5svg5-dev libqt5webkit5-dev
+&#36; apt-get install git cmake libboost-dev libgsl-dev libfftw3-dev libxml2-dev qt5-default qtbase5-dev libqt5svg5-dev libqt5webkit5-dev
 </pre>
 <p></p>
 Everyone should know best himself which is the way to install distribution software on the chosen distribution <img class='smily' src='../pub/Main/SmiliesPluginPSI/wink.gif' alt='wink' title='wink' />
 <p></p>
-In case the distribution does not include the required software it has to be compiled from the source files which normally means to download the source code from the corresponding website, to unpack the source tree and call the following from the shell:
-<pre class="bash">
-&#36; ./configure
-&#36; make
-&#36; make install
-</pre>
-In order to obtain some information about the possible options for the installation, calling <code>./configure --help</code> might give some useful hints. <br>
+In case the distribution does not include the required software it has to be compiled from the source files.
+This means either to download the source code from the corresponding website, or to clone the git repo. If you
+need to follow this line, please check the install details of the corresponding package.
+<p></p>
 For any further information on the standard installation of software, please refer to the web search engine of choice and ask for "install software on linux"...
 <p></p>
 <h3 id="A_3.1.2_Installation_of_61_61NeXus_61_61_requirements_40optional_41"> 3.1.2  Installation of <code><b>NeXus</b></code> requirements (optional) </h3>
 <span class='foswikiRedFG'>Only if</span> <code>musrfit</code> should support reading/writing data files in the <code>NeXus</code> format the further <a class="foswikiCurrentTopicLink" href="#ReqSwNeXus">required</a> software has to be set up. The required libraries and header files could either be available through the user's GNU/Linux distribution or if this is not the case, the packages can be installed from the source code. E.g. on Red Hat-like systems binary packages for <code>MXML</code>, <code>HDF4</code>, and <code>HDF5</code> might be called <code><b>mxml, mxml-devel, hdf, hdf-devel, hdf5, hdf5-devel</b></code>, on Debian-like systems <code><b>libmxml1, libmxml-dev, libhdf4-dev, libhdf5-dev</b></code>.
 <p></p>
+<strong>Note:</strong> <strong>HDF4</strong> support within <code>NeXus</code> will be dropped by <code>musrfit</code> in the near future. If you not urgently need to read old <code>ISIS</code> <code>NeXus</code> files, you safely can drop it.
+<p></p>
 <strong>Only <code><b>NeXus</b></code> Version &gt;= 4.4 is support!</strong>
 <p></p>
 Even though there might exist binary packages for the <code>NeXus</code> library, it is best to build and install it directly from the source code which can be found <a href="https://github.com/nexusformat/code">here</a>.
@@ -270,8 +284,11 @@ A brief instruction how to get <code>NeXus</code> compiled from source:
 &#36; # next we will build NeXus out-of-source
 &#36; mkdir build
 &#36; cd build
+# The next line only if HDF4 support is needed
 &#36; cmake -DENABLE&#95;HDF5&#61;1 -DENABLE&#95;HDF4&#61;1 -DENABLE&#95;MXML&#61;1 ../code
-&#36; make
+# The next line if HDF4 support is NOT needed
+&#36; cmake -DENABLE&#95;HDF5&#61;1 -DENABLE&#95;MXML&#61;1 ../code
+&#36; cmake --build ./ --clean-first
 &#36; # make install needs either to be carried out as root or sudo depending on your linux flavour.
 &#36; sudo make install
 </pre>
@@ -285,9 +302,9 @@ For RPM based systems (RedHat, Fedora, etc) this will likely to be <strong>libX1
 &#36; yum install libX11-devel libXft-devel libXpm-devel libXext-devel
 </pre>
 <p></p>
-For a dpkg/apt based system (Debian, Ubuntu, etc) this will likely to be <strong>libX11-dev</strong>, <strong>libxft-dev</strong>, <strong>libxpm-dev</strong>, and <strong>libxext-dev</strong>:
+For a dpkg/apt based system (Debian, Ubuntu, etc) this will likely to be <strong>libx11-dev</strong>, <strong>libxft-dev</strong>, <strong>libxpm-dev</strong>, and <strong>libxext-dev</strong>:
 <pre class="bash">
-&#36; apt-get install libX11-dev libxft-dev libxpm-dev libxext-dev
+&#36; apt-get install libx11-dev libxft-dev libxpm-dev libxext-dev
 </pre>
 <p></p>
 Also make sure that you have installed all required packages listed under <a class="foswikiCurrentTopicLink" href="#ReqSw">Required Software</a> (e.g. fftw, gsl, etc).
@@ -308,10 +325,10 @@ For the following it is assumed that <code>ROOT</code> shall be installed under
 &#36; mkdir root&#95;build
 &#36; cd root&#95;build
 &#36; cmake ../ -Dgminimal&#61;ON -Dasimage&#61;ON -Dmathmore&#61;On -Dminuit2&#61;ON -Dxml&#61;ON -DCMAKE&#95;INSTALL&#95;PREFIX&#61;../root&#95;exec
-&#36; # next will be the make. If running on a multicore CPU you can speed up tremendously by calling
-&#36; # make with the option -j &#60;number&#62;, where &#60;number&#62; is the number of threads which you want to give,
-&#36; # e.g. make -j8
-&#36; make
+&#36; # next will be the make called via cmake. If running on a multicore CPU you can speed up tremendously by calling
+&#36; # it with the option -j &#60;number&#62;, where &#60;number&#62; is the number of threads which you want to give,
+&#36; # e.g. cmake --build ./ --clean-first -- -j8
+&#36; cmake --build ./ --clean-first
 &#36; # as a last step of the ROOT build process we need to install it
 &#36; make install
 </pre>
@@ -331,7 +348,7 @@ If an update of <code>ROOT</code> is needed, simple do the following:<pre class=
 &#36; cd &#36;HOME/Apps/root
 &#36; git pull
 &#36; cd root&#95;build
-&#36; make
+&#36; cmake --build ./ --clean-first
 </pre>
 <p></p>
 <span id="MusrFitInstallation"></span>
@@ -354,23 +371,42 @@ or
 <strong>Note 1:</strong> <code>musrfit</code> has moved from svn to git. In case you still have an <em>old</em> svn version of musrfit, it is advised to remove it first. For svn users: for a smooth transition from svn to git, please check the following link: 
 <a href="http://www.git-tower.com/blog/git-for-subversion-users-cheat-sheet/">Git for Subversion Users - A Cheat Sheet</a>.
 <p></p>
-<strong>Note 2:</strong> after cloning the <code>musrfit</code> repo you will automatically be on the root6 branch. If you want to get legacy ROOT 5.34.xx support, you will needed to switch branches first.
+<strong>Note 2:</strong> after cloning the <code>musrfit</code> repo you will automatically be on the <strong>root6</strong> branch. If you want to get legacy ROOT 5.34.xx support, you will needed to switch branches first.
 <p></p>
+<strong>Update:</strong>
 If a local repository clone is already present (it needs to be newer than Dec. 2016), one can update it using:
 <pre class="bash">
 &#36; cd &#36;HOME/Apps/musrfit
 &#36; git pull
-&#36; # the new version now needs to be compiled and installed
+</pre>
+Now, depending whether you follow the automake or cmake tool chain you do
+<p></p>
+<strong>automake toolchain</strong>:
+<pre class="bash">
+&#36; make uninstall
+&#36; make clean
 &#36; make
 &#36; make install
 </pre>
 <p></p>
+or
+<p></p>
+<strong>cmake toolchain</strong>:
+<pre class="bash">
+&#36; cd build
+&#36; xargs rm &#60; install&#95;manifest.txt
+&#36; cmake --build ./ --clean-first
+&#36; make install
+</pre>
+<p></p>
 <span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.
 <p></p>
+<h3 id="A_3.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 3.2.1  <code><b>musrfit</b></code> build with <code><b>automake</b></code> </h3>
+<p></p>
 After the source-code extraction the <strong>autogen.sh</strong> script is called to prepare the build environment. If it has been executed successfully the <strong>configure</strong> script should be ready to collect all the information needed to create the Makefiles. <span class='foswikiRedFG'>If <code>musrfit</code> should support <code>NeXus</code> data files this has to be enabled by specifying the <strong>--enable-NeXus</strong> switch when calling <strong>configure</strong>.</span> For an overview of all available options just call <code>./configure --help</code>. Besides the standard options there are a few special options which should be mentioned here:
 <p></p> <dl>
-<dt> --prefix </dt><dd> Specify the installation prefix, e.g. /opt/root-system (<em>by default: /usr/local</em>)
-</dd> <dt> --with-rootsys </dt><dd> Specify the top of the <code>ROOT</code> installation directory, e.g. /opt/root-system
+<dt> --prefix </dt><dd> Specify the installation prefix, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
+</dd> <dt> --with-rootsys </dt><dd> Specify the top of the <code>ROOT</code> installation directory, e.g. $ROOTSYS if already defined
 </dd> <dt> --with-fftw3 </dt><dd> Specify the prefix of the <code>FFTW3</code> installation. e.g. /usr/local or /usr
 </dd> <dt> --with-gsl </dt><dd> Set the prefix of the <code>GSL</code> installation, e.g. /usr/local or /usr
 </dd> <dt> --with-boostinc </dt><dd> Set the path to the header files of the <code>Boost</code> installation, e.g. /usr/local/include or /usr/include
@@ -395,15 +431,46 @@ When the <strong>configure</strong> script has been called successfully everythi
 &#36; make install
 &#36; /sbin/ldconfig                                  # (as superuser)
 </pre>
+<p></p>
+<h3 id="A_3.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 3.2.2  <code><b>musrfit</b></code> build with <code><b>cmake</b></code> </h3>
+<p></p>
+Currently the following configuration switches for <code>musrfit</code> are available:
+<p></p> <dl>
+<dt> -DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt; </dt><dd> Specify the installation prefix, i.e. the place where <code>musrfit</code> shall be installed, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
+</dd> <dt> -Dnexus=&lt;value&gt; </dt><dd> enable/disable the support of <code>NeXus</code> data files (<em>requires the <code>HDF4</code>, <code>HDF5</code> and <code>NeXus</code> libraries to be installed</em>). &lt;value&gt;=1 enables <code>NeXus</code>, &lt;value&gt;=0 disables <code>NeXus</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>NeXus</code> support is <strong>disabled</strong>.
+</dd> <dt> -DASlibs=&lt;value&gt; </dt><dd> enable/disable the <code>ASlibs</code>. &lt;value&gt;=1 enables the <code>ASlibs</code>, &lt;value&gt;=0 disables the <code>ASlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>ASlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
+</dd> <dt> -DBMWlibs=&lt;value&gt; </dt><dd> enable/disable the <code>BMWlibs</code>. &lt;value&gt;=1 enables the <code>BMWlibs</code>, &lt;value&gt;=0 disables the <code>BMWlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BMWlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
+</dd> <dt> -DBNMRlibs=&lt;value&gt; </dt><dd> enable/disable the <code>BNMRlibs</code>. &lt;value&gt;=1 enables the <code>BNMRlibs</code>, &lt;value&gt;=0 disables the <code>BNMRlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BNMRlibs</code> support is <strong>disabled</strong>.
+</dd> <dt> -Dqt_based_tools=&lt;value&gt; </dt><dd> Will try to get musredit, musrWiz, musrStep, and mupp installed, if <code>Qt</code> is found. By default this is <strong>enabled</strong>. Again &lt;value&gt;=0 means disabled, &lt;value&gt;=1 enabled. 
+</dd> <dt> -Dqt_version=&lt;value&gt; </dt><dd> Allows to specify which <code>Qt</code> version shall be tried. &lt;value&gt; can take the values: <code>AUTO</code>, 3, 4, 5. If the value is set to <code>AUTO</code>, this highest installed version is chosen, otherwise the specified version is used.
+</dd> <dt> -Dtry_OpenMP=&lt;value&gt; </dt><dd> Will check if <code>OpenMP</code> support is possible, and if yes use it. The default is <strong>enabled</strong>
+</dd></dl> 
+<p></p>
+Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>-DCMAKE_INSTALL_PREFIX</strong>. <code>musrfit</code> build with <code>cmake</code> takes the out-of-source approach. Therefore a typical configuration / make / install process including <code>NeXus</code> support would look like
+<p></p>
+<pre class="bash">
+&#36; cd &#36;HOME/Apps/musrfit
+&#36; mkdir build
+&#36; cd build
+&#36; cmake ../ -DCMAKE&#95;INSTALL&#95;PREFIX&#61;&#36;ROOTSYS -Dnexus&#61;1
+# below it is assumed that multiple cores are present, hence the -j8 option
+&#36; cmake --build ./ --clean-first -- -j8
+&#36; make install
+&#36; /sbin/ldconfig                                  # (as superuser)
+</pre>
+<p></p>
+<h3 id="A_3.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 3.2.3  <code><b>musrfit</b></code> last step of the installation </h3>
+<p></p>
 In order to finish the installation of <code>musrfit</code> two more things should be done: <ul>
 <li> Define the <strong>MUSRFITPATH</strong> environment variable containing the path to the <code>musrfit</code> executables and XML files. E.g. if the location of the example above is used append the following line to the <strong>~/.bashrc</strong> and <strong>~/.bash_profile</strong> (and then either restart the shell or call the same commands once more from the shell): <pre class="bash">
-export MUSRFITPATH&#61;/opt/root-system/bin
+export MUSRFITPATH&#61;&#36;ROOTSYS/bin
 </pre>
 </li> <li> Adjust the paths where <code>musrfit</code> will search for data files in the installed <strong>musrfit_startup.xml</strong>. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
 </li></ul> 
 <p></p>
 <span id="MusrGuiInstallLinux"></span>
 <h2 id="A_3.3_61_61musredit_61_61"> 3.3  <code><b>musredit</b></code> </h2>
+<p></p>
 <span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically the highest available Qt version. In case this is found, the editor <code>musredit</code> is built already together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt5" option or install this editor separately:</span>
 <pre class="bash">
 &#36; cd &#36;HOME/Apps/musrfit/src/musredit&#95;qt5
@@ -558,6 +625,8 @@ If the repository had been checked out already before, one can update the local
 <p></p>
 <span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.
 <p></p>
+<h3 id="A_4.2.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 4.2.1  <code><b>musrfit</b></code> build with <code><b>automake</b></code> </h3>
+<p></p>
 After the source-code extraction the <strong>autogen.sh</strong> script is called to prepare the build environment. If it has been executed successfully the <strong>configure</strong> script should be ready to collect all the information needed to create the Makefiles. <span class='foswikiRedFG'>If <code>musrfit</code> should support <code>NeXus</code> data files this has to be enabled by specifying the <nobr><b>--enable-static</b></nobr> <nobr><b>--enable-NeXus</b></nobr> switches when calling <strong>configure</strong>.</span> For an overview of all available options just call <code>./configure --help</code>. Besides the standard options there are a few special options which should be mentioned here:
 <p></p> <dl>
 <dt> --prefix </dt><dd> Specify the installation prefix, e.g. /opt/root-system (<em>by default: /usr/local</em>)
@@ -585,7 +654,37 @@ When the <strong>configure</strong> script has been called successfully everythi
 &#36; make
 &#36; make install
 </pre>
-In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> (/cygdrive/c/root/bin/musrfit_startup.xml or C:\root\bin\musrfit_startup.xml). The paths have to obey the <code>POSIX</code> naming convention. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
+<p></p>
+<h3 id="A_4.2.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 4.2.2  <code><b>musrfit</b></code> build with <code><b>cmake</b></code> </h3>
+<p></p>
+Currently the following configuration switches for <code>musrfit</code> are available:
+<p></p> <dl>
+<dt> -DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt; </dt><dd> Specify the installation prefix, i.e. the place where <code>musrfit</code> shall be installed, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
+</dd> <dt> -Dnexus=&lt;value&gt; </dt><dd> enable/disable the support of <code>NeXus</code> data files (<em>requires the <code>HDF4</code>, <code>HDF5</code> and <code>NeXus</code> libraries to be installed</em>). &lt;value&gt;=1 enables <code>NeXus</code>, &lt;value&gt;=0 disables <code>NeXus</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>NeXus</code> support is <strong>disabled</strong>.
+</dd> <dt> -DASlibs=&lt;value&gt; </dt><dd> enable/disable the <code>ASlibs</code>. &lt;value&gt;=1 enables the <code>ASlibs</code>, &lt;value&gt;=0 disables the <code>ASlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>ASlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
+</dd> <dt> -DBMWlibs=&lt;value&gt; </dt><dd> enable/disable the <code>BMWlibs</code>. &lt;value&gt;=1 enables the <code>BMWlibs</code>, &lt;value&gt;=0 disables the <code>BMWlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BMWlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
+</dd> <dt> -DBNMRlibs=&lt;value&gt; </dt><dd> enable/disable the <code>BNMRlibs</code>. &lt;value&gt;=1 enables the <code>BNMRlibs</code>, &lt;value&gt;=0 disables the <code>BNMRlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BNMRlibs</code> support is <strong>disabled</strong>.
+</dd> <dt> -Dqt_based_tools=&lt;value&gt; </dt><dd> Will try to get musredit, musrWiz, musrStep, and mupp installed, if <code>Qt</code> is found. By default this is <strong>enabled</strong>. Again &lt;value&gt;=0 means disabled, &lt;value&gt;=1 enabled. 
+</dd> <dt> -Dqt_version=&lt;value&gt; </dt><dd> Allows to specify which <code>Qt</code> version shall be tried. &lt;value&gt; can take the values: <code>AUTO</code>, 3, 4, 5. If the value is set to <code>AUTO</code>, this highest installed version is chosen, otherwise the specified version is used.
+</dd> <dt> -Dtry_OpenMP=&lt;value&gt; </dt><dd> Will check if <code>OpenMP</code> support is possible, and if yes use it. The default is <strong>enabled</strong>
+</dd></dl> 
+<p></p>
+Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>-DCMAKE_INSTALL_PREFIX</strong>. <code>musrfit</code> build with <code>cmake</code> takes the out-of-source approach. Therefore a typical configuration / make / install process including <code>NeXus</code> support would look like
+<p></p>
+<pre class="bash">
+&#36; cd &#36;HOME/Apps/musrfit
+&#36; mkdir build
+&#36; cd build
+&#36; cmake ../ -DCMAKE&#95;INSTALL&#95;PREFIX&#61;&#36;ROOTSYS -Dnexus&#61;1
+# below it is assumed that multiple cores are present, hence the -j8 option
+&#36; cmake --build ./ --clean-first -- -j8
+&#36; make install
+&#36; /sbin/ldconfig                                  # (as superuser)
+</pre>
+<p></p>
+<h3 id="A_4.2.3_61_61musrfit_61_61_last_step_of_the_installation"> 4.2.3  <code><b>musrfit</b></code> last step of the installation </h3>
+<p></p>
+In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> (/cygdrive/c/root/bin/musrfit_startup.xml or C:\root\bin\musrfit_startup.xml). The paths have to obey the POSIX naming convention. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
 <p></p>
 <span id="MusrEditInstallCygwin"></span>
 <h2 id="A_4.3_61_61musredit_61_61"> 4.3  <code><b>musredit</b></code> </h2>
@@ -779,6 +878,11 @@ launchctl setenv PATH &#36;PATH
 launchctl setenv LD&#95;LIBRARY&#95;PATH &#36;LD&#95;LIBRARY&#95;PATH
 </pre>
 <p></p>
+After this you will need to `execute' <code>.profile</code> before proceeding:
+<p></p>
+<pre class="bash">
+&#36; source &#36;HOME/.profile
+</pre>
 <h2 id="A_5.2_Requirements_40_61_61Fink_61_61_41"> 5.2  Requirements (<code><b>Fink</b></code>) </h2>
 <h3 id="A_5.2.1_Everything_but_61_61ROOT_61_61_and_61_61NeXus_61_61"> 5.2.1  Everything but <code><b>ROOT</b></code> and <code><b>NeXus</b></code> </h3>
 Before proceeding with the usage of the <code><a href="http://www.finkproject.org/">Fink</a></code> system first a few useful tools provided by Apple together with OS X (on the installation DVD/CDs) should be installed:
@@ -933,6 +1037,12 @@ launchctl setenv PKG&#95;CONFIG&#95;PATH &#36;PKG&#95;CONFIG&#95;PATH
 launchctl setenv PATH &#36;PATH
 launchctl setenv LD&#95;LIBRARY&#95;PATH &#36;LD&#95;LIBRARY&#95;PATH
 </pre>
+<p></p>
+After this you will need to `execute' <code>.profile</code> before proceeding:
+<p></p>
+<pre class="bash">
+&#36; source &#36;HOME/.profile
+</pre>
 <h2 id="A_5.3_61_61musrfit_61_61"> 5.3  <code><b>musrfit</b></code> </h2>
 First, the most recent source code should be downloaded.  First, the most recent source code should be downloaded. The preferred way of doing so is to clone the musrfit repository via git. Assuming the code should be located in ~/Applications/musrfit this is achieved most easily calling from the terminal
 <p></p>
@@ -962,6 +1072,8 @@ If a local repository clone is already present, one can update it using:
 <p></p>
 <span class='foswikiRedFG'>As an alternative (if git is not available)</span>, the source code can also be downloaded from the following web-page: <a href="https://bitbucket.org/muonspin/musrfit/downloads">musrfit at bitbucket</a>.
 <p></p>
+<h3 id="A_5.3.1_61_61musrfit_61_61_build_with_61_61automake_61_61"> 5.3.1  <code><b>musrfit</b></code> build with <code><b>automake</b></code> </h3>
+<p></p>
 After the source-code extraction the <strong>autogen.sh</strong> script is called to prepare the build environment. If it has been executed successfully the <strong>configure</strong> script should be ready to collect all the information needed to create the Makefiles. <span class='foswikiRedFG'>If <code>musrfit</code> should support <code>NeXus</code> data files this has to be enabled by specifying the <strong>--enable-NeXus</strong> switch when calling <strong>configure</strong>.</span> For an overview of all available options just call <code>./configure --help</code>. Besides the standard options there are a few special options which should be mentioned here:
 <p></p> <dl>
 <dt> --prefix </dt><dd> Specify the installation prefix, e.g. /opt/root-system (<em>by default: /usr/local</em>)
@@ -991,6 +1103,42 @@ When the <strong>configure</strong> script has been called successfully everythi
 </pre>
 In order to finish the installation of <code>musrfit</code> the paths where <code>musrfit</code> searches for data files should be adjusted in the installed <strong>musrfit_startup.xml</strong> ($ROOTSYS/bin/musrfit_startup.xml). For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
 <p></p>
+<h3 id="A_5.3.2_61_61musrfit_61_61_build_with_61_61cmake_61_61"> 5.3.2  <code><b>musrfit</b></code> build with <code><b>cmake</b></code> </h3>
+<p></p>
+Currently the following configuration switches for <code>musrfit</code> are available:
+<p></p> <dl>
+<dt> -DCMAKE_INSTALL_PREFIX=&lt;prefix-path&gt; </dt><dd> Specify the installation prefix, i.e. the place where <code>musrfit</code> shall be installed, e.g. $ROOTSYS if already defined (<em>by default: /usr/local</em>)
+</dd> <dt> -Dnexus=&lt;value&gt; </dt><dd> enable/disable the support of <code>NeXus</code> data files (<em>requires the <code>HDF4</code>, <code>HDF5</code> and <code>NeXus</code> libraries to be installed</em>). &lt;value&gt;=1 enables <code>NeXus</code>, &lt;value&gt;=0 disables <code>NeXus</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>NeXus</code> support is <strong>disabled</strong>.
+</dd> <dt> -DASlibs=&lt;value&gt; </dt><dd> enable/disable the <code>ASlibs</code>. &lt;value&gt;=1 enables the <code>ASlibs</code>, &lt;value&gt;=0 disables the <code>ASlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>ASlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
+</dd> <dt> -DBMWlibs=&lt;value&gt; </dt><dd> enable/disable the <code>BMWlibs</code>. &lt;value&gt;=1 enables the <code>BMWlibs</code>, &lt;value&gt;=0 disables the <code>BMWlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BMWlibs</code> support is <strong>disabled</strong>. For details see <a href="index.html">Documentation of user libs</a>.
+</dd> <dt> -DBNMRlibs=&lt;value&gt; </dt><dd> enable/disable the <code>BNMRlibs</code>. &lt;value&gt;=1 enables the <code>BNMRlibs</code>, &lt;value&gt;=0 disables the <code>BNMRlibs</code>. The default setting, i.e. the switch is <strong>not</strong> provided is <code>BNMRlibs</code> support is <strong>disabled</strong>.
+</dd> <dt> -Dqt_based_tools=&lt;value&gt; </dt><dd> Will try to get musredit, musrWiz, musrStep, and mupp installed, if <code>Qt</code> is found. By default this is <strong>enabled</strong>. Again &lt;value&gt;=0 means disabled, &lt;value&gt;=1 enabled. 
+</dd> <dt> -Dqt_version=&lt;value&gt; </dt><dd> Allows to specify which <code>Qt</code> version shall be tried. &lt;value&gt; can take the values: <code>AUTO</code>, 3, 4, 5. If the value is set to <code>AUTO</code>, this highest installed version is chosen, otherwise the specified version is used.
+</dd> <dt> -Dtry_OpenMP=&lt;value&gt; </dt><dd> Will check if <code>OpenMP</code> support is possible, and if yes use it. The default is <strong>enabled</strong>
+</dd></dl> 
+<p></p>
+Normally it should not be necessary to make use of any of the options except for specifying the installation path with <strong>-DCMAKE_INSTALL_PREFIX</strong>. <code>musrfit</code> build with <code>cmake</code> takes the out-of-source approach. Therefore a typical configuration / make / install process including <code>NeXus</code> support would look like
+<p></p>
+<pre class="bash">
+&#36; cd &#36;HOME/Apps/musrfit
+&#36; mkdir build
+&#36; cd build
+&#36; cmake ../ -DCMAKE&#95;INSTALL&#95;PREFIX&#61;&#36;ROOTSYS -Dnexus&#61;1
+# below it is assumed that multiple cores are present, hence the -j8 option
+&#36; cmake --build ./ --clean-first -- -j8
+&#36; make install
+&#36; /sbin/ldconfig                                  # (as superuser)
+</pre>
+<p></p>
+<h3 id="A_5.3.3_61_61musrfit_61_61_last_step_of_the_installation"> 5.3.3  <code><b>musrfit</b></code> last step of the installation </h3>
+<p></p>
+In order to finish the installation of <code>musrfit</code> two more things should be done: <ul>
+<li> Define the <strong>MUSRFITPATH</strong> environment variable containing the path to the <code>musrfit</code> executables and XML files. E.g. if the location of the example above is used append the following line to the <strong>~/.bashrc</strong> and <strong>~/.bash_profile</strong> (and then either restart the shell or call the same commands once more from the shell): <pre class="bash">
+export MUSRFITPATH&#61;&#36;ROOTSYS/bin
+</pre>
+</li> <li> Adjust the paths where <code>musrfit</code> will search for data files in the installed <strong>musrfit_startup.xml</strong>. For detailed information on this XML file refer to the <a href="MusrFit.html#MusrfitStartupXml">manual</a>.
+</li></ul> 
+<p></p>
 <span id="MusrGuiInstall"></span>
 <h2 id="A_5.4_61_61musredit_61_61"> 5.4  <code><b>musredit</b></code> </h2>
 <span class='foswikiBlueFG'>In the latest version of <code>musrfit</code> the configure script tries to determine automatically highest available Qt version. In case this is found, the editor <code>musredit</code> is built together with <code>musrfit</code>. <em>If not</em>, one can either try to call the configure script with the "--with-qt5" option or install this editor separately:</span>
@@ -1048,7 +1196,7 @@ If <code>musrgui</code> has been installed, just open one of the <strong>test-&#
 <p></p>
 </div>
 <div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'>&nbsp;&gt;&nbsp;</span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a> &gt; <a href="MusrFit.html">MusrFit</a><span class='foswikiSeparator'>&nbsp;&gt;&nbsp;</span>MusrFitSetup <br />
-Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
+Topic revision:  <span class='patternRevInfo'>08 Jun 2018, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
 </div>
 </div>
 </div>
@@ -1066,5 +1214,5 @@ Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:56 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/MusrFitSetupDKS.html b/doc/html/user/MUSR/MusrFitSetupDKS.html
index a45ffa11..a270c209 100644
--- a/doc/html/user/MUSR/MusrFitSetupDKS.html
+++ b/doc/html/user/MUSR/MusrFitSetupDKS.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetupDKS?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:55 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetupDKS?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,12 +14,12 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetupDKS?t=1503504094" type="application/x-wiki" title="edit MusrFitSetupDKS" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetupDKS?t=1528465296" type="application/x-wiki" title="edit MusrFitSetupDKS" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<base  /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 <link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
 <link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
@@ -104,13 +104,13 @@
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
-<!--JQUERYPLUGIN::METADATA-->
 <!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
-<!--JQUERYPLUGIN::COMMENT-->
 <!--JavascriptFiles/foswikiPref-->
+<!--JavascriptFiles/foswikiForm-->
 <!--PatternSkin/pattern-->
+<!--JQUERYPLUGIN::COMMENT-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
+<!--JQUERYPLUGIN::METADATA-->
 
 <!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
@@ -130,7 +130,10 @@
 <li> <a href="MusrFitSetupDKS.html#A_1.1_Driver_Installation_for_the_Tesla_K40c"> 1.1  Driver Installation for the Tesla K40c </a>
 </li> <li> <a href="MusrFitSetupDKS.html#A_1.2_Installation_of_CUDA"> 1.2  Installation of CUDA </a>
 </li> <li> <a href="MusrFitSetupDKS.html#A_1.3_Installation_of_DKS"> 1.3  Installation of DKS </a>
-</li> <li> <a href="MusrFitSetupDKS.html#A_1.4_Installation_of_61musrfit_61_for_DKS"> 1.4  Installation of musrfit for DKS </a>
+</li> <li> <a href="MusrFitSetupDKS.html#A_1.4_Installation_of_61musrfit_61_for_DKS"> 1.4  Installation of musrfit for DKS </a> <ul>
+<li> <a href="MusrFitSetupDKS.html#A_1.4.1_Install_via_61_61automake_61_61"> 1.4.1  Install via automake </a>
+</li> <li> <a href="MusrFitSetupDKS.html#A_1.4.2_Install_via_61_61cmake_61_61"> 1.4.2  Install via cmake </a>
+</li></ul> 
 </li></ul> 
 </li> <li> <a href="MusrFitSetupDKS.html#A_2_Setting_up_61_61musrfit_47DKS_61_61_for_a_AMD_Graphic_Card_40Radeon_R9_390X_41"> 2  Setting up musrfit/DKS for a AMD Graphic Card (Radeon R9 390X) </a> <ul>
 <li> <a href="MusrFitSetupDKS.html#A_2.1_Driver_Installation_for_an_AMD_Graphic_Card_44_e.g._Radeon_R9_390X"> 2.1  Driver Installation for an AMD Graphic Card, e.g. Radeon R9 390X </a>
@@ -203,7 +206,7 @@ In brief the installation should be something like this:<pre class="bash">
 &#36; mkdir build
 &#36; cd build
 &#36; cmake ../ -DENABLE&#95;MUSR&#61;1 -DCMAKE&#95;INSTALL&#95;PREFIX&#61;../exec
-&#36; make
+&#36; cmake --build ./ --clean-first
 &#36; make install
 </pre>
 <p></p>
@@ -237,18 +240,20 @@ Here only the differences are explained. First checkout <code>musrfit</code>, th
 &#36; git checkout dks6
 </pre>
 <p></p>
-The configure script for <code>musrfit</code> has now a couple of more tags/options, which are: <ul>
-<li> <code><b>--enable-dks</b></code>: by default this is set to <code><b>no</b></code>, hence if you want to have GPU support you need to enable it.
-</li> <li> <code><b>--with-cuda</b></code>: with this tag you tell the configure script where it can find CUDA
-</li> <li> <code><b>--with-opencl</b></code>: with this tag you tell the configure script where it can find OpenCL
-</li> <li> <code><b>--with-dks</b></code>: with this tag you tell the configure script where it can find <code>DKS</code> 
-</li></ul> 
+<h3 id="A_1.4.1_Install_via_61_61automake_61_61"> 1.4.1  Install via <code><b>automake</b></code> </h3>
+<p></p>
+The configure script for <code>musrfit</code> has now a couple of more tags/options, which are: <dl>
+<dt> <code><b>--enable-dks</b></code> </dt><dd> by default this is set to <code><b>no</b></code>, hence if you want to have GPU support you need to enable it.
+</dd> <dt> <code><b>--with-cuda</b></code> </dt><dd> with this tag you tell the configure script where it can find CUDA
+</dd> <dt> <code><b>--with-opencl</b></code> </dt><dd> with this tag you tell the configure script where it can find OpenCL
+</dd> <dt> <code><b>--with-dks</b></code> </dt><dd> with this tag you tell the configure script where it can find <code>DKS</code> 
+</dd></dl> 
 <p></p>
 For a typical setup on a RHEL system it could look like this
 <pre class="bash">
 &#36; ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks&#61;&#36;HOME/Apps/DKS/exec --enable-dks --prefix&#61;&#36;ROOTSYS
 </pre>
-whereas for macOS it would typically something like this
+whereas for macOS it would typically look like this
 <pre class="bash">
 &#36; ./configure --enable-ASlibs --enable-BMWlibs --enable-NeXus --with-dks&#61;&#36;HOME/Applications/DKS/exec --enable-dks --prefix&#61;&#36;ROOTSYS
 </pre>
@@ -263,6 +268,33 @@ and updating the shared library lookup table (only needed for Linux)
 </pre>
 you are done with the setup.
 <p></p>
+<h3 id="A_1.4.2_Install_via_61_61cmake_61_61"> 1.4.2  Install via <code><b>cmake</b></code> </h3>
+<p></p>
+There is on more configuration switch 
+<p></p> <dl>
+<dt> <code>-Ddks=&lt;value&gt; </dt><dd> it allows to enable/disable =DKS</code> support. The default is &lt;value&gt;=1, i.e. <strong>enabled</strong>. To disable use &lt;value&gt;=0. 
+</dd></dl> 
+<p></p>
+For a typical setup on a RHEL system it could look like this
+<pre class="bash">
+&#36; cmake ../ -DCMAKE&#95;INSTALL&#95;PREFIX&#61;&#36;ROOTSYS -DASlibs&#61;1 -DBMWlibs&#61;1 -Dnexus&#61;1
+</pre>
+whereas for macOS it would typically look like this
+<pre class="bash">
+&#36; cmake ../ -DCMAKE&#95;INSTALL&#95;PREFIX&#61;&#36;ROOTSYS -DASlibs&#61;1 -DBMWlibs&#61;1 -Dnexus&#61;1
+</pre>
+<p></p>
+After
+<pre class="bash">
+&#36; cmake --build ./ --clean-first
+&#36; make install
+</pre>
+and updating the shared library lookup table (only needed for Linux)
+<pre class="bash">
+/sbin/ldconfig # as superuser / root
+</pre>
+you are done with the setup.
+<p></p>
 <h1 id="A_2_Setting_up_61_61musrfit_47DKS_61_61_for_a_AMD_Graphic_Card_40Radeon_R9_390X_41"> 2  Setting up <code><b>musrfit/DKS</b></code> for a AMD Graphic Card (Radeon R9 390X) </h1>
 <p></p>
 <h2 id="A_2.1_Driver_Installation_for_an_AMD_Graphic_Card_44_e.g._Radeon_R9_390X"> 2.1  Driver Installation for an AMD Graphic Card, e.g. Radeon R9 390X </h2>
@@ -331,12 +363,12 @@ Since there is no graphic card involved, you do not need any graphic card driver
 <p></p>
 The installation instruction for DKS / <code>musrfit</code> can be found <a class="foswikiCurrentTopicLink" href="#DksInstall">here</a>.
 <p></p>
--- <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a> - 22 Aug 2017</div>
+-- <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a> - June 8, 2018</div>
 <p></p>
 <p></p>
 </div>
 <div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'>&nbsp;&gt;&nbsp;</span><a class="foswikiCurrentWebHomeLink" href="WebHome.html">WebHome</a><span class='foswikiSeparator'>&nbsp;&gt;&nbsp;</span>MusrFitSetupDKS <br />
-Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
+Topic revision:  <span class='patternRevInfo'>08 Jun 2018, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
 </div>
 </div>
 </div>
@@ -354,5 +386,5 @@ Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetupDKS?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:56 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetupDKS?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/MusrGui.html b/doc/html/user/MUSR/MusrGui.html
index 5c699341..70fd6790 100644
--- a/doc/html/user/MUSR/MusrGui.html
+++ b/doc/html/user/MUSR/MusrGui.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:49 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:51 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,7 +14,7 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1503504094" type="application/x-wiki" title="edit MusrGui" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1528465296" type="application/x-wiki" title="edit MusrGui" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
@@ -32,6 +32,11 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
 body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
 body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
 </style><!--TABLEPLUGIN_default-->
+<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
 <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
 body .foswikiTable#tableMusrGui1 td {vertical-align:middle; vertical-align:top}
 body .foswikiTable#tableMusrGui1 td.foswikiTableCol0 {text-align:left}
@@ -49,12 +54,7 @@ body .foswikiTable#tableMusrGui1 th a:hover {color:#0066cc; background-color:#ff
 body .foswikiTable#tableMusrGui1 th.foswikiSortedCol {background-color:#eeeeee}
 body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
 body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
-</style><!--TABLEPLUGIN_specific-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+</style><!--TABLEPLUGIN_specific--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -135,17 +135,17 @@ body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {
 <!--<![endif]-->
 <!--JQUERYPLUGIN-->
 <!--JQUERYPLUGIN::MIGRATE-->
-<!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
-<!--JQUERYPLUGIN::METADATA-->
-
-<!--JQUERYPLUGIN::CHILI-->
+<!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiPref-->
 <!--JavascriptFiles/foswikiForm-->
 <!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT-->
 <!--JQUERYPLUGIN::TWISTY-->
+<!--JQUERYPLUGIN::METADATA-->
+
+<!--JQUERYPLUGIN::CHILI-->
+<!--JQUERYPLUGIN::COMMENT-->
 <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -531,5 +531,5 @@ Topic revision:  <span class='patternRevInfo'>14 May 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:54 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:56 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/MusrRoot.html b/doc/html/user/MUSR/MusrRoot.html
index 54f68df8..96f7ecc1 100644
--- a/doc/html/user/MUSR/MusrRoot.html
+++ b/doc/html/user/MUSR/MusrRoot.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:37 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:39 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,13 +14,12 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1503504092" type="application/x-wiki" title="edit MusrRoot" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1528465295" type="application/x-wiki" title="edit MusrRoot" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<base  /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
 <style class='head TABLEPLUGIN_default' type="text/css" media="all">
 body .foswikiTable {border-width:1px}
 body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
@@ -35,6 +34,9 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
 body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
 body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
 </style><!--TABLEPLUGIN_default-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
 <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
 body .foswikiTable#tableMusrRoot7 td {vertical-align:middle; vertical-align:top}
 body .foswikiTable#tableMusrRoot7 td.foswikiTableCol0 {text-align:left}
@@ -53,9 +55,7 @@ body .foswikiTable#tableMusrRoot7 th.foswikiSortedCol {background-color:#eeeeee}
 body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
 body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
 </style><!--TABLEPLUGIN_specific-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -138,16 +138,16 @@ body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
-<!--JavascriptFiles/foswikiString-->
-<!--JavascriptFiles/foswikiForm-->
 <!--JQUERYPLUGIN::METADATA-->
-<!--JavascriptFiles/foswikiPref-->
-<!--JQUERYPLUGIN::TWISTY-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 
 <!--JQUERYPLUGIN::CHILI-->
+<!--JQUERYPLUGIN::COMMENT-->
+<!--JavascriptFiles/foswikiString-->
+<!--JavascriptFiles/foswikiPref-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
+<!--JavascriptFiles/foswikiForm-->
 <!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--JQUERYPLUGIN::TWISTY--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -1125,5 +1125,5 @@ Topic revision:  <span class='patternRevInfo'>29 Mar 2012, suter_a</span></div>
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:42 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:45 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/QuickStart.html b/doc/html/user/MUSR/QuickStart.html
index e94a0442..8b4cfc3a 100644
--- a/doc/html/user/MUSR/QuickStart.html
+++ b/doc/html/user/MUSR/QuickStart.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:48 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:50 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1503504093" type="application/x-wiki" title="edit QuickStart" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1528465296" type="application/x-wiki" title="edit QuickStart" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<base  /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -101,14 +101,14 @@
 
 <!--<![endif]-->
 <!--JQUERYPLUGIN-->
-<!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
+<!--JQUERYPLUGIN::MIGRATE-->
 <!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiForm-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 <!--JavascriptFiles/foswikiPref-->
 <!--PatternSkin/pattern-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 <!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -285,5 +285,5 @@ Topic revision:  <span class='patternRevInfo'>10 Jul 2011, wojek</span></div>
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:49 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:50 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/TutorialSingleHisto.html b/doc/html/user/MUSR/TutorialSingleHisto.html
index f30ece0f..91054398 100644
--- a/doc/html/user/MUSR/TutorialSingleHisto.html
+++ b/doc/html/user/MUSR/TutorialSingleHisto.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:45 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:47 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,13 +14,11 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1503504093" type="application/x-wiki" title="edit TutorialSingleHisto" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1528465296" type="application/x-wiki" title="edit TutorialSingleHisto" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
-<style class='head TABLEPLUGIN_default' type="text/css" media="all">
+<base  /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all">
 body .foswikiTable {border-width:1px}
 body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
 body .foswikiTable td {border-style:solid none; vertical-align:top}
@@ -34,7 +32,12 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
 body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
 body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
 </style><!--TABLEPLUGIN_default-->
+<link class='head JQUERYPLUGIN::TWISTY' rel='stylesheet' href='../pub/System/TwistyPlugin/twisty327a.css?version=1.6.0' type='text/css' media='all' /><!--JQUERYPLUGIN::TWISTY: requires= missing ids: JavascriptFiles/foswikiPref-->
 <link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
+<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
+<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
 <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
 body .foswikiTable#tableTutorialSingleHisto1 td {vertical-align:middle; vertical-align:top}
 body .foswikiTable#tableTutorialSingleHisto1 td.foswikiTableCol0 {text-align:left}
@@ -52,10 +55,7 @@ body .foswikiTable#tableTutorialSingleHisto1 th a:hover {color:#0066cc; backgrou
 body .foswikiTable#tableTutorialSingleHisto1 th.foswikiSortedCol {background-color:#eeeeee}
 body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
 body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
-</style><!--TABLEPLUGIN_specific-->
-<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+</style><!--TABLEPLUGIN_specific--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -138,13 +138,13 @@ body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswik
 <!--JQUERYPLUGIN::MIGRATE-->
 <!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
+<!--JQUERYPLUGIN::COMMENT-->
+<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 <!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiPref-->
 <!--JQUERYPLUGIN::TWISTY-->
-<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
 <!--JavascriptFiles/foswikiForm-->
-<!--PatternSkin/pattern-->
-<!--JQUERYPLUGIN::COMMENT--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
+<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
 </head> 
 <body class="foswikiNoJs patternViewPage patternPrintPage">
 <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -401,5 +401,5 @@ Topic revision:  <span class='patternRevInfo'>02 Sep 2011, wojek</span></div>
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:01:48 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:41:50 GMT -->
 </html>
\ No newline at end of file
diff --git a/doc/html/user/MUSR/WebHome.html b/doc/html/user/MUSR/WebHome.html
index b4dd1a92..c9edb922 100644
--- a/doc/html/user/MUSR/WebHome.html
+++ b/doc/html/user/MUSR/WebHome.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html><html lang="en">
 
-<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:27 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:27 GMT -->
 <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8" /><!-- /Added by HTTrack -->
 <head>
 <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
 <link rel="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
-<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1503504096" type="application/x-wiki" title="edit WebHome" />
+<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1528465299" type="application/x-wiki" title="edit WebHome" />
 <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
 <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
 <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRss" />
-<base  /><!--[if IE]></base><![endif]--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
-<link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
+<base  /><!--[if IE]></base><![endif]--><link class='head JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
 <link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
-<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
+<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
+<link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
 <style type="text/css" media="all">
 @import url('../pub/System/PatternSkinTheme/layout.css');
 @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -102,8 +102,8 @@
 <!--<![endif]-->
 <!--JQUERYPLUGIN-->
 <!--JQUERYPLUGIN::MIGRATE-->
-<!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JQUERYPLUGIN::FOSWIKI-->
+<!--JQUERYPLUGIN::LIVEQUERY-->
 <!--JavascriptFiles/foswikiString-->
 <!--JavascriptFiles/foswikiPref-->
 <!--JavascriptFiles/foswikiForm-->
@@ -126,7 +126,7 @@
 </li> <li> <a href="TutorialSingleHisto.html">Single-histogram-fit tutorial for <code>musrfit</code> introducing the basic features of the programs and <code>msr</code> files</a> 
 </li> <li> <a href="MusrFit.html">User manual of the &#956;SR data analysis software <code>musrfit</code> </a>
 </li> <li> <a href="MusrFitSetup.html">Setting up <code>musrfit</code> on Different Platforms</a>
-</li> <li> <a href="MusrFitSetupDKS.html">Setting up <code>musrfit</code> / <code>DKS</code>: high speed fitting with GPU's <img src="../pub/System/DocumentGraphics/new.png" alt="NEW" title="NEW" width="30" height="16" /> <span class='foswikiGreenFG'>(Aug. 2017)</span></a>
+</li> <li> <a href="MusrFitSetupDKS.html">Setting up <code>musrfit</code> / <code>DKS</code>: high speed fitting with GPU's</a>
 </li> <li> <a href="QuickStart.html">Quick start page for <code>WKM</code> users</a>
 </li> <li> <a href="MusrGui.html">Documentation of <code>musrgui</code>/<code>musredit</code>&mdash;editors interfacing <code>musrfit</code></a>
 </li> <li> <a href="Msr2Data.html">Documentation of <code>msr2data</code>&mdash;a program for automatically processing multiple musrfit <code>msr</code> files</a>
@@ -139,12 +139,12 @@
 </li> <li> <a href="MusrFitAcknowledgements.html">Acknowledgements</a>
 </li></ul> 
 <p></p>
---  <a href="http://www.psi.ch/low-energy-muons/people">AS</a> &amp; (<a href="http://www.fsf.org/register_form?referrer=8369">BMW</a>) - last update Aug 23, 2017</div>
+--  <a href="http://www.psi.ch/low-energy-muons/people">AS</a> &amp; (<a href="http://www.fsf.org/register_form?referrer=8369">BMW</a>) - last update June 8, 2018</div>
 <p></p>
 <p></p>
 </div>
 <div class="patternInfo">This topic: MUSR<span class='foswikiSeparator'>&nbsp;&gt;&nbsp;</span>WebHome <br />
-Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
+Topic revision:  <span class='patternRevInfo'>08 Jun 2018, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
 </div>
 </div>
 </div>
@@ -162,5 +162,5 @@ Topic revision:  <span class='patternRevInfo'>23 Aug 2017, <a href="https://intr
 
 </body>
 
-<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Wed, 23 Aug 2017 16:02:28 GMT -->
+<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2014], Fri, 08 Jun 2018 13:42:28 GMT -->
 </html>
\ No newline at end of file
