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

merge master

Browse Source
This commit is contained in:
suter_a
2016-08-09 14:05:40 +02:00
parent a9744e273b 5c69c21f56
commit f93ef114e0
128 changed files with 1421 additions and 517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -4,10 +4,16 @@
changes since 0.17.0 changes since 0.17.0
=================================== ===================================
NEW 2016-04-28 updated licence info in musredit and added paramList
feature to the msr2data GUI.
NEW 2016-04-28 msr2data gets a new option: paramList which allows to
extract a subset of all the parameters of a collection
of msr-files.
NEW 2016-04-22 Added the theory function muMinusExpTF for mu minus fits NEW 2016-04-22 Added the theory function muMinusExpTF for mu minus fits
NEW 2016-02-23 It is now possible to export the averaged data/Fourier NEW 2016-02-23 It is now possible to export the averaged data/Fourier
CHANGED 2016-04-26 start-/endTimeBin are now class members. This reduces CHANGED 2016-04-26 start-/endTimeBin are now class members. This reduces
the number of recalculations. the number of recalculations.
FIXED 2016-08-02 run lists are now properly loaded if containing nS-nE elements.
changes since 0.16.0 changes since 0.16.0
=================================== ===================================

60
doc/examples/UserFcn/Makefile.PUserFcn Normal file
View File

@@ -0,0 +1,60 @@
#---------------------------------------------------
# get compilation flags from root-config
ROOTCFLAGS = $(shell $(ROOTSYS)/bin/root-config --cflags)
#---------------------------------------------------
OS = LINUX
CXX = g++
CXXFLAGS = -O3 -Wall -Wno-trigraphs -fPIC
LOCALINCLUDE = .
ROOTINCLUDE = $(ROOTSYS)/include
INCLUDES = -I$(LOCALINCLUDE) -I$(ROOTINCLUDE)
LD = g++
LDFLAGS =
SOFLAGS = -O -shared
# the output from the root-config script:
CXXFLAGS += $(ROOTCFLAGS)
LDFLAGS +=
# some definitions: headers (used to generate *Dict* stuff), sources, objects,...
OBJS =
OBJS += PUserFcn.o PUserFcnDict.o
SHLIB = libPUserFcn.so
# make the shared lib:
#
all: $(SHLIB)
$(SHLIB): $(OBJS)
@echo "---> Building shared library $(SHLIB) ..."
/bin/rm -f $(SHLIB)
$(LD) $(OBJS) $(SOFLAGS) -o $(SHLIB)
@echo "done"
# clean up: remove all object file (and core files)
# semicolon needed to tell make there is no source
# for this target!
#
clean:; @rm -f $(OBJS) *Dict* core*
@echo "---> removing $(OBJS)"
#
$(OBJS): %.o: %.cpp
$(CXX) $(INCLUDES) $(CXXFLAGS) -c $<
# Generate the ROOT CINT dictionary
PUserFcnDict.cpp: PUserFcn.h PUserFcnLinkDef.h
@echo "Generating dictionary $@..."
rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^
install: all
@echo "Installing shared lib: libTApproximation.so"
ifeq ($(OS),LINUX)
cp -pv $(SHLIB) $(ROOTSYS)/lib
cp -pv $(LOCALINCLUDE)/*.h $(ROOTSYS)/include
endif

59
doc/examples/UserFcn/PUserFcn.cpp Normal file
View File

@@ -0,0 +1,59 @@
/***************************************************************************
PUserFcn.cpp
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
***************************************************************************/
/***************************************************************************
* Copyright (C) 2007-2016 by Andreas Suter *
* andreas.suter@psi.ch *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include <iostream>
using namespace std;
#include <cassert>
#include "PUserFcn.h"
ClassImp(PUserFcn)
//------------------------------------------------------
/**
* <p> user function example: polynome of 3rd order
*
* \f[ = \sum_{k=0}^3 c_k t^k \f]
*
* <b>meaning of paramValues:</b> \f$c_0\f$, \f$c_1\f$, \f$c_2\f$, \f$c_3\f$
*
* <b>return:</b> function value
*
* \param t time in \f$(\mu\mathrm{s})\f$, or x-axis value for non-muSR fit
* \param param parameter vector
*/
Double_t PUserFcn::operator()(Double_t t, const std::vector<Double_t> &param) const
{
// expected parameters: c0, c1, c2, c3
assert(param.size() == 4);
return param[0] + param[1]*t + param[2]*t*t + param[3]*t*t*t;
}

58
doc/examples/UserFcn/PUserFcn.h Normal file
View File

@@ -0,0 +1,58 @@
/***************************************************************************
PUserFcn.h
Author: Andreas Suter
e-mail: andreas.suter@psi.ch
***************************************************************************/
/***************************************************************************
* Copyright (C) 2007-2016 by Andreas Suter *
* andreas.suter@psi.ch *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#ifndef _PUSERFCN_H_
#define _PUSERFCN_H_
#include <vector>
#include "PUserFcnBase.h"
/**
* <p>User function example class. Polynome of 3rd order.
*/
class PUserFcn : public PUserFcnBase
{
public:
PUserFcn() {}
~PUserFcn() {}
// global user-function-access functions, here without any functionality
Bool_t NeedGlobalPart() const { return false; }
void SetGlobalPart(vector<void*> &globalPart, UInt_t idx) { }
Bool_t GlobalPartIsValid() const { return true; }
// function operator
Double_t operator()(Double_t t, const std::vector<Double_t> &param) const;
// definition of the class for the ROOT dictionary
ClassDef(PUserFcn, 1)
};
#endif // _PUSERFCN_H_

15
doc/examples/UserFcn/PUserFcnLinkDef.h Normal file
View File

@@ -0,0 +1,15 @@
/***************************************************************************
PUserFcnLinkDef.h
***************************************************************************/
#ifdef __CINT__
#pragma link off all globals;
#pragma link off all classes;
#pragma link off all functions;
#pragma link C++ class PUserFcn+;
#endif //__CINT__

89
doc/examples/UserFcn/README Normal file
View File

@@ -0,0 +1,89 @@
/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
Simple Example for a User Function without Global Part
/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/_/
Goal: define a user function which implements a polynom
of 3rd order.
For details see: http://lmu.web.psi.ch/musrfit/user/MUSR/MusrFit.html#A_6_User_Functions
Implementation:
3 Files are needed:
1) A header file which defines your user function
interface.
In the example here it is called PUserFcn.h
Please rename it in your case to something more
sensible, e.g. PMyPoly.h. At the same time also
rename correspondingly the class name in your
header file, i.e. PUserFcn -> PMyPoly. This will
be at 4 places in the header file of this example.
2) The source file which defines your user function.
In the example here it is called PUserFcn.cpp
Please rename it accordingly to the header file.
In case the header file is called PMyPoly.h, the
source file will need to be called PMyPoly.cpp.
As for the header file, the class names need to
be adopted: PUserFcn -> PMyPoly.
In the source file change the operator implementation
(Double_t PUserFcn::operator()(Double_t t,
const std::vector<Double_t> &param) const)
to whatever you need.
3) There is another header file needed to generate
the necessary ROOT dictionary.
In this example it is called PUserFcnLinkDef.h
Here you only will need to find PUserFcn+ and
replace it with your class name, e.g. PMyPoly+
Generate Code:
You will find the Makefil.PUserFcn which generates
the needed shared library for your user function.
Again, if your user function is called PMyPoly, you
will need to replace things accordingly in the
Makefile, i.e.
Makefile.PUserFcn -> Makefile.PMyPoly
In the Makefile:
PUserFcn.o -> PMyPoly.o
PUserFcnDict.o -> PMyPolyDict.o
libPUserFcn.so -> libPMyPoly.so
To create the shared library do:
make -f Makefile.PUserFcn
on the command line. This should create a file
libPUserFcn.so.
Next call on the command line:
make -f Makefile.PUserFcn install
This will copy the shared library to the correct
place.
You also will need to make sure that the system is
finding the shared library, either by setting
LD_LIBRARY_PATH or by calling /sbin/ldconfig as
superuser/root assuming you are using linux.
Example msr-file:
You will find an example msr-file test-asy-MUS.msr
which is using PUserFcn. The example is UN-PHYSICALLY
it is just to show how to use a user function.

BIN
doc/examples/UserFcn/data/000100.msr Normal file
View File

Binary file not shown.

55
doc/examples/UserFcn/test-asy-MUD.msr Normal file
View File

@@ -0,0 +1,55 @@
MgB12H12 No2 ZF T=150
###############################################################
FITPARAMETER
# Nr. Name Value Step Pos_Error Boundaries
1 alpha 1 0 none 0 2
2 asy 0.1650 0.0027 none 0 0.33
3 c0 1.047 0.016 none
4 c1 -0.1957 0.0038 none
5 c2 0.0216 0.0011 none
6 c3 -0.00119 0.00011 none
###############################################################
THEORY
asymmetry 2
userFcn libPUserFcn PUserFcn 3 4 5 6
###############################################################
RUN data/000100 XXXX TRIUMF MUD (name beamline institute data-file-format)
fittype 2 (asymmetry fit)
alpha 1
map 0 0 0 0 0 0 0 0 0 0 0
forward 1
backward 2
background 79 391 80 409 # estimated bkg: 21.0833 / 17.2249
data 438 12785 436 12787
t0 432.0 431.0
fit 0 8
packing 100
###############################################################
COMMANDS
MINIMIZE
MINOS
#HESSE
SAVE
###############################################################
FOURIER
units Gauss # units either 'Gauss', 'Tesla', 'MHz', or 'Mc/s'
fourier_power 12
apodization NONE # NONE, WEAK, MEDIUM, STRONG
plot POWER # REAL, IMAG, REAL_AND_IMAG, POWER, PHASE
phase 8
#range_for_phase_correction 50.0 70.0
range 0 2000
dc-corrected true
###############################################################
PLOT 2 (asymmetry plot)
runs 1
range 0 9 0 0.22
###############################################################
STATISTIC --- 2016-06-22 09:34:01
chisq = 152.4, NDF = 97, chisq/NDF = 1.571461

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:37 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:13 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1461652732" type="application/x-wiki" title="edit BmwLibs" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/BmwLibs?t=1461829167" type="application/x-wiki" title="edit BmwLibs" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><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 CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
<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 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' /> <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"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -101,15 +101,15 @@
<!--<![endif]--> <!--<![endif]-->
<!--JQUERYPLUGIN--> <!--JQUERYPLUGIN-->
<!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::COMMENT--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--> <!--PatternSkin/pattern-->
<!--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> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -149,6 +149,6 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:38 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/BmwLibs?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:14 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

