From d2e28d33ecbb9f5de342c8dbe4659901ada20869 Mon Sep 17 00:00:00 2001 From: Andreas Suter Date: Wed, 30 May 2012 06:01:04 +0000 Subject: [PATCH] fixed bug in RRF single histo. Update docu --- ChangeLog | 1 + doc/html/user/MUSR/BmwLibs.html | 8 +++-- doc/html/user/MUSR/LibFitPofB.html | 8 +++-- doc/html/user/MUSR/LibZFRelaxation.html | 8 +++-- doc/html/user/MUSR/Msr2Data.html | 8 +++-- doc/html/user/MUSR/MusrFit.html | 8 +++-- .../user/MUSR/MusrFitAcknowledgements.html | 8 +++-- doc/html/user/MUSR/MusrFitSetup.html | 10 +++--- doc/html/user/MUSR/MusrGui.html | 35 +++++++++++++------ doc/html/user/MUSR/QuickStart.html | 8 +++-- doc/html/user/MUSR/TutorialSingleHisto.html | 8 +++-- doc/html/user/MUSR/WebHome.html | 10 +++--- .../user/pub/System/PatternSkin/print.css | 2 +- src/classes/PRunSingleHisto.cpp | 3 +- src/musredit/PDumpOutputHandler.cpp | 3 -- 15 files changed, 81 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index 325147c1..cd8dc402 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ NEW 2012-05-12 added dump_header. This is a little program which dumps the NEW 2012-04-24 added a first version for negative muon fitting. At the same time substaintial bug fixing has been carried out (mainly the logx/logy handling). +FIXED 2012-05-30 fixed RRF bug in single histo plotting. FIXED 2012-05-18 fixed wrong forward/backward tag for ROOT-PPC (MUSR-215) CHANGED 2012-05-10 prevent any2many from overwriting an input file. At the some additional bug fixing of any2many has be carried out. diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index 45bf0b41..07f65b82 100644 --- a/doc/html/user/MUSR/BmwLibs.html +++ b/doc/html/user/MUSR/BmwLibs.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -147,9 +147,11 @@ pre {

+

+

- +

diff --git a/doc/html/user/MUSR/LibFitPofB.html b/doc/html/user/MUSR/LibFitPofB.html index 9ca70401..1b9d1aa7 100644 --- a/doc/html/user/MUSR/LibFitPofB.html +++ b/doc/html/user/MUSR/LibFitPofB.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -423,9 +423,11 @@ An example XML file looks as follows:

+

+

- +

diff --git a/doc/html/user/MUSR/LibZFRelaxation.html b/doc/html/user/MUSR/LibZFRelaxation.html index b075ffe7..89bd984a 100644 --- a/doc/html/user/MUSR/LibZFRelaxation.html +++ b/doc/html/user/MUSR/LibZFRelaxation.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -228,9 +228,11 @@ The parameters are:

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/Msr2Data.html b/doc/html/user/MUSR/Msr2Data.html index b0c67772..9ad2bccc 100644 --- a/doc/html/user/MUSR/Msr2Data.html +++ b/doc/html/user/MUSR/Msr2Data.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -388,9 +388,11 @@ For reporting bugs or requesting new features and improvements please use the

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/MusrFit.html b/doc/html/user/MUSR/MusrFit.html index d9581d35..ea29b5cd 100644 --- a/doc/html/user/MUSR/MusrFit.html +++ b/doc/html/user/MUSR/MusrFit.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -1445,9 +1445,11 @@ For reporting bugs or requesting new features and improvements please use the

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/MusrFitAcknowledgements.html b/doc/html/user/MUSR/MusrFitAcknowledgements.html index ae8cc70e..1d6de3bf 100644 --- a/doc/html/user/MUSR/MusrFitAcknowledgements.html +++ b/doc/html/user/MUSR/MusrFitAcknowledgements.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -145,9 +145,11 @@ pre {

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html index b251e422..99716d81 100644 --- a/doc/html/user/MUSR/MusrFitSetup.html +++ b/doc/html/user/MUSR/MusrFitSetup.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -339,7 +339,7 @@ musrview test-histo-ROOT-NPP.msr

    Notes

    -     1 : In case only a single user is working at the machine it might be considerable to change the ownership of the ROOT folder so that the user has easy write access to this directory: + 1 : In case only a single user is working at the machine it might be considerable to change the ownership of the ROOT folder so that the user has easy write access to this directory:

    2 : When using GCC ≥ 4.2 please make sure that the environment variables USE_PARALLEL_MINUIT2 and USE_OPENMP are not set! Otherwise MINUIT2 will be compiled with parallelization support and cannot be used together with musrfit afterwards since the musrfit code is not fully thread-safe! When compiled with GCC ≥ 4.2 musrfit itself will parallelize the χ2 calculation.

    @@ -821,9 +821,11 @@ musrview test-histo-ROOT-NPP.msr

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/MusrGui.html b/doc/html/user/MUSR/MusrGui.html index acfab7a0..d3750609 100644 --- a/doc/html/user/MUSR/MusrGui.html +++ b/doc/html/user/MUSR/MusrGui.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -301,6 +301,9 @@ The features of musrfit which can be accessed by the graphical fron
    musrprefs.png Preferences (Alt+p)
    Opens a window in which the optional parameters that should be passed to musrfit can be chosen. These options are --keep-mn2-output, --dump ascii, --dump root, and --title-from-data-file. For further information refer to the manual of musrfit. Additionally, the access to musrt0 can be enabled temporarily.
    +

    +
    musrdump.png Dump Header
    Opens a file dialog which allows to select a μSR data file. When this file can be read, the run header info is dumped into a dialog window. Essentially this calls dump_header internally. +

    4 Editor Features

    @@ -363,6 +366,16 @@ For reporting bugs or requesting new features and improvements please use the h + musrdump.pngpng + musrdump.png + manage + 0.3 K + 25 May 2012 - 15:52 + AndreasSuter +   +   + + musrfit.pngpng musrfit.png manage @@ -372,7 +385,7 @@ For reporting bugs or requesting new features and improvements please use the   h - + musrgui-editor-v0.pngpng musrgui-editor-v0.png manage @@ -382,7 +395,7 @@ For reporting bugs or requesting new features and improvements please use the musrgui options available upon right clicking a open msr-file   - + musrmsr2data.pngpng musrmsr2data.png manage @@ -392,7 +405,7 @@ For reporting bugs or requesting new features and improvements please use the   h - + musrprefs.pngpng musrprefs.png manage @@ -402,7 +415,7 @@ For reporting bugs or requesting new features and improvements please use the   h - + musrsinglehisto.pngpng musrsinglehisto.png manage @@ -412,7 +425,7 @@ For reporting bugs or requesting new features and improvements please use the   h - + musrswap.pngpng musrswap.png manage @@ -422,7 +435,7 @@ For reporting bugs or requesting new features and improvements please use the   h - + musrt0.pngpng musrt0.png manage @@ -432,7 +445,7 @@ For reporting bugs or requesting new features and improvements please use the   h - + musrview.pngpng musrview.png manage @@ -460,9 +473,11 @@ For reporting bugs or requesting new features and improvements please use the

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/QuickStart.html b/doc/html/user/MUSR/QuickStart.html index 84fb0e76..80689e6b 100644 --- a/doc/html/user/MUSR/QuickStart.html +++ b/doc/html/user/MUSR/QuickStart.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -283,9 +283,11 @@ RUN 2008/lem08_his_8472 MUE4 PSI ROOT-NPP (name beamline institute dat

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/TutorialSingleHisto.html b/doc/html/user/MUSR/TutorialSingleHisto.html index 7bbcfbfd..855623cb 100644 --- a/doc/html/user/MUSR/TutorialSingleHisto.html +++ b/doc/html/user/MUSR/TutorialSingleHisto.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -370,9 +370,11 @@ This page only summarizes the very basic features and options of the programs co

    +

    +

    - +

    diff --git a/doc/html/user/MUSR/WebHome.html b/doc/html/user/MUSR/WebHome.html index 7641a784..9ea36191 100644 --- a/doc/html/user/MUSR/WebHome.html +++ b/doc/html/user/MUSR/WebHome.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -139,7 +139,7 @@ pre {
  1. Acknowledgements

    2. --- AS & BMW - last update May 8, 2012 +-- AS & BMW - last update May 25, 2012

    @@ -158,9 +158,11 @@ pre {

    +

    +

    - +

    diff --git a/doc/html/user/pub/System/PatternSkin/print.css b/doc/html/user/pub/System/PatternSkin/print.css index 78fb2183..8d3f30cc 100644 --- a/doc/html/user/pub/System/PatternSkin/print.css +++ b/doc/html/user/pub/System/PatternSkin/print.css @@ -1 +1 @@ -body{margin:0;padding:0;}#patternScreen, #patternPageShadow, #patternPage, #patternOuter{margin:0;padding:0;top:0;border:none;float:none;}#patternMain{width:100%;float:none;display:inline;overflow:visible;}#patternSideBar{display:none;}#patternWrapper{height:1%;}#patternTopBar, #patternClearHeaderCenter, #patternClearHeaderLeft, #patternClearHeaderRight, #patternTopBarContentsOuter{display:none;}.patternTopicAction, .patternToolBar, .patternToolBarBottom, .patternHomePath img, .patternHomePathTitle, .foswikiActionFormStepSign{display:none;}#patternMainContents{margin:0;padding:1em 2em;}#patternBottomBar{border:none;}.patternTopicFooter{margin:1em 0 0 0;}#attachmentsshow, #attachmentshide{display:none;}pre, html>body pre{overflow:visible !important;}h1, h2, h3, h4, h5, h6{page-break-after:avoid;page-break-inside:avoid;}img{page-break-inside:avoid;page-break-after:avoid;}blockquote, table, pre{page-break-inside:avoid;}ul, ol, dl{page-break-before:avoid;}.commentPlugin{display:none;}.twistyTrigger{display:none;}.editTableEditImageButton{display:none;}html body{background-color:#fff;}h2, h3, h4, h5, h6{background-color:transparent;}#patternBottomBar{background-color:transparent;}pre, code, tt{color:#5b4221;}.foswikiTable th{border-style:solid;border-width:0 0 1px 1px;border-color:#ccc;color:#000;}.foswikiTable th a:link, .foswikiTable th a:visited, .foswikiTable th a font, .foswikiAttachments .foswikiTable th a:link, .foswikiAttachments .foswikiTable th a:visited, .foswikiAttachments .foswikiTable th a font{color:#000;text-decoration:none;}:visited, .foswikiTopic a:visited{color:#06c;background-color:transparent;}.foswikiAttachments, .patternContent .foswikiAttachments, .foswikiForm, .patternContent .foswikiForm{background-color:#fff;}.patternRevInfo, .foswikiGrayText{color:#666;}.patternRevInfo a:link, .patternRevInfo a:visited .foswikiGrayText a:link, .foswikiGrayText a:visited{color:#666;}@media print{body{margin:0;padding:0;}#patternScreen, #patternPageShadow, #patternPage, #patternOuter{margin:0;padding:0;top:0;border:none;float:none;}#patternMain{width:100%;float:none;display:inline;overflow:visible;}#patternSideBar{display:none;}#patternWrapper{height:1%;}#patternTopBar, #patternClearHeaderCenter, #patternClearHeaderLeft, #patternClearHeaderRight, #patternTopBarContentsOuter{display:none;}.patternTopicAction, .patternToolBar, .patternToolBarBottom, .patternHomePath img, .patternHomePathTitle, .foswikiActionFormStepSign{display:none;}#patternMainContents{margin:0;padding:1em 2em;}#patternBottomBar{border:none;}.patternTopicFooter{margin:1em 0 0 0;}#attachmentsshow, #attachmentshide{display:none;}pre, html>body pre{overflow:visible !important;}h1, h2, h3, h4, h5, h6{page-break-after:avoid;page-break-inside:avoid;}img{page-break-inside:avoid;page-break-after:avoid;}blockquote, table, pre{page-break-inside:avoid;}ul, ol, dl{page-break-before:avoid;}.commentPlugin{display:none;}.twistyTrigger{display:none;}.editTableEditImageButton{display:none;}html body{background-color:#fff;}h2, h3, h4, h5, h6{background-color:transparent;}#patternBottomBar{background-color:transparent;}pre, code, tt{color:#5b4221;}.foswikiTable th{border-style:solid;border-width:0 0 1px 1px;border-color:#ccc;color:#000;}.foswikiTable th a:link, .foswikiTable th a:visited, .foswikiTable th a font, .foswikiAttachments .foswikiTable th a:link, .foswikiAttachments .foswikiTable th a:visited, .foswikiAttachments .foswikiTable th a font{color:#000;text-decoration:none;}:visited, .foswikiTopic a:visited{color:#06c;background-color:transparent;}.foswikiAttachments, .patternContent .foswikiAttachments, .foswikiForm, .patternContent .foswikiForm{background-color:#fff;}.patternRevInfo, .foswikiGrayText{color:#666;}.patternRevInfo a:link, .patternRevInfo a:visited .foswikiGrayText a:link, .foswikiGrayText a:visited{color:#666;}} #peopleIcon {display: none;} #tooltip {display: none;} \ No newline at end of file +body{margin:0;padding:0;}#patternScreen, #patternPageShadow, #patternPage, #patternOuter{margin:0;padding:0;top:0;border:none;float:none;}#patternMain{width:100%;float:none;display:inline;overflow:visible;}#patternSideBar{display:none;}#patternWrapper{height:1%;}#patternTopBar, #patternClearHeaderCenter, #patternClearHeaderLeft, #patternClearHeaderRight, #patternTopBarContentsOuter{display:none;}.patternTopicAction, .patternToolBar, .patternToolBarBottom, .patternHomePath img, .patternHomePathTitle, .foswikiActionFormStepSign{display:none;}#patternMainContents{margin:0;padding:1em 2em;}#patternBottomBar{border:none;}.patternTopicFooter{margin:1em 0 0 0;}#attachmentsshow, #attachmentshide{display:none;}pre, html>body pre{overflow:visible !important;}h1, h2, h3, h4, h5, h6{page-break-after:avoid;page-break-inside:avoid;}img{page-break-inside:avoid;page-break-after:avoid;}blockquote, table, pre{page-break-inside:avoid;}ul, ol, dl{page-break-before:avoid;}.commentPlugin{display:none;}.twistyTrigger{display:none;}.editTableEditImageButton{display:none;}html body{background-color:#fff;}h2, h3, h4, h5, h6{background-color:transparent;}#patternBottomBar{background-color:transparent;}pre, code, tt{color:#5b4221;}.foswikiTable th{border-style:solid;border-width:0 0 1px 1px;border-color:#ccc;color:#000;}.foswikiTable th a:link, .foswikiTable th a:visited, .foswikiTable th a font, .foswikiAttachments .foswikiTable th a:link, .foswikiAttachments .foswikiTable th a:visited, .foswikiAttachments .foswikiTable th a font{color:#000;text-decoration:none;}:visited, .foswikiTopic a:visited{color:#06c;background-color:transparent;}.foswikiAttachments, .patternContent .foswikiAttachments, .foswikiForm, .patternContent .foswikiForm{background-color:#fff;}.patternRevInfo, .foswikiGrayText{color:#666;}.patternRevInfo a:link, .patternRevInfo a:visited .foswikiGrayText a:link, .foswikiGrayText a:visited{color:#666;}@media print{body{margin:0;padding:0;}#patternScreen, #patternPageShadow, #patternPage, #patternOuter{margin:0;padding:0;top:0;border:none;float:none;}#patternMain{width:100%;float:none;display:inline;overflow:visible;}#patternSideBar{display:none;}#patternWrapper{height:1%;}#patternTopBar, #patternClearHeaderCenter, #patternClearHeaderLeft, #patternClearHeaderRight, #patternTopBarContentsOuter{display:none;}.patternTopicAction, .patternToolBar, .patternToolBarBottom, .patternHomePath img, .patternHomePathTitle, .foswikiActionFormStepSign{display:none;}#patternMainContents{margin:0;padding:1em 2em;}#patternBottomBar{border:none;}.patternTopicFooter{margin:1em 0 0 0;}#attachmentsshow, #attachmentshide{display:none;}pre, html>body pre{overflow:visible !important;}h1, h2, h3, h4, h5, h6{page-break-after:avoid;page-break-inside:avoid;}img{page-break-inside:avoid;page-break-after:avoid;}blockquote, table, pre{page-break-inside:avoid;}ul, ol, dl{page-break-before:avoid;}.commentPlugin{display:none;}.twistyTrigger{display:none;}.editTableEditImageButton{display:none;}html body{background-color:#fff;}h2, h3, h4, h5, h6{background-color:transparent;}#patternBottomBar{background-color:transparent;}pre, code, tt{color:#5b4221;}.foswikiTable th{border-style:solid;border-width:0 0 1px 1px;border-color:#ccc;color:#000;}.foswikiTable th a:link, .foswikiTable th a:visited, .foswikiTable th a font, .foswikiAttachments .foswikiTable th a:link, .foswikiAttachments .foswikiTable th a:visited, .foswikiAttachments .foswikiTable th a font{color:#000;text-decoration:none;}:visited, .foswikiTopic a:visited{color:#06c;background-color:transparent;}.foswikiAttachments, .patternContent .foswikiAttachments, .foswikiForm, .patternContent .foswikiForm{background-color:#fff;}.patternRevInfo, .foswikiGrayText{color:#666;}.patternRevInfo a:link, .patternRevInfo a:visited .foswikiGrayText a:link, .foswikiGrayText a:visited{color:#666;}} #peopleIcon {display: none;} #tooltip {display: none;} span.ecpHeading img {display: none;} diff --git a/src/classes/PRunSingleHisto.cpp b/src/classes/PRunSingleHisto.cpp index 8d5efc15..d8a20ae1 100644 --- a/src/classes/PRunSingleHisto.cpp +++ b/src/classes/PRunSingleHisto.cpp @@ -1148,6 +1148,7 @@ Bool_t PRunSingleHisto::PrepareViewData(PRawRunData* runData, const UInt_t histo fData.SetDataTimeStart(fTimeResolution*((Double_t)start-(Double_t)t0+(Double_t)(packing-1)/2.0)); fData.SetDataTimeStep(fTimeResolution*packing); + // data is always normalized to (per nsec!!) Double_t gammaRRF = 0.0, wRRF = 0.0, phaseRRF = 0.0; if (fMsrInfo->GetMsrPlotList()->at(0).fRRFFreq == 0.0) { // normal Data representation for (Int_t i=start; i &cmd) // QProcess related code fProc = new QProcess( this ); -// fProc->setWorkingDirectory(workingDirectory); - // Set up the command and arguments. QString program = cmd[0]; QStringList arguments; @@ -72,7 +70,6 @@ PDumpOutputHandler::PDumpOutputHandler(QVector &cmd) connect( fProc, SIGNAL( readyReadStandardOutput() ), this, SLOT( readFromStdOut() ) ); connect( fProc, SIGNAL( readyReadStandardError() ), this, SLOT( readFromStdErr() ) ); -// connect( fProc, SIGNAL( finished(int, QProcess::ExitStatus) ), this, SLOT( processDone(int, QProcess::ExitStatus) ) ); fProc->start(program, arguments); if ( !fProc->waitForStarted() ) {