18
doc/html/user/MUSR/CiteMusrFit.html
View File

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:31 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:06 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1461652731" type="application/x-wiki" title="edit CiteMusrFit" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/CiteMusrFit?t=1461829166" type="application/x-wiki" title="edit CiteMusrFit" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--> <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--> <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 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 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 rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
<style type="text/css" media="all"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -106,10 +106,10 @@
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--> <!--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--> <!--JavascriptFiles/foswikiForm-->
<!--JQUERYPLUGIN::COMMENT-->
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
</head> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -147,6 +147,6 @@ Topic revision: <span class='patternRevInfo'>19 Jun 2012, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:31 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/CiteMusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:06 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:31 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:07 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1461652732" type="application/x-wiki" title="edit LibFitPofB" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibFitPofB?t=1461829167" type="application/x-wiki" title="edit LibFitPofB" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS--> <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--> <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 JQUERYPLUGIN::COMMENT' rel='stylesheet' href='../pub/System/CommentPlugin/commentf5b6.css?version=3.0' type='text/css' media='all' /><!--JQUERYPLUGIN::COMMENT-->
<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' /> <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"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -104,12 +104,12 @@
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JQUERYPLUGIN::METADATA--> <!--JQUERYPLUGIN::METADATA-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--PatternSkin/pattern--> <!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--> <!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
@@ -428,6 +428,6 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:37 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibFitPofB?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:13 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:38:58 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:33 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1461652728" type="application/x-wiki" title="edit LibZFRelaxation" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/LibZFRelaxation?t=1461829164" type="application/x-wiki" title="edit LibZFRelaxation" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<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--> <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 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 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 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"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -104,15 +104,15 @@
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JQUERYPLUGIN::METADATA-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::COMMENT--> <!--JQUERYPLUGIN::COMMENT-->
<!--JQUERYPLUGIN::METADATA-->
<!--JQUERYPLUGIN::CHILI-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--> <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
</head> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -233,6 +233,6 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:01 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/LibZFRelaxation?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:36 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:31 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:06 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,11 +14,15 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1461652732" type="application/x-wiki" title="edit Msr2Data" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/Msr2Data?t=1461829167" type="application/x-wiki" title="edit Msr2Data" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all"> <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 IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
<style class='head TABLEPLUGIN_default' type="text/css" media="all">
body .foswikiTable {border-width:1px} body .foswikiTable {border-width:1px}
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom} body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
body .foswikiTable td {border-style:solid none; vertical-align:top} body .foswikiTable td {border-style:solid none; vertical-align:top}
@@ -32,9 +36,8 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6} body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee} body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
</style><!--TABLEPLUGIN_default--> </style><!--TABLEPLUGIN_default-->
<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 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 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"> <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
body .foswikiTable#tableMsr2Data1 td {vertical-align:middle; vertical-align:top} body .foswikiTable#tableMsr2Data1 td {vertical-align:middle; vertical-align:top}
body .foswikiTable#tableMsr2Data1 td.foswikiTableCol0 {text-align:left} body .foswikiTable#tableMsr2Data1 td.foswikiTableCol0 {text-align:left}
@@ -52,10 +55,7 @@ body .foswikiTable#tableMsr2Data1 th a:hover {color:#0066cc; background-color:#f
body .foswikiTable#tableMsr2Data1 th.foswikiSortedCol {background-color:#eeeeee} body .foswikiTable#tableMsr2Data1 th.foswikiSortedCol {background-color:#eeeeee}
body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff} body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5} body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
</style><!--TABLEPLUGIN_specific--> </style><!--TABLEPLUGIN_specific--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/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 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 rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
<style type="text/css" media="all"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -138,13 +138,13 @@ body .foswikiTable#tableMsr2Data1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JQUERYPLUGIN::METADATA--> <!--JQUERYPLUGIN::METADATA-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--> <!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiForm-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::TWISTY--> <!--JQUERYPLUGIN::TWISTY-->
<!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern--> <!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--> <!--JQUERYPLUGIN::CHILI--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
@@ -241,6 +241,7 @@ As mentioned already above there are some optional parameters which change the b
</dd> <dt> header </dt><dd> Force the output of the file header&#151;even if the output file was present before. </dd> <dt> header </dt><dd> Force the output of the file header&#151;even if the output file was present before.
</dd> <dt> noheader </dt><dd> The output of the file header is suppressed&#151;also if the output file is newly created.<br>If either both or none of the header options are given, <code>msr2data</code> writes the file header only to new files and it solely appends the data blocks to an existing output file assuming that the header is present already. </dd> <dt> noheader </dt><dd> The output of the file header is suppressed&#151;also if the output file is newly created.<br>If either both or none of the header options are given, <code>msr2data</code> writes the file header only to new files and it solely appends the data blocks to an existing output file assuming that the header is present already.
</dd> <dt> nosummary </dt><dd> There will be no attempt to read additional information like the temperature or the applied magnetic field from the data files even if these information were present there. </dd> <dt> nosummary </dt><dd> There will be no attempt to read additional information like the temperature or the applied magnetic field from the data files even if these information were present there.
</dd> <dt> paramList &lt;param&gt; </dt><dd> option used to select the parameters which shall be exported. &lt;param&gt; is a list of parameter numbers to be exported. Allowed lists are: &lt;startNo&gt;-&lt;endNo&gt;, e.g. 1-16 will export parameters 1 to 16. Space separated numbers, e.g.: 1 3 5. A combination of both is possible, e.g. 1-16 19 31 62, and so on.
</dd> <dt> -o&lt;outputFileName&gt;, -o &lt;outputFileName&gt; </dt><dd> The processed data will be written to the file <strong>&lt;outputFileName&gt;</strong> instead of the default <code><b>out.db</b></code> or <code><b>out.dat</b></code>. If <strong>&lt;outputFileName&gt;</strong> is equal to <strong>none</strong> (case-insensitive) the parameter data are <em>not appended</em> to any output file. </dd> <dt> -o&lt;outputFileName&gt;, -o &lt;outputFileName&gt; </dt><dd> The processed data will be written to the file <strong>&lt;outputFileName&gt;</strong> instead of the default <code><b>out.db</b></code> or <code><b>out.dat</b></code>. If <strong>&lt;outputFileName&gt;</strong> is equal to <strong>none</strong> (case-insensitive) the parameter data are <em>not appended</em> to any output file.
</dd> <dt> fit </dt><dd> Additionally to the final data collection <code>msr2data</code> will invoke musrfit to fit the specified runs. All msr files are assumed to be present, none is newly generated! </dd> <dt> fit </dt><dd> Additionally to the final data collection <code>msr2data</code> will invoke musrfit to fit the specified runs. All msr files are assumed to be present, none is newly generated!
</dd> <dt> fit-&lt;template&gt;[!] </dt><dd> Additionally to the final data collection <code>msr2data</code> will generate msr files for the runs specified in the list of runs and invoke <code>musrfit</code> for performing fits of the data. As template for the first run the file <code><b>&lt;template&gt;&lt;extension&gt;.msr</b></code> (or if not available: <code><b>&lt;template&gt;&lt;extension&gt;.mlog</b></code>) is used; the subsequent input files will be created using the msr output of the last processed runs ("chain fit"). However, if for <em>all</em> runs only the given template should be used one has to append an exclamation mark (<strong>!</strong>) to the <strong>&lt;template&gt;</strong>. </dd> <dt> fit-&lt;template&gt;[!] </dt><dd> Additionally to the final data collection <code>msr2data</code> will generate msr files for the runs specified in the list of runs and invoke <code>musrfit</code> for performing fits of the data. As template for the first run the file <code><b>&lt;template&gt;&lt;extension&gt;.msr</b></code> (or if not available: <code><b>&lt;template&gt;&lt;extension&gt;.mlog</b></code>) is used; the subsequent input files will be created using the msr output of the last processed runs ("chain fit"). However, if for <em>all</em> runs only the given template should be used one has to append an exclamation mark (<strong>!</strong>) to the <strong>&lt;template&gt;</strong>.
@@ -270,6 +271,12 @@ Take the <strong>given</strong> msr files <code><b>8472.msr</b></code> through <
msr2data 8472 8475 &#95;tf&#95;h13 msr-8471! msr2data 8472 8475 &#95;tf&#95;h13 msr-8471!
</pre> </pre>
Using <code><b>8471_tf_h13.msr</b></code> as template for <em>all</em> runs, <code>msr2data</code> generates the msr input files <code><b>8472_tf_h13.msr</b></code> through <code><b>8475_tf_h13.msr</b></code>. <span class='foswikiRedFG'>No fitting will be performed and no DB or ASCII output will be generated!</span> Using <code><b>8471_tf_h13.msr</b></code> as template for <em>all</em> runs, <code>msr2data</code> generates the msr input files <code><b>8472_tf_h13.msr</b></code> through <code><b>8475_tf_h13.msr</b></code>. <span class='foswikiRedFG'>No fitting will be performed and no DB or ASCII output will be generated!</span>
<pre class="bash">
msr2data &#91;8472 8475-8479&#93; &#95;tf&#95;h13 paramList 1-16 data -o bestData.dat
</pre>
Will collect the parameters 1 to 16 from the msr-files <code><b>8472_tf_h13.msr</b></code>, <code><b>8475_tf_h13.msr</b></code>, <code><b>8476_tf_h13.msr</b></code>, <code><b>8477_tf_h13.msr</b></code>, <code><b>8478_tf_h13.msr</b></code>, and <code><b>8479_tf_h13.msr</b></code> and write these parameters into a column like output file <code><b>bestData.dat</b></code>.
<p></p>
<p></p>
<p></p> <p></p>
<span id="TheGlobalMode"></span> <span id="TheGlobalMode"></span>
<h1 id="A_4_The_Global_Mode"> 4 The Global Mode </h1> <h1 id="A_4_The_Global_Mode"> 4 The Global Mode </h1>
@@ -410,7 +417,7 @@ For reporting bugs or requesting new features and improvements please use the <a
</tbody></table> </tbody></table>
</div></div></div></div> </div></div></div></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>Msr2Data <br /> <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>Msr2Data <br />
Topic revision: <span class='patternRevInfo'>16 Aug 2015, suter_a</span></div> Topic revision: <span class='patternRevInfo'>28 Apr 2016, <a href="https://intranet.psi.ch/Main/AndreasSuter">AndreasSuter</a></span></div>
</div> </div>
</div> </div>
</div> </div>
@@ -428,6 +435,6 @@ Topic revision: <span class='patternRevInfo'>16 Aug 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:31 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/Msr2Data?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:07 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:07 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:42 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,15 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1461652731" type="application/x-wiki" title="edit MusrFit" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFit?t=1461829166" type="application/x-wiki" title="edit MusrFit" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<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--> <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-->
<link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--> <link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
<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 CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
<style class='head TABLEPLUGIN_default' type="text/css" media="all"> <style class='head TABLEPLUGIN_default' type="text/css" media="all">
body .foswikiTable {border-width:1px} body .foswikiTable {border-width:1px}
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom} body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
@@ -35,8 +36,7 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f7f7f6} body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f7f7f6}
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6} body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee} body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
</style><!--TABLEPLUGIN_default--> </style><!--TABLEPLUGIN_default--><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"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -116,18 +116,18 @@ body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-col
<!--<![endif]--> <!--<![endif]-->
<!--JQUERYPLUGIN--> <!--JQUERYPLUGIN-->
<!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::METADATA-->
<!--JQUERYPLUGIN::CHILI-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern--> <!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::METADATA--> <!--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-->
<!--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> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -1696,6 +1696,6 @@ Topic revision: <span class='patternRevInfo'>26 Apr 2016, <a href="https://intr
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:30 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFit?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:06 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:07 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:42 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1461652731" type="application/x-wiki" title="edit MusrFitAcknowledgements" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitAcknowledgements?t=1461829166" type="application/x-wiki" title="edit MusrFitAcknowledgements" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<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--> <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 SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
<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' /> <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 rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
<style type="text/css" media="all"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -104,11 +104,11 @@
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiPref-->
<!--PatternSkin/pattern--><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> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -145,6 +145,6 @@ Topic revision: <span class='patternRevInfo'>03 Jul 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:07 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitAcknowledgements?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:42 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:07 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:42 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,12 +14,12 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1461652730" type="application/x-wiki" title="edit MusrFitSetup" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrFitSetup?t=1461829165" type="application/x-wiki" title="edit MusrFitSetup" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<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--> <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 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 class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--> <link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
<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' /> <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"> <style type="text/css" media="all">
@@ -104,14 +104,14 @@
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JavascriptFiles/foswikiString-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--> <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JQUERYPLUGIN::METADATA--> <!--JQUERYPLUGIN::METADATA-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiForm-->
<!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::COMMENT--> <!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::CHILI--> <!--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--> <!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
</head> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -923,6 +923,6 @@ Topic revision: <span class='patternRevInfo'>23 Nov 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:07 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrFitSetup?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:42 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:05 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:40 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,12 +14,11 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1461652730" type="application/x-wiki" title="edit MusrGui" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrGui?t=1461829165" type="application/x-wiki" title="edit MusrGui" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN--> <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 CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
<style class='head TABLEPLUGIN_default' type="text/css" media="all"> <style class='head TABLEPLUGIN_default' type="text/css" media="all">
body .foswikiTable {border-width:1px} body .foswikiTable {border-width:1px}
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom} body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
@@ -36,8 +35,9 @@ body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-col
</style><!--TABLEPLUGIN_default--> </style><!--TABLEPLUGIN_default-->
<link class='head SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--> <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 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 IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN-->
<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 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-->
<style class='head TABLEPLUGIN_specific' type="text/css" media="all"> <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
body .foswikiTable#tableMusrGui1 td {vertical-align:middle; vertical-align:top} body .foswikiTable#tableMusrGui1 td {vertical-align:middle; vertical-align:top}
body .foswikiTable#tableMusrGui1 td.foswikiTableCol0 {text-align:left} body .foswikiTable#tableMusrGui1 td.foswikiTableCol0 {text-align:left}
@@ -135,19 +135,19 @@ body .foswikiTable#tableMusrGui1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {
<!--<![endif]--> <!--<![endif]-->
<!--JQUERYPLUGIN--> <!--JQUERYPLUGIN-->
<!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::MIGRATE-->
<!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::TWISTY-->
<!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::METADATA--> <!--JQUERYPLUGIN::METADATA-->
<!--JQUERYPLUGIN::CHILI--> <!--JQUERYPLUGIN::CHILI-->
<!--JavascriptFiles/foswikiString--> <!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiPref--> <!--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-->
<!--JQUERYPLUGIN::TWISTY-->
<!--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> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -394,6 +394,6 @@ Topic revision: <span class='patternRevInfo'>19 Feb 2015, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:07 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrGui?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:42 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

22
doc/html/user/MUSR/MusrRoot.html
View File

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:38:52 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:28 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,11 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1461652727" type="application/x-wiki" title="edit MusrRoot" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/MusrRoot?t=1461829163" type="application/x-wiki" title="edit MusrRoot" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><style class='head TABLEPLUGIN_default' type="text/css" media="all"> <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 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_default' type="text/css" media="all">
body .foswikiTable {border-width:1px} body .foswikiTable {border-width:1px}
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom} body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
body .foswikiTable td {border-style:solid none; vertical-align:top} body .foswikiTable td {border-style:solid none; vertical-align:top}
@@ -32,6 +35,7 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6} body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee} body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
</style><!--TABLEPLUGIN_default--> </style><!--TABLEPLUGIN_default-->
<link class='head CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
<style class='head TABLEPLUGIN_specific' type="text/css" media="all"> <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
body .foswikiTable#tableMusrRoot7 td {vertical-align:middle; vertical-align:top} body .foswikiTable#tableMusrRoot7 td {vertical-align:middle; vertical-align:top}
body .foswikiTable#tableMusrRoot7 td.foswikiTableCol0 {text-align:left} body .foswikiTable#tableMusrRoot7 td.foswikiTableCol0 {text-align:left}
@@ -51,11 +55,7 @@ body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td {background-color
body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5} body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
</style><!--TABLEPLUGIN_specific--> </style><!--TABLEPLUGIN_specific-->
<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 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 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 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 SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN-->
<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 rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
<style type="text/css" media="all"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -136,17 +136,17 @@ body .foswikiTable#tableMusrRoot7 tr.foswikiTableRowdataBg0 td.foswikiSortedCol
<!--<![endif]--> <!--<![endif]-->
<!--JQUERYPLUGIN--> <!--JQUERYPLUGIN-->
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::LIVEQUERY-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::TWISTY-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern--> <!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::METADATA--> <!--JQUERYPLUGIN::METADATA-->
<!--JQUERYPLUGIN::CHILI--> <!--JQUERYPLUGIN::CHILI-->
<!--JQUERYPLUGIN::COMMENT--> <!--JQUERYPLUGIN::COMMENT-->
<!--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--> <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
</head> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -1125,6 +1125,6 @@ Topic revision: <span class='patternRevInfo'>29 Mar 2012, suter_a</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:38:58 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/MusrRoot?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:33 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:04 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:39 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,14 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1461652730" type="application/x-wiki" title="edit QuickStart" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/QuickStart?t=1461829164" type="application/x-wiki" title="edit QuickStart" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<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--> <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 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 CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::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' /> <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"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -104,12 +104,12 @@
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS--> <!--PatternSkin/pattern-->
<!--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> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -285,6 +285,6 @@ Topic revision: <span class='patternRevInfo'>10 Jul 2011, wojek</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:05 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/QuickStart?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:40 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:01 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:36 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,12 +14,14 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1461652729" type="application/x-wiki" title="edit TutorialSingleHisto" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/TutorialSingleHisto?t=1461829164" type="application/x-wiki" title="edit TutorialSingleHisto" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><link class='head IMAGEPLUGIN' rel="stylesheet" href="../pub/System/ImagePlugin/style.css" type="text/css" media="all" /><!--IMAGEPLUGIN--> <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 SMILIESPLUGIN' rel='stylesheet' href='../pub/System/SmiliesPlugin/smilies.css' type='text/css' media='all' /><!--SMILIESPLUGIN--> <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 CLASSIFICATIONPLUGIN::CSS' rel="stylesheet" href="../pub/System/ClassificationPlugin/styles.css" media="all" /><!--CLASSIFICATIONPLUGIN::CSS-->
<style class='head TABLEPLUGIN_default' type="text/css" media="all"> <style class='head TABLEPLUGIN_default' type="text/css" media="all">
body .foswikiTable {border-width:1px} body .foswikiTable {border-width:1px}
body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom} body .foswikiTable .tableSortIcon img {padding-left:.3em; vertical-align:text-bottom}
@@ -34,9 +36,8 @@ body .foswikiTable tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-col
body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6} body .foswikiTable tr.foswikiTableRowdataBg1 td {background-color:#f7f7f6}
body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee} body .foswikiTable tr.foswikiTableRowdataBg1 td.foswikiSortedCol {background-color:#f0f0ee}
</style><!--TABLEPLUGIN_default--> </style><!--TABLEPLUGIN_default-->
<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 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-->
<style class='head TABLEPLUGIN_specific' type="text/css" media="all"> <style class='head TABLEPLUGIN_specific' type="text/css" media="all">
body .foswikiTable#tableTutorialSingleHisto1 td {vertical-align:middle; vertical-align:top} body .foswikiTable#tableTutorialSingleHisto1 td {vertical-align:middle; vertical-align:top}
body .foswikiTable#tableTutorialSingleHisto1 td.foswikiTableCol0 {text-align:left} body .foswikiTable#tableTutorialSingleHisto1 td.foswikiTableCol0 {text-align:left}
@@ -54,8 +55,7 @@ body .foswikiTable#tableTutorialSingleHisto1 th a:hover {color:#0066cc; backgrou
body .foswikiTable#tableTutorialSingleHisto1 th.foswikiSortedCol {background-color:#eeeeee} body .foswikiTable#tableTutorialSingleHisto1 th.foswikiSortedCol {background-color:#eeeeee}
body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff} body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td {background-color:#ffffff}
body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5} body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswikiSortedCol {background-color:#f5f5f5}
</style><!--TABLEPLUGIN_specific--> </style><!--TABLEPLUGIN_specific--><link rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/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 rel='stylesheet' href='../pub/System/SkinTemplates/base.css' media='all' type='text/css' />
<style type="text/css" media="all"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@import url('../pub/System/PatternSkinTheme2009/style.css'); @import url('../pub/System/PatternSkinTheme2009/style.css');
@@ -138,12 +138,12 @@ body .foswikiTable#tableTutorialSingleHisto1 tr.foswikiTableRowdataBg0 td.foswik
<!--JQUERYPLUGIN::MIGRATE--> <!--JQUERYPLUGIN::MIGRATE-->
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref--> <!--JavascriptFiles/foswikiPref-->
<!--JQUERYPLUGIN::TWISTY--> <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--JQUERYPLUGIN::COMMENT-->
<!--JQUERYPLUGIN::TWISTY-->
<!--PatternSkin/pattern--><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> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
@@ -401,6 +401,6 @@ Topic revision: <span class='patternRevInfo'>02 Sep 2011, wojek</span></div>
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:04 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/TutorialSingleHisto?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:39:39 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

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

@@ -1,6 +1,6 @@
<!DOCTYPE html><html lang="en"> <!DOCTYPE html><html lang="en">
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:38 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:14 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
<head> <head>
<link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" /> <link rel="stylesheet" href="../pub/System/HeadlinesPlugin/style.css" type="text/css" media="all" />
@@ -14,13 +14,13 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> <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="icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" /> <link rel="shortcut icon" href="../pub/Main/WebPreferences/favicon.ico" type="image/x-icon" />
<link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1461652732" type="application/x-wiki" title="edit WebHome" /> <link rel="alternate" href="https://intranet.psi.ch/wiki/bin/edit/MUSR/WebHome?t=1461829167" type="application/x-wiki" title="edit WebHome" />
<meta name="TEXT_NUM_TOPICS" content="Number of topics:" /> <meta name="TEXT_NUM_TOPICS" content="Number of topics:" />
<meta name="TEXT_MODIFY_SEARCH" content="Modify search" /> <meta name="TEXT_MODIFY_SEARCH" content="Modify search" />
<meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" /> <meta name="robots" content="noindex" /><link rel="alternate" type="application/rss+xml" title="RSS Feed" href="WebRsshtml.html" />
<base /><!--[if IE]></base><![endif]--><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 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 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' /> <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"> <style type="text/css" media="all">
@import url('../pub/System/PatternSkinTheme/layout.css'); @import url('../pub/System/PatternSkinTheme/layout.css');
@@ -105,11 +105,11 @@
<!--JQUERYPLUGIN::LIVEQUERY--> <!--JQUERYPLUGIN::LIVEQUERY-->
<!--JQUERYPLUGIN::FOSWIKI--> <!--JQUERYPLUGIN::FOSWIKI-->
<!--JavascriptFiles/foswikiString--> <!--JavascriptFiles/foswikiString-->
<!--JavascriptFiles/foswikiPref-->
<!--JavascriptFiles/foswikiForm--> <!--JavascriptFiles/foswikiForm-->
<!--PatternSkin/pattern-->
<!--JQUERYPLUGIN::COMMENT--> <!--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--> <!--JQUERYPLUGIN::FOSWIKI::PREFERENCES-->
<!--JavascriptFiles/foswikiPref-->
<!--PatternSkin/pattern--><link class='head FOOTNOTEPLUGIN_LINKCSS' rel="stylesheet" href="../pub/System/FootNotePlugin/styles.css" type="text/css" media="all" /><!--FOOTNOTEPLUGIN_LINKCSS-->
</head> </head>
<body class="foswikiNoJs patternViewPage patternPrintPage"> <body class="foswikiNoJs patternViewPage patternPrintPage">
<span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen"> <span id="PageTop"></span><div class="foswikiPage"><div id="patternScreen">
@@ -161,6 +161,6 @@ Topic revision: <span class='patternRevInfo'>26 Apr 2016, <a href="https://intr
</body> </body>
<!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Tue, 26 Apr 2016 06:39:39 GMT --> <!-- Mirrored from intranet.psi.ch/MUSR/WebHome?cover=print by HTTrack Website Copier/3.x [XR&CO'2010], Thu, 28 Apr 2016 07:40:15 GMT -->
<!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack --> <!-- Added by HTTrack --><meta http-equiv="content-type" content="text/html;charset=utf-8"><!-- /Added by HTTrack -->
</html> </html>

320
src/classes/PMsr2Data.cpp
View File

@@ -1643,13 +1643,23 @@ bool PMsr2Data::PrepareNewSortedInputFile(unsigned int tempRun) const
* - -2 if a fit has not converged (and the data is not appended to the output file) * - -2 if a fit has not converged (and the data is not appended to the output file)
* *
* \param outfile name of the DB/ASCII output file * \param outfile name of the DB/ASCII output file
* \param paramList parameter list which shall be written to the output file
* \param db DB or plain ASCII output * \param db DB or plain ASCII output
* \param withHeader write output file header or not * \param withHeader write output file header or not
* \param global global mode or not * \param global global mode or not
* \param counter counter used within the global mode to determine how many runs have been processed already * \param counter counter used within the global mode to determine how many runs have been processed already
*/ */
int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHeader, bool global, unsigned int counter) const int PMsr2Data::WriteOutput(const string &outfile, const vector<unsigned int>& paramList, bool db,
unsigned int withHeader, bool global, unsigned int counter) const
{ {
// make sure that the parameter number of the parameter list stays within proper bounds
for (unsigned int i=0; i<paramList.size(); i++) {
if (paramList[i] > fMsrHandler->GetMsrParamList()->size()) {
cerr << "msr2data: **ERROR** found parameter " << paramList[i] << " which is out of bound (>" << fMsrHandler->GetMsrParamList()->size() << ")." << endl;
return -1;
}
}
if (!to_lower_copy(outfile).compare("none")) { if (!to_lower_copy(outfile).compare("none")) {
fRunVectorIter++; fRunVectorIter++;
return PMUSR_SUCCESS; return PMUSR_SUCCESS;
@@ -2008,7 +2018,7 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
if (fDataHandler) { if (fDataHandler) {
for (unsigned int i(0); i < dataParamLabels.size(); ++i) { for (unsigned int i(0); i < dataParamLabels.size(); ++i) {
outFile << dataParamLabels[i] << endl; outFile << dataParamLabels[i] << endl;
} }
} }
@@ -2022,22 +2032,26 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
if (global) { if (global) {
string tempName; string tempName;
for (unsigned int i(0); i < fNumGlobalParam; ++i) { for (unsigned int i(0); i < fNumGlobalParam; ++i) {
outFile << (*msrParamList)[i].fName.Data() << endl; if (InParameterList(i, paramList))
outFile << (*msrParamList)[i].fName.Data() << endl;
} }
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data(); if (InParameterList(fNumGlobalParam + fNumSpecParam*counter + i, paramList)) {
string::size_type loc = tempName.rfind(curRunNumber.str()); tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
if (loc == tempName.length() - fRunNumberDigits) { string::size_type loc = tempName.rfind(curRunNumber.str());
outFile << tempName.substr(0, loc) << endl; if (loc == tempName.length() - fRunNumberDigits) {
} else { outFile << tempName.substr(0, loc) << endl;
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!"; } else {
cerr << endl << ">> msr2data: **ERROR** The output will be flawed!"; cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!";
cerr << endl; cerr << endl << ">> msr2data: **ERROR** The output will be flawed!";
cerr << endl;
}
} }
} }
} else { } else {
for (unsigned int i(0); i < msrNoOfParams; ++i) { for (unsigned int i(0); i < msrNoOfParams; ++i) {
outFile << (*msrParamList)[i].fName.Data() << endl; if (InParameterList(i, paramList))
outFile << (*msrParamList)[i].fName.Data() << endl;
} }
} }
@@ -2073,22 +2087,26 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
if (global) { if (global) {
string tempName; string tempName;
for (unsigned int i(0); i < fNumGlobalParam; ++i) { for (unsigned int i(0); i < fNumGlobalParam; ++i) {
outFile << " " << (*msrParamList)[i].fName.Data(); if (InParameterList(i, paramList))
outFile << " " << (*msrParamList)[i].fName.Data();
} }
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data(); if (InParameterList(i, paramList)) {
string::size_type loc = tempName.rfind(curRunNumber.str()); tempName = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
if (loc == tempName.length() - fRunNumberDigits) { string::size_type loc = tempName.rfind(curRunNumber.str());
outFile << " " << tempName.substr(0, loc); if (loc == tempName.length() - fRunNumberDigits) {
} else { outFile << " " << tempName.substr(0, loc);
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!"; } else {
cerr << endl << ">> msr2data: **ERROR** The output will be flawed!"; cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!";
cerr << endl; cerr << endl << ">> msr2data: **ERROR** The output will be flawed!";
cerr << endl;
}
} }
} }
} else { } else {
for (unsigned int i(0); i < msrNoOfParams; ++i) { for (unsigned int i(0); i < msrNoOfParams; ++i) {
outFile << " " << (*msrParamList)[i].fName.Data(); if (InParameterList(i, paramList))
outFile << " " << (*msrParamList)[i].fName.Data();
} }
} }
@@ -2132,61 +2150,67 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
string tempName; string tempName;
unsigned int idx; unsigned int idx;
for (unsigned int i(0); i < fNumGlobalParam; ++i) { for (unsigned int i(0); i < fNumGlobalParam; ++i) {
outFile << (*msrParamList)[i].fName.Data() << " = "; if (InParameterList(i, paramList)) {
if ((*msrParamList)[i].fPosErrorPresent) { outFile << (*msrParamList)[i].fName.Data() << " = ";
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, outFile.width(), db); if ((*msrParamList)[i].fPosErrorPresent) {
outFile << ", "; WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, outFile.width(), db);
} else { outFile << ", ";
outFile << (*msrParamList)[i].fValue << ", "; } else {
} outFile << (*msrParamList)[i].fValue << ", ";
}
if ((*msrParamList)[i].fPosErrorPresent) if ((*msrParamList)[i].fPosErrorPresent)
outFile << (*msrParamList)[i].fPosError << ", "; outFile << (*msrParamList)[i].fPosError << ", ";
else else
outFile << fabs((*msrParamList)[i].fStep) << ", "; outFile << fabs((*msrParamList)[i].fStep) << ", ";
outFile << fabs((*msrParamList)[i].fStep) << ",\\" << endl; outFile << fabs((*msrParamList)[i].fStep) << ",\\" << endl;
}
} }
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
idx = fNumGlobalParam + fNumSpecParam*counter + i; idx = fNumGlobalParam + fNumSpecParam*counter + i;
tempName = (*msrParamList)[idx].fName.Data(); if (InParameterList(idx, paramList)) {
string::size_type loc = tempName.rfind(curRunNumber.str()); tempName = (*msrParamList)[idx].fName.Data();
if (loc == tempName.length() - fRunNumberDigits) { string::size_type loc = tempName.rfind(curRunNumber.str());
outFile << tempName.substr(0, loc) << " = "; if (loc == tempName.length() - fRunNumberDigits) {
if ((*msrParamList)[idx].fPosErrorPresent) { outFile << tempName.substr(0, loc) << " = ";
WriteValue(outFile, (*msrParamList)[idx].fValue, (*msrParamList)[idx].fPosError, outFile.width(), db); if ((*msrParamList)[idx].fPosErrorPresent) {
outFile << ", "; WriteValue(outFile, (*msrParamList)[idx].fValue, (*msrParamList)[idx].fPosError, outFile.width(), db);
} else { outFile << ", ";
outFile << (*msrParamList)[idx].fValue << ", "; } else {
} outFile << (*msrParamList)[idx].fValue << ", ";
if ((*msrParamList)[idx].fPosErrorPresent) { }
WriteValue(outFile, (*msrParamList)[idx].fPosError, (*msrParamList)[idx].fPosError, outFile.width(), db); if ((*msrParamList)[idx].fPosErrorPresent) {
outFile << ", "; WriteValue(outFile, (*msrParamList)[idx].fPosError, (*msrParamList)[idx].fPosError, outFile.width(), db);
} else { outFile << ", ";
} else {
WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, outFile.width(), db);
outFile << ", ";
}
WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, outFile.width(), db); WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, outFile.width(), db);
outFile << ", "; outFile << ",\\" << endl;
} }
WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, outFile.width(), db);
outFile << ",\\" << endl;
} }
} }
} else { } else {
for (unsigned int i(0); i < msrNoOfParams; ++i) { for (unsigned int i(0); i < msrNoOfParams; ++i) {
outFile << (*msrParamList)[i].fName.Data() << " = "; if (InParameterList(i, paramList)) {
if ((*msrParamList)[i].fPosErrorPresent) { outFile << (*msrParamList)[i].fName.Data() << " = ";
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, outFile.width(), db); if ((*msrParamList)[i].fPosErrorPresent) {
outFile << ", "; WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, outFile.width(), db);
} else { outFile << ", ";
outFile << (*msrParamList)[i].fValue << ", "; } else {
} outFile << (*msrParamList)[i].fValue << ", ";
if ((*msrParamList)[i].fPosErrorPresent) { }
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, outFile.width(), db); if ((*msrParamList)[i].fPosErrorPresent) {
outFile << ", "; WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, outFile.width(), db);
} else { outFile << ", ";
} else {
WriteValue(outFile, (*msrParamList)[i].fStep, (*msrParamList)[i].fStep, outFile.width(), db);
outFile << ", ";
}
WriteValue(outFile, (*msrParamList)[i].fStep, (*msrParamList)[i].fStep, outFile.width(), db); WriteValue(outFile, (*msrParamList)[i].fStep, (*msrParamList)[i].fStep, outFile.width(), db);
outFile << ", "; outFile << ",\\" << endl;
} }
WriteValue(outFile, (*msrParamList)[i].fStep, (*msrParamList)[i].fStep, outFile.width(), db);
outFile << ",\\" << endl;
} }
} }
@@ -2221,30 +2245,38 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
string s; string s;
if (global) { if (global) {
for (unsigned int i(0); i < fNumGlobalParam; ++i) { for (unsigned int i(0); i < fNumGlobalParam; ++i) {
s = (*msrParamList)[i].fName.Data(); if (InParameterList(i, paramList)) {
length = s.length(); s = (*msrParamList)[i].fName.Data();
if (length > maxlength) length = s.length();
maxlength = length;
}
for (unsigned int i(0); i < fNumSpecParam; ++i) {
s = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
string::size_type loc = s.rfind(curRunNumber.str());
if (loc == s.length() - fRunNumberDigits) {
length = s.length() - fRunNumberDigits;
if (length > maxlength) if (length > maxlength)
maxlength = length; maxlength = length;
} else { }
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!"; }
cerr << endl << ">> msr2data: **ERROR** The output will be flawed!"; unsigned int idx;
cerr << endl; for (unsigned int i(0); i < fNumSpecParam; ++i) {
idx = fNumGlobalParam + fNumSpecParam*counter + i;
if (InParameterList(idx, paramList)) {
s = (*msrParamList)[idx].fName.Data();
string::size_type loc = s.rfind(curRunNumber.str());
if (loc == s.length() - fRunNumberDigits) {
length = s.length() - fRunNumberDigits;
if (length > maxlength)
maxlength = length;
} else {
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!";
cerr << endl << ">> msr2data: **ERROR** The output will be flawed!";
cerr << endl;
}
} }
} }
} else { } else {
for (unsigned int i(0); i < msrNoOfParams; ++i) { for (unsigned int i(0); i < msrNoOfParams; ++i) {
s = (*msrParamList)[i].fName.Data(); if (InParameterList(i, paramList)) {
length = s.length(); s = (*msrParamList)[i].fName.Data();
if (length > maxlength) length = s.length();
maxlength = length; if (length > maxlength)
maxlength = length;
}
} }
} }
if (maxlength < 13) if (maxlength < 13)
@@ -2274,31 +2306,39 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
// in the GLOBAL mode write only global parameters and those which belong to the actual run - in the NORMAL mode write all parameters // in the GLOBAL mode write only global parameters and those which belong to the actual run - in the NORMAL mode write all parameters
if (global) { if (global) {
for (unsigned int i(0); i < fNumGlobalParam; ++i) { for (unsigned int i(0); i < fNumGlobalParam; ++i) {
s = (*msrParamList)[i].fName.Data(); if (InParameterList(i, paramList)) {
outFile << setw(maxlength) << left << s \ s = (*msrParamList)[i].fName.Data();
<< setw(maxlength + 6) << left << s + "PosErr" \
<< setw(maxlength + 6) << left << s + "NegErr";
}
for (unsigned int i(0); i < fNumSpecParam; ++i) {
s = (*msrParamList)[fNumGlobalParam + fNumSpecParam*counter + i].fName.Data();
string::size_type loc = s.rfind(curRunNumber.str());
if (loc == s.length() - fRunNumberDigits) {
s = s.substr(0, loc);
outFile << setw(maxlength) << left << s \ outFile << setw(maxlength) << left << s \
<< setw(maxlength + 6) << left << s + "PosErr" \ << setw(maxlength + 6) << left << s + "PosErr" \
<< setw(maxlength + 6) << left << s + "NegErr"; << setw(maxlength + 6) << left << s + "NegErr";
} else { }
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!"; }
cerr << endl << ">> msr2data: **ERROR** The output will be flawed!"; unsigned int idx;
cerr << endl; for (unsigned int i(0); i < fNumSpecParam; ++i) {
idx = fNumGlobalParam + fNumSpecParam*counter + i;
if (InParameterList(idx, paramList)) {
s = (*msrParamList)[idx].fName.Data();
string::size_type loc = s.rfind(curRunNumber.str());
if (loc == s.length() - fRunNumberDigits) {
s = s.substr(0, loc);
outFile << setw(maxlength) << left << s \
<< setw(maxlength + 6) << left << s + "PosErr" \
<< setw(maxlength + 6) << left << s + "NegErr";
} else {
cerr << endl << ">> msr2data: **ERROR** The run index of some parameter does not match the run number being processed!";
cerr << endl << ">> msr2data: **ERROR** The output will be flawed!";
cerr << endl;
}
} }
} }
} else { } else {
for (unsigned int i(0); i < msrNoOfParams; ++i) { for (unsigned int i(0); i < msrNoOfParams; ++i) {
s = (*msrParamList)[i].fName.Data(); if (InParameterList(i, paramList)) {
outFile << setw(maxlength) << left << s \ s = (*msrParamList)[i].fName.Data();
<< setw(maxlength + 6) << left << s + "PosErr" \ outFile << setw(maxlength) << left << s \
<< setw(maxlength + 6) << left << s + "NegErr"; << setw(maxlength + 6) << left << s + "PosErr" \
<< setw(maxlength + 6) << left << s + "NegErr";
}
} }
} }
s.clear(); s.clear();
@@ -2340,46 +2380,52 @@ int PMsr2Data::WriteOutput(const string &outfile, bool db, unsigned int withHead
// in the GLOBAL mode write only global parameters and those which belong to the actual run - in the NORMAL mode write all parameters // in the GLOBAL mode write only global parameters and those which belong to the actual run - in the NORMAL mode write all parameters
if (global) { if (global) {
for (unsigned int i(0); i < fNumGlobalParam; ++i) { for (unsigned int i(0); i < fNumGlobalParam; ++i) {
if ((*msrParamList)[i].fPosErrorPresent) if (InParameterList(i, paramList)) {
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, maxlength, db); if ((*msrParamList)[i].fPosErrorPresent)
else WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, maxlength, db);
WriteValue(outFile, (*msrParamList)[i].fValue, maxlength); else
WriteValue(outFile, (*msrParamList)[i].fValue, maxlength);
if ((*msrParamList)[i].fPosErrorPresent)
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, maxlength, db);
else
WriteValue(outFile, fabs((*msrParamList)[i].fStep), (*msrParamList)[i].fStep, maxlength, db);
if ((*msrParamList)[i].fPosErrorPresent)
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, maxlength, db);
else
WriteValue(outFile, fabs((*msrParamList)[i].fStep), (*msrParamList)[i].fStep, maxlength, db); WriteValue(outFile, fabs((*msrParamList)[i].fStep), (*msrParamList)[i].fStep, maxlength, db);
}
WriteValue(outFile, fabs((*msrParamList)[i].fStep), (*msrParamList)[i].fStep, maxlength, db);
} }
unsigned int idx; unsigned int idx;
for (unsigned int i(0); i < fNumSpecParam; ++i) { for (unsigned int i(0); i < fNumSpecParam; ++i) {
idx = fNumGlobalParam + fNumSpecParam*counter + i; idx = fNumGlobalParam + fNumSpecParam*counter + i;
if ((*msrParamList)[idx].fPosErrorPresent) if (InParameterList(idx, paramList)) {
WriteValue(outFile, (*msrParamList)[idx].fValue, (*msrParamList)[idx].fPosError, maxlength, db); if ((*msrParamList)[idx].fPosErrorPresent)
else WriteValue(outFile, (*msrParamList)[idx].fValue, (*msrParamList)[idx].fPosError, maxlength, db);
WriteValue(outFile, (*msrParamList)[idx].fValue, maxlength); else
WriteValue(outFile, (*msrParamList)[idx].fValue, maxlength);
if ((*msrParamList)[idx].fPosErrorPresent)
WriteValue(outFile, (*msrParamList)[idx].fPosError, (*msrParamList)[idx].fPosError, maxlength, db);
else
WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, maxlength, db);
if ((*msrParamList)[idx].fPosErrorPresent)
WriteValue(outFile, (*msrParamList)[idx].fPosError, (*msrParamList)[idx].fPosError, maxlength, db);
else
WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, maxlength, db); WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, maxlength, db);
}
WriteValue(outFile, (*msrParamList)[idx].fStep, (*msrParamList)[idx].fStep, maxlength, db);
} }
} else { } else {
for (unsigned int i(0); i < msrNoOfParams; ++i) { for (unsigned int i(0); i < msrNoOfParams; ++i) {
if ((*msrParamList)[i].fPosErrorPresent) if (InParameterList(i, paramList)) {
WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, maxlength, db); if ((*msrParamList)[i].fPosErrorPresent)
else WriteValue(outFile, (*msrParamList)[i].fValue, (*msrParamList)[i].fPosError, maxlength, db);
WriteValue(outFile, (*msrParamList)[i].fValue, maxlength); else
WriteValue(outFile, (*msrParamList)[i].fValue, maxlength);
if ((*msrParamList)[i].fPosErrorPresent)
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, maxlength, db);
else
WriteValue(outFile, fabs((*msrParamList)[i].fStep), fabs((*msrParamList)[i].fStep), maxlength, db);
if ((*msrParamList)[i].fPosErrorPresent)
WriteValue(outFile, (*msrParamList)[i].fPosError, (*msrParamList)[i].fPosError, maxlength, db);
else
WriteValue(outFile, fabs((*msrParamList)[i].fStep), fabs((*msrParamList)[i].fStep), maxlength, db); WriteValue(outFile, fabs((*msrParamList)[i].fStep), fabs((*msrParamList)[i].fStep), maxlength, db);
}
WriteValue(outFile, fabs((*msrParamList)[i].fStep), fabs((*msrParamList)[i].fStep), maxlength, db);
} }
} }
@@ -2505,6 +2551,24 @@ int PMsr2Data::GetFirstSignificantDigit(const double &value) const
return prec+1; return prec+1;
} }
//-------------------------------------------------------------
/**
*
*/
bool PMsr2Data::InParameterList(const unsigned int &paramValue, const vector<unsigned int> &paramList) const
{
// if paramList.size() == 0, i.e. use ALL parameters
if (paramList.size() == 0)
return true;
for (unsigned int i=0; i<paramList.size(); i++) {
if (paramValue+1 == paramList[i])
return true;
}
return false;
}
//------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------
// end // end
//------------------------------------------------------------------------------------------------------- //-------------------------------------------------------------------------------------------------------

30
src/classes/PRunAsymmetryRRF.cpp
View File

@@ -187,15 +187,7 @@ Double_t PRunAsymmetryRRF::CalcChiSquare(const std::vector<Double_t>& par)
// calculate chi square // calculate chi square
Double_t time(1.0); Double_t time(1.0);
Int_t i, N(static_cast<Int_t>(fData.GetValue()->size())); Int_t i;
// In order not to have an IF in the next loop, determine the start and end bins for the fit range now
Int_t startTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep()));
if (startTimeBin < 0)
startTimeBin = 0;
Int_t endTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1;
if (endTimeBin > N)
endTimeBin = N;
// Calculate the theory function once to ensure one function evaluation for the current set of parameters. // Calculate the theory function once to ensure one function evaluation for the current set of parameters.
// This is needed for the LF and user functions where some non-thread-save calculations only need to be calculated once // This is needed for the LF and user functions where some non-thread-save calculations only need to be calculated once
@@ -204,12 +196,12 @@ Double_t PRunAsymmetryRRF::CalcChiSquare(const std::vector<Double_t>& par)
asymFcnValue = fTheory->Func(time, par, fFuncValues); asymFcnValue = fTheory->Func(time, par, fFuncValues);
#ifdef HAVE_GOMP #ifdef HAVE_GOMP
Int_t chunk = (endTimeBin - startTimeBin)/omp_get_num_procs(); Int_t chunk = (fEndTimeBin - fStartTimeBin)/omp_get_num_procs();
if (chunk < 10) if (chunk < 10)
chunk = 10; chunk = 10;
#pragma omp parallel for default(shared) private(i,time,diff,asymFcnValue,a,b,f) schedule(dynamic,chunk) reduction(+:chisq) #pragma omp parallel for default(shared) private(i,time,diff,asymFcnValue,a,b,f) schedule(dynamic,chunk) reduction(+:chisq)
#endif #endif
for (i=startTimeBin; i<endTimeBin; ++i) { for (i=fStartTimeBin; i<fEndTimeBin; ++i) {
time = fData.GetDataTimeStart() + (Double_t)i*fData.GetDataTimeStep(); time = fData.GetDataTimeStart() + (Double_t)i*fData.GetDataTimeStep();
switch (fAlphaBetaTag) { switch (fAlphaBetaTag) {
case 1: // alpha == 1, beta == 1 case 1: // alpha == 1, beta == 1
@@ -387,15 +379,15 @@ void PRunAsymmetryRRF::SetFitRangeBin(const TString fitRange)
void PRunAsymmetryRRF::CalcNoOfFitBins() void PRunAsymmetryRRF::CalcNoOfFitBins()
{ {
// In order not having to loop over all bins and to stay consistent with the chisq method, calculate the start and end bins explicitly // In order not having to loop over all bins and to stay consistent with the chisq method, calculate the start and end bins explicitly
Int_t startTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())); fStartTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep()));
if (startTimeBin < 0) if (fStartTimeBin < 0)
startTimeBin = 0; fStartTimeBin = 0;
Int_t endTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1; fEndTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1;
if (endTimeBin > static_cast<Int_t>(fData.GetValue()->size())) if (fEndTimeBin > static_cast<Int_t>(fData.GetValue()->size()))
endTimeBin = fData.GetValue()->size(); fEndTimeBin = fData.GetValue()->size();
if (endTimeBin > startTimeBin) if (fEndTimeBin > fStartTimeBin)
fNoOfFitBins = endTimeBin - startTimeBin; fNoOfFitBins = fEndTimeBin - fStartTimeBin;
else else
fNoOfFitBins = 0; fNoOfFitBins = 0;
} }

76
src/classes/PRunSingleHistoRRF.cpp
View File

@@ -58,13 +58,16 @@ using namespace std;
PRunSingleHistoRRF::PRunSingleHistoRRF() : PRunBase() PRunSingleHistoRRF::PRunSingleHistoRRF() : PRunBase()
{ {
fNoOfFitBins = 0; fNoOfFitBins = 0;
fBackground = 0; fBackground = 0.0;
fBkgErr = 1.0;
fRRFPacking = -1; fRRFPacking = -1;
// the 2 following variables are need in case fit range is given in bins, and since // the 2 following variables are need in case fit range is given in bins, and since
// the fit range can be changed in the command block, these variables need to be accessible // the fit range can be changed in the command block, these variables need to be accessible
fGoodBins[0] = -1; fGoodBins[0] = -1;
fGoodBins[1] = -1; fGoodBins[1] = -1;
fN0EstimateEndTime = 1.0; // end time in (us) over which N0 is estimated.
} }
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
@@ -112,6 +115,8 @@ PRunSingleHistoRRF::PRunSingleHistoRRF(PMsrHandler *msrInfo, PRunDataHandler *ra
fGoodBins[0] = -1; fGoodBins[0] = -1;
fGoodBins[1] = -1; fGoodBins[1] = -1;
fN0EstimateEndTime = 1.0; // end time in (us) over which N0 is estimated.
if (!PrepareData()) { if (!PrepareData()) {
cerr << endl << ">> PRunSingleHistoRRF::PRunSingleHistoRRF(): **SEVERE ERROR**: Couldn't prepare data for fitting!"; cerr << endl << ">> PRunSingleHistoRRF::PRunSingleHistoRRF(): **SEVERE ERROR**: Couldn't prepare data for fitting!";
cerr << endl << ">> This is very bad :-(, will quit ..."; cerr << endl << ">> This is very bad :-(, will quit ...";
@@ -155,15 +160,7 @@ Double_t PRunSingleHistoRRF::CalcChiSquare(const std::vector<Double_t>& par)
// calculate chi square // calculate chi square
Double_t time(1.0); Double_t time(1.0);
Int_t i, N(static_cast<Int_t>(fData.GetValue()->size())); Int_t i;
// In order not to have an IF in the next loop, determine the start and end bins for the fit range now
Int_t startTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep()));
if (startTimeBin < 0)
startTimeBin = 0;
Int_t endTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1;
if (endTimeBin > N)
endTimeBin = N;
// Calculate the theory function once to ensure one function evaluation for the current set of parameters. // Calculate the theory function once to ensure one function evaluation for the current set of parameters.
// This is needed for the LF and user functions where some non-thread-save calculations only need to be calculated once // This is needed for the LF and user functions where some non-thread-save calculations only need to be calculated once
@@ -172,12 +169,12 @@ Double_t PRunSingleHistoRRF::CalcChiSquare(const std::vector<Double_t>& par)
time = fTheory->Func(time, par, fFuncValues); time = fTheory->Func(time, par, fFuncValues);
#ifdef HAVE_GOMP #ifdef HAVE_GOMP
Int_t chunk = (endTimeBin - startTimeBin)/omp_get_num_procs(); Int_t chunk = (fEndTimeBin - fStartTimeBin)/omp_get_num_procs();
if (chunk < 10) if (chunk < 10)
chunk = 10; chunk = 10;
#pragma omp parallel for default(shared) private(i,time,diff) schedule(dynamic,chunk) reduction(+:chisq) #pragma omp parallel for default(shared) private(i,time,diff) schedule(dynamic,chunk) reduction(+:chisq)
#endif #endif
for (i=startTimeBin; i<endTimeBin; ++i) { for (i=fStartTimeBin; i<fEndTimeBin; ++i) {
time = fData.GetDataTimeStart() + (Double_t)i*fData.GetDataTimeStep(); time = fData.GetDataTimeStart() + (Double_t)i*fData.GetDataTimeStep();
diff = fData.GetValue()->at(i) - fTheory->Func(time, par, fFuncValues); diff = fData.GetValue()->at(i) - fTheory->Func(time, par, fFuncValues);
chisq += diff*diff / (fData.GetError()->at(i)*fData.GetError()->at(i)); chisq += diff*diff / (fData.GetError()->at(i)*fData.GetError()->at(i));
@@ -211,15 +208,7 @@ Double_t PRunSingleHistoRRF::CalcChiSquareExpected(const std::vector<Double_t>&
// calculate chi square // calculate chi square
Double_t time(1.0); Double_t time(1.0);
Int_t i, N(static_cast<Int_t>(fData.GetValue()->size())); Int_t i;
// In order not to have an IF in the next loop, determine the start and end bins for the fit range now
Int_t startTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep()));
if (startTimeBin < 0)
startTimeBin = 0;
Int_t endTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1;
if (endTimeBin > N)
endTimeBin = N;
// Calculate the theory function once to ensure one function evaluation for the current set of parameters. // Calculate the theory function once to ensure one function evaluation for the current set of parameters.
// This is needed for the LF and user functions where some non-thread-save calculations only need to be calculated once // This is needed for the LF and user functions where some non-thread-save calculations only need to be calculated once
@@ -228,12 +217,12 @@ Double_t PRunSingleHistoRRF::CalcChiSquareExpected(const std::vector<Double_t>&
time = fTheory->Func(time, par, fFuncValues); time = fTheory->Func(time, par, fFuncValues);
#ifdef HAVE_GOMP #ifdef HAVE_GOMP
Int_t chunk = (endTimeBin - startTimeBin)/omp_get_num_procs(); Int_t chunk = (fEndTimeBin - fStartTimeBin)/omp_get_num_procs();
if (chunk < 10) if (chunk < 10)
chunk = 10; chunk = 10;
#pragma omp parallel for default(shared) private(i,time,diff) schedule(dynamic,chunk) reduction(+:chisq) #pragma omp parallel for default(shared) private(i,time,diff) schedule(dynamic,chunk) reduction(+:chisq)
#endif #endif
for (i=startTimeBin; i < endTimeBin; ++i) { for (i=fStartTimeBin; i < fEndTimeBin; ++i) {
time = fData.GetDataTimeStart() + (Double_t)i*fData.GetDataTimeStep(); time = fData.GetDataTimeStart() + (Double_t)i*fData.GetDataTimeStep();
theo = fTheory->Func(time, par, fFuncValues); theo = fTheory->Func(time, par, fFuncValues);
diff = fData.GetValue()->at(i) - theo; diff = fData.GetValue()->at(i) - theo;
@@ -408,15 +397,15 @@ void PRunSingleHistoRRF::SetFitRangeBin(const TString fitRange)
void PRunSingleHistoRRF::CalcNoOfFitBins() void PRunSingleHistoRRF::CalcNoOfFitBins()
{ {
// In order not having to loop over all bins and to stay consistent with the chisq method, calculate the start and end bins explicitly // In order not having to loop over all bins and to stay consistent with the chisq method, calculate the start and end bins explicitly
Int_t startTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())); fStartTimeBin = static_cast<Int_t>(ceil((fFitStartTime - fData.GetDataTimeStart())/fData.GetDataTimeStep()));
if (startTimeBin < 0) if (fStartTimeBin < 0)
startTimeBin = 0; fStartTimeBin = 0;
Int_t endTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1; fEndTimeBin = static_cast<Int_t>(floor((fFitEndTime - fData.GetDataTimeStart())/fData.GetDataTimeStep())) + 1;
if (endTimeBin > static_cast<Int_t>(fData.GetValue()->size())) if (fEndTimeBin > static_cast<Int_t>(fData.GetValue()->size()))
endTimeBin = fData.GetValue()->size(); fEndTimeBin = fData.GetValue()->size();
if (endTimeBin > startTimeBin) if (fEndTimeBin > fStartTimeBin)
fNoOfFitBins = endTimeBin - startTimeBin; fNoOfFitBins = fEndTimeBin - fStartTimeBin;
else else
fNoOfFitBins = 0; fNoOfFitBins = 0;
} }
@@ -604,6 +593,9 @@ Bool_t PRunSingleHistoRRF::PrepareFitData(PRawRunData* runData, const UInt_t his
if (!EstimateBkg(histoNo)) if (!EstimateBkg(histoNo))
return false; return false;
} }
// subtract background from fForward
for (UInt_t i=0; i<fForward.size(); i++)
fForward[i] -= fBackground;
} else { // fixed background given } else { // fixed background given
for (UInt_t i=0; i<fForward.size(); i++) { for (UInt_t i=0; i<fForward.size(); i++) {
fForward[i] -= fRunInfo->GetBkgFix(0); fForward[i] -= fRunInfo->GetBkgFix(0);
@@ -624,7 +616,7 @@ Bool_t PRunSingleHistoRRF::PrepareFitData(PRawRunData* runData, const UInt_t his
exp_t_tau = exp(time_tau); exp_t_tau = exp(time_tau);
fForward[i] *= exp_t_tau; fForward[i] *= exp_t_tau;
fM.push_back(fForward[i]); // i.e. M(t) = [N(t)-Nbkg] exp(+t/tau); needed to estimate N0 later on fM.push_back(fForward[i]); // i.e. M(t) = [N(t)-Nbkg] exp(+t/tau); needed to estimate N0 later on
fMerr.push_back(exp_t_tau*sqrt(rawNt[i]-fBackground)); fMerr.push_back(exp_t_tau*sqrt(rawNt[i]+fBkgErr*fBkgErr));
} }
// calculate weights // calculate weights
@@ -632,7 +624,7 @@ Bool_t PRunSingleHistoRRF::PrepareFitData(PRawRunData* runData, const UInt_t his
if (fMerr[i] > 0.0) if (fMerr[i] > 0.0)
fW.push_back(1.0/(fMerr[i]*fMerr[i])); fW.push_back(1.0/(fMerr[i]*fMerr[i]));
else else
fW.push_back(0.0); fW.push_back(1.0);
} }
// now fForward = exp(+t/tau) [N(t)-Nbkg] = M(t) // now fForward = exp(+t/tau) [N(t)-Nbkg] = M(t)
@@ -1071,6 +1063,9 @@ Double_t PRunSingleHistoRRF::GetMainFrequency(PDoubleVector &data)
if (power->GetBinContent(i)>power->GetBinContent(i+1)) if (power->GetBinContent(i)>power->GetBinContent(i+1))
continue; continue;
} }
// ignore everything below 10 MHz
if (power->GetBinCenter(i) < 10.0)
continue;
// check for maximum // check for maximum
if (power->GetBinContent(i) > maxFreqVal) { if (power->GetBinContent(i) > maxFreqVal) {
maxFreqVal = power->GetBinContent(i); maxFreqVal = power->GetBinContent(i);
@@ -1101,15 +1096,17 @@ Double_t PRunSingleHistoRRF::EstimateN0(Double_t &errN0, Double_t freqMax)
{ {
// endBin is estimated such that the number of full cycles (according to the maximum frequency of the data) // endBin is estimated such that the number of full cycles (according to the maximum frequency of the data)
// is approximately the time fN0EstimateEndTime. // is approximately the time fN0EstimateEndTime.
Int_t endBin = (Int_t)round(fN0EstimateEndTime / fTimeResolution * ceil(freqMax)/freqMax); Int_t endBin = (Int_t)round(ceil(fN0EstimateEndTime*freqMax/TMath::TwoPi()) * (TMath::TwoPi()/freqMax) / fTimeResolution);
Double_t n0 = 0.0; Double_t n0 = 0.0;
Double_t wN = 0.0; Double_t wN = 0.0;
for (Int_t i=0; i<endBin; i++) { for (Int_t i=0; i<endBin; i++) {
n0 += fW[i]*fM[i]; // n0 += fW[i]*fM[i];
n0 += fM[i];
wN += fW[i]; wN += fW[i];
} }
n0 /= wN; // n0 /= wN;
n0 /= endBin;
errN0 = 0.0; errN0 = 0.0;
for (Int_t i=0; i<endBin; i++) { for (Int_t i=0; i<endBin; i++) {
@@ -1197,7 +1194,12 @@ Bool_t PRunSingleHistoRRF::EstimateBkg(UInt_t histoNo)
fBackground = bkg; // keep background (per bin) fBackground = bkg; // keep background (per bin)
cout << endl << "info> fBackground=" << fBackground << endl; bkg = 0.0;
for (UInt_t i=start; i<end; i++)
bkg += pow(fForward[i]-fBackground, 2.0);
fBkgErr = sqrt(bkg/(static_cast<Double_t>(end - start)));
cout << endl << "info> fBackground=" << fBackground << "(" << fBkgErr << ")" << endl;
fRunInfo->SetBkgEstimated(fBackground, 0); fRunInfo->SetBkgEstimated(fBackground, 0);

46
src/classes/PStartupHandler.cpp
View File

@@ -97,7 +97,6 @@ PStartupHandler::PStartupHandler()
Char_t *home=0; Char_t *home=0;
Char_t musrpath[128]; Char_t musrpath[128];
Char_t startup_path_name[128]; Char_t startup_path_name[128];
Bool_t found = false;
strncpy(musrpath, "", sizeof(musrpath)); strncpy(musrpath, "", sizeof(musrpath));
@@ -106,32 +105,39 @@ PStartupHandler::PStartupHandler()
if (StartupFileExists(startup_path_name)) { if (StartupFileExists(startup_path_name)) {
fStartupFileFound = true; fStartupFileFound = true;
fStartupFilePath = TString(startup_path_name); fStartupFilePath = TString(startup_path_name);
} else { // startup file is not found in the current directory }
if (!fStartupFileFound) { // startup file not found in the current directory
// check if the startup file is found under $HOME/.musrfit // check if the startup file is found under $HOME/.musrfit
home = getenv("HOME"); home = getenv("HOME");
if (home != 0) { if (home != 0) {
sprintf(musrpath, "%s/.musrfit", home); sprintf(startup_path_name, "%s/.musrfit/musrfit_startup.xml", home);
found = true; if (StartupFileExists(startup_path_name)) {
} fStartupFilePath = TString(startup_path_name);
pmusrpath = getenv("MUSRFITPATH"); fStartupFileFound = true;
if (!found) {
// check if the MUSRFITPATH system variable is set
if (pmusrpath != 0) {
if (strcmp(pmusrpath, "")) { // MUSRFITPATH variable set but empty
found = true;
}
} }
} }
if (!found) { // MUSRFITPATH not set or empty, will try default one }
home = getenv("ROOTSYS"); if (!fStartupFileFound) { // startup file not found in $HOME/.musrfit
// check if the MUSRFITPATH system variable is set
pmusrpath = getenv("MUSRFITPATH");
if (pmusrpath != 0) {
sprintf(startup_path_name, "%s/musrfit_startup.xml", pmusrpath);
if (StartupFileExists(startup_path_name)) {
fStartupFilePath = TString(startup_path_name);
fStartupFileFound = true;
}
}
}
if (!fStartupFileFound) { // MUSRFITPATH not set or empty, will try $ROOTSYS/bin
home = getenv("ROOTSYS");
if (home != 0) {
sprintf(musrpath, "%s/bin", home); sprintf(musrpath, "%s/bin", home);
cerr << endl << "**WARNING** MUSRFITPATH environment variable not set will try " << musrpath << endl; cerr << endl << "**WARNING** MUSRFITPATH environment variable not set will try " << musrpath << endl;
} sprintf(startup_path_name, "%s/musrfit_startup.xml", musrpath);
if (StartupFileExists(startup_path_name)) {
sprintf(startup_path_name, "%s/musrfit_startup.xml", musrpath); fStartupFilePath = TString(startup_path_name);
fStartupFilePath = TString(startup_path_name); fStartupFileFound = true;
if (StartupFileExists(startup_path_name)) { }
fStartupFileFound = true;
} }
} }
} }

3
src/include/PMsr2Data.h
View File

@@ -71,7 +71,7 @@ class PMsr2Data
bool PrepareNewInputFile(unsigned int, bool) const; // template bool PrepareNewInputFile(unsigned int, bool) const; // template
bool PrepareGlobalInputFile(unsigned int, const string&, unsigned int) const; // generate msr-input file for a global fit bool PrepareGlobalInputFile(unsigned int, const string&, unsigned int) const; // generate msr-input file for a global fit
int WriteOutput(const string&, bool, unsigned int, bool global = false, unsigned int counter = 0) const; int WriteOutput(const string&, const vector<unsigned int>&, bool, unsigned int, bool global = false, unsigned int counter = 0) const;
private: private:
bool PrepareNewSortedInputFile(unsigned int) const; // template bool PrepareNewSortedInputFile(unsigned int) const; // template
@@ -80,6 +80,7 @@ class PMsr2Data
void WriteValue(fstream &outFile, const double &value, const unsigned int &width) const; void WriteValue(fstream &outFile, const double &value, const unsigned int &width) const;
void WriteValue(fstream &outFile, const double &value, const double &errValue, const unsigned int &width, const bool &db) const; void WriteValue(fstream &outFile, const double &value, const double &errValue, const unsigned int &width, const bool &db) const;
int GetFirstSignificantDigit(const double &value) const; int GetFirstSignificantDigit(const double &value) const;
bool InParameterList(const unsigned int &paramValue, const vector<unsigned int>&) const;
string fFileExtension; string fFileExtension;
vector<unsigned int> fRunVector; vector<unsigned int> fRunVector;

6
src/include/PRunAsymmetryRRF.h
View File

@@ -52,6 +52,9 @@ class PRunAsymmetryRRF : public PRunBase
virtual void SetFitRangeBin(const TString fitRange); virtual void SetFitRangeBin(const TString fitRange);
virtual Int_t GetStartTimeBin() { return fStartTimeBin; }
virtual Int_t GetEndTimeBin() { return fEndTimeBin; }
protected: protected:
virtual void CalcNoOfFitBins(); virtual void CalcNoOfFitBins();
virtual Bool_t PrepareData(); virtual Bool_t PrepareData();
@@ -70,6 +73,9 @@ class PRunAsymmetryRRF : public PRunBase
Int_t fGoodBins[4]; ///< keep first/last good bins. 0=fgb, 1=lgb (forward); 2=fgb, 3=lgb (backward) Int_t fGoodBins[4]; ///< keep first/last good bins. 0=fgb, 1=lgb (forward); 2=fgb, 3=lgb (backward)
Int_t fStartTimeBin; ///< bin at which the fit starts
Int_t fEndTimeBin; ///< bin at which the fit ends
Bool_t SubtractFixBkg(); Bool_t SubtractFixBkg();
Bool_t SubtractEstimatedBkg(); Bool_t SubtractEstimatedBkg();

9
src/include/PRunSingleHistoRRF.h
View File

@@ -51,6 +51,9 @@ class PRunSingleHistoRRF : public PRunBase
virtual void SetFitRangeBin(const TString fitRange); virtual void SetFitRangeBin(const TString fitRange);
virtual Int_t GetStartTimeBin() { return fStartTimeBin; }
virtual Int_t GetEndTimeBin() { return fEndTimeBin; }
protected: protected:
virtual void CalcNoOfFitBins(); virtual void CalcNoOfFitBins();
virtual Bool_t PrepareData(); virtual Bool_t PrepareData();
@@ -58,14 +61,18 @@ class PRunSingleHistoRRF : public PRunBase
virtual Bool_t PrepareViewData(PRawRunData* runData, const UInt_t histoNo); virtual Bool_t PrepareViewData(PRawRunData* runData, const UInt_t histoNo);
private: private:
static constexpr Double_t fN0EstimateEndTime = 1.0; ///< end time in (us) over which N0 is estimated. Should eventually be estimated automatically ... Double_t fN0EstimateEndTime; ///< end time in (us) over which N0 is estimated.
UInt_t fNoOfFitBins; ///< number of bins to be fitted UInt_t fNoOfFitBins; ///< number of bins to be fitted
Double_t fBackground; ///< needed if background range is given (units: 1/bin) Double_t fBackground; ///< needed if background range is given (units: 1/bin)
Double_t fBkgErr; ///< estimate error on the estimated background
Int_t fRRFPacking; ///< RRF packing for this particular run. Given in the GLOBAL-block. Int_t fRRFPacking; ///< RRF packing for this particular run. Given in the GLOBAL-block.
Int_t fGoodBins[2]; ///< keep first/last good bins. 0=fgb, 1=lgb Int_t fGoodBins[2]; ///< keep first/last good bins. 0=fgb, 1=lgb
Int_t fStartTimeBin; ///< bin at which the fit starts
Int_t fEndTimeBin; ///< bin at which the fit ends
PDoubleVector fForward; ///< forward histo data PDoubleVector fForward; ///< forward histo data
PDoubleVector fM; ///< vector holding M(t) = [N(t)-N_bkg] exp(+t/tau). Needed to estimate N0. PDoubleVector fM; ///< vector holding M(t) = [N(t)-N_bkg] exp(+t/tau). Needed to estimate N0.
PDoubleVector fMerr; ///< vector holding the error of M(t): M_err = exp(+t/tau) sqrt(N(t)). PDoubleVector fMerr; ///< vector holding the error of M(t): M_err = exp(+t/tau) sqrt(N(t)).

165
src/msr2data.cpp
View File

@@ -49,6 +49,7 @@
using namespace std; using namespace std;
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/case_conv.hpp> // for to_lower() in std::string #include <boost/algorithm/string/case_conv.hpp> // for to_lower() in std::string
using namespace boost::algorithm; using namespace boost::algorithm;
@@ -84,14 +85,10 @@ bool isNumber(const string &s)
void msr2data_syntax() void msr2data_syntax()
{ {
cout << endl << "usage 0: msr2data [--version] | [--help]"; cout << endl << "usage 0: msr2data [--version] | [--help]";
cout << endl << "usage 1: msr2data <run> <extension> [-o<outputfile>] [new] [data] [[no]header] [nosummary] [global[+[!]]]"; cout << endl << "usage 1: msr2data <run> <extension> options";
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]"; cout << endl << "usage 2: msr2data <run1> <run2> <extension> options";
cout << endl << "usage 2: msr2data <run1> <run2> <extension> [-o<outputfile>] [new] [data] [[no]header] [nosummary] [global[+[!]]]"; cout << endl << "usage 3: msr2data \\[<runList>\\] <extension> options";
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]"; cout << endl << "usage 4: msr2data <runListFileName> <extension> options";
cout << endl << "usage 3: msr2data \\[<runList>\\] <extension> [-o<outputfile> ] [new] [data] [[no]header] [nosummary] [global[+[!]]]";
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]";
cout << endl << "usage 4: msr2data <runlist> <extension> [-o<outputfile>] [new] [data] [[no]header] [nosummary] [global[+[!]]]";
cout << endl << " [fit [-k] [-t] | fit-<template>[!] [-k] [-t] | msr-<template>]";
cout << endl; cout << endl;
cout << endl << " <runList> can be:"; cout << endl << " <runList> can be:";
cout << endl << " (i) <run0>, <run1>, <run2>, ... <runN> : run numbers, e.g. 123 124"; cout << endl << " (i) <run0>, <run1>, <run2>, ... <runN> : run numbers, e.g. 123 124";
@@ -99,7 +96,12 @@ void msr2data_syntax()
cout << endl << " (iii) <run0>:<runN>:<step> : a sequence, e.g. 123:127:2 -> 123 125 127"; cout << endl << " (iii) <run0>:<runN>:<step> : a sequence, e.g. 123:127:2 -> 123 125 127";
cout << endl << " <step> will give the step width and has to be a positive number!"; cout << endl << " <step> will give the step width and has to be a positive number!";
cout << endl << " a <runList> can also combine (i)-(iii), e.g. 123 128-130 133, etc."; cout << endl << " a <runList> can also combine (i)-(iii), e.g. 123 128-130 133, etc.";
cout << endl << " <runListFileName> : an ASCII file containing a list of run numbers and optional";
cout << endl << " external parameters is passed to msr2data. For details see";
cout << endl << " the online documentation: http://lmu.web.psi.ch/musrfit/user/MUSR/Msr2Data.html";
cout << endl << " <extension> : msr-file extension, e.g. _tf_h13 for the file name 8472_tf_h13.msr"; cout << endl << " <extension> : msr-file extension, e.g. _tf_h13 for the file name 8472_tf_h13.msr";
cout << endl;
cout << endl << "options:";
cout << endl << " -o<outputfile> : specify the name of the DB or column-data output file; default: out.db/out.dat"; cout << endl << " -o<outputfile> : specify the name of the DB or column-data output file; default: out.db/out.dat";
cout << endl << " if the option '-o none' is used, no output file will be written."; cout << endl << " if the option '-o none' is used, no output file will be written.";
cout << endl << " new : before writing a new output file, delete the contents of any existing file with the same name"; cout << endl << " new : before writing a new output file, delete the contents of any existing file with the same name";
@@ -109,6 +111,10 @@ void msr2data_syntax()
cout << endl << " If either none or both of the header options are given, the file header will be written"; cout << endl << " If either none or both of the header options are given, the file header will be written";
cout << endl << " if a new file is created, but not if the output file exists already!"; cout << endl << " if a new file is created, but not if the output file exists already!";
cout << endl << " nosummary : no additional data from the run data file is written to the output file"; cout << endl << " nosummary : no additional data from the run data file is written to the output file";
cout << endl << " paramList <param> : option used to select the parameters which shall be exported.";
cout << endl << " <param> is a list of parameter numbers to be exported. Allowed lists are:";
cout << endl << " 1-16 will export parameters 1 to 16. 1 3 5 will export parameters 1 3 5.";
cout << endl << " A combination of both is possible, e.g. 1-16 19 31 62, and so on.";
cout << endl << " fit : invoke musrfit to fit the specified runs"; cout << endl << " fit : invoke musrfit to fit the specified runs";
cout << endl << " All msr input files are assumed to be present, none is newly generated!"; cout << endl << " All msr input files are assumed to be present, none is newly generated!";
cout << endl << " fit-<template>! : generate msr files for the runs to be processed from the <template> run"; cout << endl << " fit-<template>! : generate msr files for the runs to be processed from the <template> run";
@@ -149,6 +155,10 @@ void msr2data_syntax()
cout << endl << " will use 2045_tf_histo.msr as templete, and subsequently generating msr-files from the run-list:"; cout << endl << " will use 2045_tf_histo.msr as templete, and subsequently generating msr-files from the run-list:";
cout << endl << " 2047 2049 2051 2053 2056 (2047_tf_histo.msr etc.) and fit them."; cout << endl << " 2047 2049 2051 2053 2056 (2047_tf_histo.msr etc.) and fit them.";
cout << endl; cout << endl;
cout << endl << " msr2data 2046 2058 _tf_histo paramList 1-12 data -o fitParam.dat";
cout << endl << " will export the parameters number 1 trough 12 in a column like fashion of the runs 2046 to 2058,";
cout << endl << " collected form the msr-files 2046_tf_histo.msr and so on.";
cout << endl;
cout << endl << " For further information please refer to"; cout << endl << " For further information please refer to";
cout << endl << " http://lmu.web.psi.ch/musrfit/user/MUSR/Msr2Data.html"; cout << endl << " http://lmu.web.psi.ch/musrfit/user/MUSR/Msr2Data.html";
cout << endl << " https://intranet.psi.ch/MUSR/Msr2Data"; cout << endl << " https://intranet.psi.ch/MUSR/Msr2Data";
@@ -208,7 +218,8 @@ string msr2data_validArguments(const vector<string> &arg)
if ( (!iter->compare("header")) || (!iter->compare("noheader")) || (!iter->compare("nosummary")) \ if ( (!iter->compare("header")) || (!iter->compare("noheader")) || (!iter->compare("nosummary")) \
|| (!iter->substr(0,3).compare("fit")) || (!iter->compare("-k")) || (!iter->compare("-t")) \ || (!iter->substr(0,3).compare("fit")) || (!iter->compare("-k")) || (!iter->compare("-t")) \
|| (!iter->compare("data")) || (!iter->substr(0,4).compare("msr-")) || (!iter->compare("global")) \ || (!iter->compare("data")) || (!iter->substr(0,4).compare("msr-")) || (!iter->compare("global")) \
|| (!iter->compare("global+")) || (!iter->compare("global+!")) || (!iter->compare("new")) ) || (!iter->compare("global+")) || (!iter->compare("global+!")) || (!iter->compare("new")) \
|| !iter->compare("paramList") )
word.clear(); word.clear();
else if (!iter->substr(0,2).compare("-o")) { else if (!iter->substr(0,2).compare("-o")) {
word.clear(); word.clear();
@@ -393,6 +404,91 @@ int msr2data_doInputCreation(vector<string> &arg, bool &inputOnly)
return temp; return temp;
} }
//--------------------------------------------------------------------------
/**
* <p>
*
*/
int msr2data_paramList(vector<string> &arg, vector<unsigned int> &paramList)
{
paramList.clear(); // make sure paramList is empty
unsigned int idx=0;
// check if paramList tag is present
for (unsigned int i=0; i<arg.size(); i++) {
if (!arg[i].compare("paramList")) {
idx = i+1;
break;
}
}
if (idx == 0) { // paramList tag NOT present
return 0;
}
// make sure there are parameter list elements to follow
if (idx == arg.size()) {
cerr << endl << "**ERROR** found paramList without any arguments!" << endl;
msr2data_syntax();
return -1;
}
// paramList tag present and further elements present: collect them
vector<string> str;
unsigned int idx_end=0;
size_t pos=string::npos;
for (unsigned int i=idx; i<arg.size(); i++) {
pos = arg[i].find("-");
if (pos == 0) { // likely something like -o, -k, etc.
idx_end = i;
break;
} else if (pos != string::npos) { // looks like a parameter list like n0-n1
boost::split(str, arg[i], boost::is_any_of("-"));
if (str.size() != 2) { // something is wrong, since the structure n0-n1 is expected
cerr << endl << "**ERROR** found token " << arg[i] << " in paramList command which cannot be handled." << endl;
msr2data_syntax();
return -1;
}
if (!str[0].compare("fit") || !str[0].compare("msr")) {
idx_end = i;
break;
}
if (!isNumber(str[0]) || !isNumber(str[1])) {
cerr << endl << "**ERROR** found token " << arg[i] << " in paramList command which cannot be handled." << endl;
msr2data_syntax();
return -1;
}
unsigned int start=boost::lexical_cast<unsigned int>(str[0]);
unsigned int end=boost::lexical_cast<unsigned int>(str[1]);
for (unsigned int j=start; j<=end; j++)
paramList.push_back(j);
} else if (isNumber(arg[i])) { // a single number
paramList.push_back(boost::lexical_cast<unsigned int>(arg[i]));
} else { // likely the next argument not related to paramList
idx_end = i;
break;
}
}
if (idx_end == 0)
idx_end = arg.size();
// remove all the paramList arguments for arg
arg.erase(arg.begin()+idx-1, arg.begin()+idx_end);
// go through the parameter list and make sure the values are unique
for (unsigned int i=0; i<paramList.size(); i++) {
for (unsigned int j=i+1; j<paramList.size(); j++) {
if (paramList[i] == paramList[j]) {
cerr << endl << "**ERROR** the parameter list numbers have to be unique. Found " << paramList[i] << " at least 2 times." << endl;
msr2data_syntax();
return -1;
}
}
}
return paramList.size();
}
//-------------------------------------------------------------------------- //--------------------------------------------------------------------------
/** /**
* <p>msr2data is used to generate msr-files based on template msr-files, automatically fit these new msr-files, * <p>msr2data is used to generate msr-files based on template msr-files, automatically fit these new msr-files,
@@ -441,6 +537,7 @@ int main(int argc, char *argv[])
vector<unsigned int> run_vec; vector<unsigned int> run_vec;
string run_list; string run_list;
string msrExtension; string msrExtension;
vector<unsigned int> param_vec;
try { try {
if (arg[0].at(0) == '[') { // In case a list of runs is given by [...] if (arg[0].at(0) == '[') { // In case a list of runs is given by [...]
@@ -557,7 +654,14 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
// check the validity of the command line given command line arguments // check if parameter list is given
int noParamList(msr2data_paramList(arg, param_vec));
if (noParamList == -1) {
arg.clear();
return -1;
}
// check the validity of the command line given command line arguments
string wrongArgument(msr2data_validArguments(arg)); string wrongArgument(msr2data_validArguments(arg));
if (!wrongArgument.empty()) { if (!wrongArgument.empty()) {
cerr << endl; cerr << endl;
@@ -567,18 +671,18 @@ int main(int argc, char *argv[])
return -1; return -1;
} }
// check if the output format is DB or data // check if the output format is DB or data
bool db(msr2data_useOption(arg, "data")); bool db(msr2data_useOption(arg, "data"));
// check the arguments for the "-o" option and set the output filename // check the arguments for the "-o" option and set the output filename
string outputFile(msr2data_outputfile(arg, db)); string outputFile(msr2data_outputfile(arg, db));
// introduce check, if no output should be generated - in that case we do not need msrfile and rundata handlers later // introduce check, if no output should be generated - in that case we do not need msrfile and rundata handlers later
bool realOutput(true); bool realOutput(true);
if (!to_lower_copy(outputFile).compare("none")) if (!to_lower_copy(outputFile).compare("none"))
realOutput = false; realOutput = false;
// create the msr2data-object and set the run numbers according to the runTAG above // create the msr2data-object and set the run numbers according to the runTAG above
PMsr2Data *msr2dataHandler = new PMsr2Data(msrExtension); PMsr2Data *msr2dataHandler = new PMsr2Data(msrExtension);
int status; int status;
@@ -615,7 +719,7 @@ int main(int argc, char *argv[])
run_vec.clear(); run_vec.clear();
// check if fitting should be done and in case, which template run number to use // check if fitting should be done and in case, which template run number to use
int temp(0); int temp(0);
bool chainfit(true), onlyInputCreation(false); bool chainfit(true), onlyInputCreation(false);
string musrfitOptions; string musrfitOptions;
@@ -635,7 +739,7 @@ int main(int argc, char *argv[])
} }
// check if any options should be passed to musrfit // check if any options should be passed to musrfit
if (temp) { if (temp) {
if (!msr2data_useOption(arg, "-k")) if (!msr2data_useOption(arg, "-k"))
musrfitOptions.append("-k "); musrfitOptions.append("-k ");
@@ -643,9 +747,8 @@ int main(int argc, char *argv[])
musrfitOptions.append("-t "); musrfitOptions.append("-t ");
} }
// if no fitting should be done, check if only the input files should be created // if no fitting should be done, check if only the input files should be created
if (!temp) {
if(!temp) {
temp = msr2data_doInputCreation(arg, onlyInputCreation); temp = msr2data_doInputCreation(arg, onlyInputCreation);
if (onlyInputCreation) { if (onlyInputCreation) {
// if only input files should be created, do not write data to an output file (no matter, what has been determined earlier) // if only input files should be created, do not write data to an output file (no matter, what has been determined earlier)
@@ -672,8 +775,8 @@ int main(int argc, char *argv[])
globalMode = 2; globalMode = 2;
} }
// At this point it should be clear if any template for input-file generation is given or not. // At this point it should be clear if any template for input-file generation is given or not.
// Therefore, the number of digits in the run number format is determined only here. // Therefore, the number of digits in the run number format is determined only here.
if(temp > 0) { if(temp > 0) {
status = msr2dataHandler->DetermineRunNumberDigits(temp, setNormalMode); status = msr2dataHandler->DetermineRunNumberDigits(temp, setNormalMode);
} else { } else {
@@ -685,7 +788,7 @@ int main(int argc, char *argv[])
return status; return status;
} }
// Check if all given run numbers are covered by the formatting of the data file name // Check if all given run numbers are covered by the formatting of the data file name
status = msr2dataHandler->CheckRunNumbersInRange(); status = msr2dataHandler->CheckRunNumbersInRange();
if(status) { if(status) {
cerr << endl; cerr << endl;
@@ -736,7 +839,7 @@ int main(int argc, char *argv[])
} }
} }
// GLOBAL MODE // GLOBAL MODE
if (!setNormalMode) { if (!setNormalMode) {
ostringstream strInfile; ostringstream strInfile;
strInfile << msr2dataHandler->GetPresentRun() << "+global" << msrExtension << ".msr"; strInfile << msr2dataHandler->GetPresentRun() << "+global" << msrExtension << ".msr";
@@ -798,7 +901,7 @@ int main(int argc, char *argv[])
while (msr2dataHandler->GetPresentRun()) { while (msr2dataHandler->GetPresentRun()) {
// write DB or dat file // write DB or dat file
status = msr2dataHandler->WriteOutput(outputFile, db, writeHeader, !setNormalMode, counter); status = msr2dataHandler->WriteOutput(outputFile, param_vec, db, writeHeader, !setNormalMode, counter);
if (status == -1) { if (status == -1) {
msr2data_cleanup(msr2dataHandler, arg); msr2data_cleanup(msr2dataHandler, arg);
return status; return status;
@@ -842,7 +945,7 @@ int main(int argc, char *argv[])
} }
} }
// and do the fitting // and do the fitting
if (!onlyInputCreation) { if (!onlyInputCreation) {
// check if MUSRFITPATH is set, if not issue a warning // check if MUSRFITPATH is set, if not issue a warning
string path(""); string path("");
@@ -866,12 +969,12 @@ int main(int argc, char *argv[])
} }
} }
// read msr-file // read msr-file
if (realOutput) { if (realOutput) {
status = msr2dataHandler->ReadMsrFile(strInfile.str()); status = msr2dataHandler->ReadMsrFile(strInfile.str());
if (status != PMUSR_SUCCESS) { if (status != PMUSR_SUCCESS) {
// if the msr-file cannot be read, write no output but proceed to the next run // if the msr-file cannot be read, write no output but proceed to the next run
status = msr2dataHandler->WriteOutput("none", db, writeHeader); status = msr2dataHandler->WriteOutput("none", param_vec, db, writeHeader);
if (status == -1) { if (status == -1) {
msr2data_cleanup(msr2dataHandler, arg); msr2data_cleanup(msr2dataHandler, arg);
return status; return status;
@@ -881,12 +984,12 @@ int main(int argc, char *argv[])
} }
} }
// read data files // read data files
if (writeSummary) if (writeSummary)
status = msr2dataHandler->ReadRunDataFile(); status = msr2dataHandler->ReadRunDataFile();
// write DB or dat file // write DB or dat file
status = msr2dataHandler->WriteOutput(outputFile, db, writeHeader); status = msr2dataHandler->WriteOutput(outputFile, param_vec, db, writeHeader);
if (status == -1) { if (status == -1) {
msr2data_cleanup(msr2dataHandler, arg); msr2data_cleanup(msr2dataHandler, arg);
return status; return status;
@@ -899,7 +1002,7 @@ int main(int argc, char *argv[])
// Unfortunately, this can be done in a coherent way only on that level // Unfortunately, this can be done in a coherent way only on that level
// Unfortunately, there are also problems with boost::filesystem::exists(outputFile) // Unfortunately, there are also problems with boost::filesystem::exists(outputFile)
// Therefore, first try to open the file for reading and if this works, write to it - not clean but it works // Therefore, first try to open the file for reading and if this works, write to it - not clean but it works
if(realOutput) { if (realOutput) {
fileOutput = new fstream; fileOutput = new fstream;
fileOutput->open(outputFile.c_str(), ios::in); fileOutput->open(outputFile.c_str(), ios::in);
if (fileOutput->is_open()) { if (fileOutput->is_open()) {

2
src/musredit/PAdmin.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PAdmin.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PDumpOutputHandler.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2012-2014 by Andreas Suter * * Copyright (C) 2012-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PDumpOutputHandler.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2012-2014 by Andreas Suter * * Copyright (C) 2012-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PFindDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PFindDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PFitOutputHandler.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PFitOutputHandler.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetAsymmetryRunBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetAsymmetryRunBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetDefaultDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetDefaultDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetFourierBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetFourierBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetFunctionsBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetFunctionsBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetMusrFTOptionsDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2015 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetMusrFTOptionsDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2015 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetNonMusrRunBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetNonMusrRunBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetParameterBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetParameterBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetPlotBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetPlotBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetSingleHistoRunBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetSingleHistoRunBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetTheoryBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetTheoryBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetTitleBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PGetTitleBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PHelp.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PHelp.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

7
src/musredit/PMsr2DataDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@@ -88,6 +88,10 @@ PMsr2DataDialog::PMsr2DataDialog(PMsr2DataParam *msr2DataParam, const QString he
fDataOutputFileName_lineEdit->setText(fMsr2DataParam->dbOutputFileName); fDataOutputFileName_lineEdit->setText(fMsr2DataParam->dbOutputFileName);
} }
if (!fMsr2DataParam->paramList.isEmpty()) {
fParamList_lineEdit->setText(fMsr2DataParam->paramList);
}
fWriteDataHeader_checkBox->setChecked(fMsr2DataParam->writeDbHeader); fWriteDataHeader_checkBox->setChecked(fMsr2DataParam->writeDbHeader);
fIgnoreDataHeaderInfo_checkBox->setChecked(fMsr2DataParam->ignoreDataHeaderInfo); fIgnoreDataHeaderInfo_checkBox->setChecked(fMsr2DataParam->ignoreDataHeaderInfo);
fKeepMinuit2Output_checkBox->setChecked(fMsr2DataParam->keepMinuit2Output); fKeepMinuit2Output_checkBox->setChecked(fMsr2DataParam->keepMinuit2Output);
@@ -129,6 +133,7 @@ PMsr2DataParam* PMsr2DataDialog::getMsr2DataParam()
} else { } else {
fMsr2DataParam->templateRunNo = fTemplateRunNumber_lineEdit->text().toInt(); fMsr2DataParam->templateRunNo = fTemplateRunNumber_lineEdit->text().toInt();
} }
fMsr2DataParam->paramList = fParamList_lineEdit->text();
fMsr2DataParam->dbOutputFileName = fDataOutputFileName_lineEdit->text(); fMsr2DataParam->dbOutputFileName = fDataOutputFileName_lineEdit->text();
fMsr2DataParam->writeDbHeader = fWriteDataHeader_checkBox->isChecked(); fMsr2DataParam->writeDbHeader = fWriteDataHeader_checkBox->isChecked();
fMsr2DataParam->ignoreDataHeaderInfo = fIgnoreDataHeaderInfo_checkBox->isChecked(); fMsr2DataParam->ignoreDataHeaderInfo = fIgnoreDataHeaderInfo_checkBox->isChecked();

2
src/musredit/PMsr2DataDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PMusrEditAbout.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PMusrEditAbout.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PPrefsDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PPrefsDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PReplaceConfirmationDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PReplaceConfirmationDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PReplaceDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PReplaceDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PSubTextEdit.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit/PSubTextEdit.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

75
src/musredit/PTextEdit.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@@ -1870,6 +1870,8 @@ void PTextEdit::musrMsr2Data()
QFileInfo fi; QFileInfo fi;
QString str; QString str;
int i, end; int i, end;
QStringList list;
bool ok;
fMsr2DataParam = dlg->getMsr2DataParam(); fMsr2DataParam = dlg->getMsr2DataParam();
fAdmin->setKeepMinuit2OutputFlag(fMsr2DataParam->keepMinuit2Output); fAdmin->setKeepMinuit2OutputFlag(fMsr2DataParam->keepMinuit2Output);
@@ -1963,6 +1965,14 @@ void PTextEdit::musrMsr2Data()
// options // options
// parameter export list
if (!fMsr2DataParam->paramList.isEmpty()) {
cmd.append("paramList");
QStringList list = fMsr2DataParam->paramList.split(' ');
for (int i=0; i<list.size(); i++)
cmd.append(list[i]);
}
// no header flag? // no header flag?
if (!fMsr2DataParam->writeDbHeader) if (!fMsr2DataParam->writeDbHeader)
cmd.append("noheader"); cmd.append("noheader");
@@ -2061,12 +2071,11 @@ void PTextEdit::musrMsr2Data()
} }
break; break;
case 1: // run list case 1: // run list
end = 0; list = getRunList(runList, ok);
while (!runList.section(' ', end, end, QString::SectionSkipEmpty).isEmpty()) { if (!ok)
end++; return;
} for (int i=0; i<list.size(); i++) {
for (int i=0; i<end; i++) { fln = list[i];
fln = runList.section(' ', i, i, QString::SectionSkipEmpty);
if (fMsr2DataParam->msrFileExtension.isEmpty()) if (fMsr2DataParam->msrFileExtension.isEmpty())
fln += ".msr"; fln += ".msr";
else else
@@ -2636,6 +2645,58 @@ void PTextEdit::fillRecentFiles()
} }
} }
//----------------------------------------------------------------------------------------------------
/**
* <p> run list is split (space separated) and expanded (start-end -> start, start+1, ..., end) to a list
*
* \param runListStr list to be split and expanded
* \param ok true if everything is fine; false if an error has been encountered
*
* \return fully expanded run list
*/
QStringList PTextEdit::getRunList(QString runListStr, bool &ok)
{
QStringList result;
bool isInt;
QString str;
ok = true;
// first split space separated parts
QStringList tok = runListStr.split(' ', QString::SkipEmptyParts);
for (int i=0; i<tok.size(); i++) {
if (tok[i].contains('-')) { // list given, hence need to expand
QStringList runListTok = tok[i].split('-', QString::SkipEmptyParts);
if (runListTok.size() != 2) { // error
ok = false;
result.clear();
return result;
}
int start=0, end=0;
start = runListTok[0].toInt(&isInt);
if (!isInt) {
ok = false;
result.clear();
return result;
}
end = runListTok[1].toInt(&isInt);
if (!isInt) {
ok = false;
result.clear();
return result;
}
for (int i=start; i<=end; i++) {
str = QString("%1").arg(i);
result << str;
}
} else { // keep it
result << tok[i];
}
}
return result;
}
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------
// END // END
//---------------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------------

5
src/musredit/PTextEdit.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@@ -31,6 +31,8 @@
#define _PTEXTEDIT_H_ #define _PTEXTEDIT_H_
#include <QMainWindow> #include <QMainWindow>
#include <QString>
#include <QStringList>
#include <QMap> #include <QMap>
#include <QTimer> #include <QTimer>
#include <QString> #include <QString>
@@ -175,6 +177,7 @@ private:
QAction *fRecentFilesAction[MAX_RECENT_FILES]; ///< array of the recent file actions QAction *fRecentFilesAction[MAX_RECENT_FILES]; ///< array of the recent file actions
void fillRecentFiles(); void fillRecentFiles();
QStringList getRunList(QString runListStr, bool &ok);
}; };

152
src/musredit/forms/PMsr2DataDialog.ui
View File

@@ -10,7 +10,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>552</width> <width>552</width>
<height>551</height> <height>599</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -64,7 +64,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fFirst_lineEdit"/> <widget class="QLineEdit" name="fFirst_lineEdit">
<property name="toolTip">
<string>start run number</string>
</property>
<property name="whatsThis">
<string>start run number</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_2"> <spacer name="horizontalSpacer_2">
@@ -90,7 +97,14 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fLast_lineEdit"/> <widget class="QLineEdit" name="fLast_lineEdit">
<property name="toolTip">
<string>end run number</string>
</property>
<property name="whatsThis">
<string>end run number</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
@@ -130,7 +144,19 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fRunList_lineEdit"/> <widget class="QLineEdit" name="fRunList_lineEdit">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;The run list consists of a collection of run number. Accepted input formats are:&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;(i) &amp;lt;run0&amp;gt; &amp;lt;run1&amp;gt; ... &amp;lt;runN&amp;gt;, e.g. 124 126 129&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;(ii) &amp;lt;run0&amp;gt;-&amp;lt;runN&amp;gt;, e.g. 124-126, i.e. 124 125 126&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;(iii) &amp;lt;run0&amp;gt;:&amp;lt;runN&amp;gt;:&amp;lt;step&amp;gt;, e.g 124:128:2, i.e. 124 126 128&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;or combination of those three.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_4"> <spacer name="horizontalSpacer_4">
@@ -170,7 +196,16 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fRunListFileName_lineEdit"/> <widget class="QLineEdit" name="fRunListFileName_lineEdit">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;an ASCII file containing a list of run numbers and optional external parameters is passed to msr2data. &lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;For details see the online documentation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_5"> <spacer name="horizontalSpacer_5">
@@ -236,7 +271,11 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fMsrFileExtension_lineEdit"/> <widget class="QLineEdit" name="fMsrFileExtension_lineEdit">
<property name="whatsThis">
<string>the extension will be used together with the run number to generate the msr-file name. For example: the run number being 123 and the extension _tf_h13, an msr-file name 123_tf_h13.msr will result.</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_7"> <spacer name="horizontalSpacer_7">
@@ -284,10 +323,22 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fTemplateRunNumber_lineEdit"/> <widget class="QLineEdit" name="fTemplateRunNumber_lineEdit">
<property name="whatsThis">
<string>the run number given here will be used as a msr-file template number to generate/fit the run's given in the 'Run List Input'.</string>
</property>
</widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fChainFit_checkBox"> <widget class="QCheckBox" name="fChainFit_checkBox">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;unselected means: all msr-files generated and fitted will start from the given template.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;selected means: the msr-files generated and fitted will use the previously fitted msr-file as an input. This makes sense if the run list given has continously changing parameters, e.g. as function of the temperature.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Chain Fit</string> <string>Chain Fit</string>
</property> </property>
@@ -339,7 +390,11 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QLineEdit" name="fDataOutputFileName_lineEdit"/> <widget class="QLineEdit" name="fDataOutputFileName_lineEdit">
<property name="whatsThis">
<string>db- or dat-output file name for the parameter files.</string>
</property>
</widget>
</item> </item>
<item> <item>
<spacer name="horizontalSpacer_9"> <spacer name="horizontalSpacer_9">
@@ -366,7 +421,7 @@
<x>0</x> <x>0</x>
<y>360</y> <y>360</y>
<width>551</width> <width>551</width>
<height>141</height> <height>172</height>
</rect> </rect>
</property> </property>
<property name="title"> <property name="title">
@@ -386,6 +441,9 @@
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<widget class="QCheckBox" name="fWriteDataHeader_checkBox"> <widget class="QCheckBox" name="fWriteDataHeader_checkBox">
<property name="whatsThis">
<string>For db-files, a Data Header will be written.</string>
</property>
<property name="text"> <property name="text">
<string>Write Data Header</string> <string>Write Data Header</string>
</property> </property>
@@ -393,6 +451,13 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fIgnoreDataHeaderInfo_checkBox"> <widget class="QCheckBox" name="fIgnoreDataHeaderInfo_checkBox">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;This tag is used in conjunction with LEM. If &lt;span style=&quot; font-weight:600;&quot;&gt;not&lt;/span&gt; selected, it will try to extract experiment specific parameters from the data file like implantation energy, transport HV settings, etc.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Ignore Data Header Info</string> <string>Ignore Data Header Info</string>
</property> </property>
@@ -400,6 +465,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fKeepMinuit2Output_checkBox"> <widget class="QCheckBox" name="fKeepMinuit2Output_checkBox">
<property name="whatsThis">
<string>selected: for each run fitted, two additional files will be written, namely a &lt;msr-filename&gt;-mn2.output and &lt;msr-filename&gt;-mn2.root, which contain a richer set of information about fit, i.e. the covariance matrix, the correlation coefficients, etc.</string>
</property>
<property name="text"> <property name="text">
<string>Keep Minuit2 Output</string> <string>Keep Minuit2 Output</string>
</property> </property>
@@ -411,6 +479,14 @@
<layout class="QVBoxLayout" name="verticalLayout_4"> <layout class="QVBoxLayout" name="verticalLayout_4">
<item> <item>
<widget class="QCheckBox" name="fWriteColumnData_checkBox"> <widget class="QCheckBox" name="fWriteColumnData_checkBox">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;unselected: the output parameter file is written in so called db-format.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;selected: the output parameter file is written in column like ascii-format.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Write Column Data</string> <string>Write Column Data</string>
</property> </property>
@@ -418,6 +494,14 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fRecreateDataFile_checkBox"> <widget class="QCheckBox" name="fRecreateDataFile_checkBox">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;unselected: if the parameter output file already exists, the parameters will be appended.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;selected: if the parameter output file already exists: it will be deleted and a new one will be written.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Recreate Data File</string> <string>Recreate Data File</string>
</property> </property>
@@ -425,6 +509,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fOpenFilesAfterFitting_checkBox"> <widget class="QCheckBox" name="fOpenFilesAfterFitting_checkBox">
<property name="whatsThis">
<string>selected: the newly generated msr-files will be opened in musredit after the fit took place.</string>
</property>
<property name="text"> <property name="text">
<string>Open Files after Fitting</string> <string>Open Files after Fitting</string>
</property> </property>
@@ -436,6 +523,9 @@
<layout class="QVBoxLayout" name="verticalLayout_5"> <layout class="QVBoxLayout" name="verticalLayout_5">
<item> <item>
<widget class="QCheckBox" name="fTitleFromData_checkBox"> <widget class="QCheckBox" name="fTitleFromData_checkBox">
<property name="whatsThis">
<string>if selected: the run title of the generated msr-file will be the one given in the muSR data file.</string>
</property>
<property name="text"> <property name="text">
<string>Take Data File Title</string> <string>Take Data File Title</string>
</property> </property>
@@ -443,6 +533,13 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fCreateMsrFileOnly_checkBox"> <widget class="QCheckBox" name="fCreateMsrFileOnly_checkBox">
<property name="whatsThis">
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;if selected: the msr-files will be created, but &lt;span style=&quot; font-weight:600;&quot;&gt;no &lt;/span&gt;fitting will take place.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text"> <property name="text">
<string>Create msr-File only</string> <string>Create msr-File only</string>
</property> </property>
@@ -450,6 +547,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fFitOnly_checkBox"> <widget class="QCheckBox" name="fFitOnly_checkBox">
<property name="whatsThis">
<string>selected: it is assumed that the msr-files already exist, and only musrfit is called.</string>
</property>
<property name="text"> <property name="text">
<string>Fit Only</string> <string>Fit Only</string>
</property> </property>
@@ -459,6 +559,9 @@
<layout class="QHBoxLayout" name="horizontalLayout_8"> <layout class="QHBoxLayout" name="horizontalLayout_8">
<item> <item>
<widget class="QCheckBox" name="fGlobal_checkBox"> <widget class="QCheckBox" name="fGlobal_checkBox">
<property name="whatsThis">
<string>selected: will generate a msr-file for a global fit. Please check the online documentation for further details.</string>
</property>
<property name="text"> <property name="text">
<string>Global</string> <string>Global</string>
</property> </property>
@@ -466,6 +569,9 @@
</item> </item>
<item> <item>
<widget class="QCheckBox" name="fGlobalPlus_checkBox"> <widget class="QCheckBox" name="fGlobalPlus_checkBox">
<property name="whatsThis">
<string>selected: will generate a msr-file for a global fit. The difference between Global and Global+ is that for Global+ the input parameters of the msr-file are originating from the single run fits. Please check the online documentation for further details.</string>
</property>
<property name="text"> <property name="text">
<string>Global+</string> <string>Global+</string>
</property> </property>
@@ -477,12 +583,38 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QLabel" name="fParamList_label">
<property name="geometry">
<rect>
<x>10</x>
<y>143</y>
<width>161</width>
<height>17</height>
</rect>
</property>
<property name="text">
<string>Parameter Export List</string>
</property>
</widget>
<widget class="QLineEdit" name="fParamList_lineEdit">
<property name="geometry">
<rect>
<x>170</x>
<y>140</y>
<width>371</width>
<height>23</height>
</rect>
</property>
<property name="whatsThis">
<string>parameter numbers to be exported, e.g. 1-16, or 1 3-7, etc.</string>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="layoutWidget"> <widget class="QWidget" name="layoutWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>5</x> <x>5</x>
<y>500</y> <y>540</y>
<width>541</width> <width>541</width>
<height>51</height> <height>51</height>
</rect> </rect>

2
src/musredit/main.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

5
src/musredit/musredit.h
View File

@@ -5,12 +5,10 @@
Author: Andreas Suter Author: Andreas Suter
e-mail: andreas.suter@psi.ch e-mail: andreas.suter@psi.ch
$Id$
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *
@@ -49,6 +47,7 @@ typedef struct {
QString runListFileName; ///< run list filename (usage 4 of msr2data) QString runListFileName; ///< run list filename (usage 4 of msr2data)
QString msrFileExtension; ///< msr filename extension, e.g. '0100_h13.msr' -> '_h13' QString msrFileExtension; ///< msr filename extension, e.g. '0100_h13.msr' -> '_h13'
int templateRunNo; ///< fit template run number int templateRunNo; ///< fit template run number
QString paramList; ///< parameter list to be exported.
QString dbOutputFileName; ///< output file name for the generated (trumf-like) db-file. QString dbOutputFileName; ///< output file name for the generated (trumf-like) db-file.
bool writeDbHeader; ///< flag indicating if a db header shall be generated (== !noheader in msr2data) bool writeDbHeader; ///< flag indicating if a db header shall be generated (== !noheader in msr2data)
bool ignoreDataHeaderInfo; ///< flag indicating if data header info (like temp.) shall be ignored (== nosummary in msr2data) bool ignoreDataHeaderInfo; ///< flag indicating if data header info (like temp.) shall be ignored (== nosummary in msr2data)

2
src/musredit_qt5/PAdmin.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PAdmin.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PDumpOutputHandler.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2012-2014 by Andreas Suter * * Copyright (C) 2012-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PDumpOutputHandler.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2012-2014 by Andreas Suter * * Copyright (C) 2012-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PFindDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PFindDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PFitOutputHandler.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PFitOutputHandler.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetAsymmetryRunBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetAsymmetryRunBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetDefaultDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetDefaultDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2014 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetFourierBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetFourierBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetFunctionsBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetFunctionsBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetMusrFTOptionsDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2015 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetMusrFTOptionsDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2010-2015 by Andreas Suter * * Copyright (C) 2010-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetNonMusrRunBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetNonMusrRunBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetParameterBlockDialog.cpp
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

2
src/musredit_qt5/PGetParameterBlockDialog.h
View File

@@ -8,7 +8,7 @@
*****************************************************************************/ *****************************************************************************/
/*************************************************************************** /***************************************************************************
* Copyright (C) 2009-2014 by Andreas Suter * * Copyright (C) 2009-2016 by Andreas Suter *
* andreas.suter@psi.ch * * andreas.suter@psi.ch *
* * * *
* This program is free software; you can redistribute it and/or modify * * This program is free software; you can redistribute it and/or modify *

Some files were not shown because too many files have changed in this diff Show More