diff --git a/doc/html/user/MUSR/BmwLibs.html b/doc/html/user/MUSR/BmwLibs.html index ef36899f..0f4922a4 100644 --- a/doc/html/user/MUSR/BmwLibs.html +++ b/doc/html/user/MUSR/BmwLibs.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -148,10 +148,9 @@ pre {

-

- +

diff --git a/doc/html/user/MUSR/LibFitPofB.html b/doc/html/user/MUSR/LibFitPofB.html index 53968165..be0f8f84 100644 --- a/doc/html/user/MUSR/LibFitPofB.html +++ b/doc/html/user/MUSR/LibFitPofB.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -424,10 +424,9 @@ An example XML file looks as follows:

-

- +

diff --git a/doc/html/user/MUSR/LibZFRelaxation.html b/doc/html/user/MUSR/LibZFRelaxation.html index aaef9b6d..f975b657 100644 --- a/doc/html/user/MUSR/LibZFRelaxation.html +++ b/doc/html/user/MUSR/LibZFRelaxation.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -229,10 +229,9 @@ The parameters are:

    -

    - +

    diff --git a/doc/html/user/MUSR/Msr2Data.html b/doc/html/user/MUSR/Msr2Data.html index 803fbd06..fd2c57fb 100644 --- a/doc/html/user/MUSR/Msr2Data.html +++ b/doc/html/user/MUSR/Msr2Data.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -389,10 +389,9 @@ 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 6614eab1..32078d87 100644 --- a/doc/html/user/MUSR/MusrFit.html +++ b/doc/html/user/MUSR/MusrFit.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -1476,10 +1476,9 @@ 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 abb5d2c1..176d514a 100644 --- a/doc/html/user/MUSR/MusrFitAcknowledgements.html +++ b/doc/html/user/MUSR/MusrFitAcknowledgements.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -146,10 +146,9 @@ pre {

    -

    - +

    diff --git a/doc/html/user/MUSR/MusrFitSetup.html b/doc/html/user/MUSR/MusrFitSetup.html index 1df36b92..f5406554 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.

    @@ -822,10 +822,9 @@ musrview test-histo-ROOT-NPP.msr

    -

    - +

    diff --git a/doc/html/user/MUSR/MusrGui.html b/doc/html/user/MUSR/MusrGui.html index 10881c2a..c1f1256f 100644 --- a/doc/html/user/MUSR/MusrGui.html +++ b/doc/html/user/MUSR/MusrGui.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -474,10 +474,9 @@ 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 287ab661..0ff2e378 100644 --- a/doc/html/user/MUSR/QuickStart.html +++ b/doc/html/user/MUSR/QuickStart.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -284,10 +284,9 @@ 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 77269d6f..56f8eb79 100644 --- a/doc/html/user/MUSR/TutorialSingleHisto.html +++ b/doc/html/user/MUSR/TutorialSingleHisto.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -371,10 +371,9 @@ 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 eb427c93..c8c48997 100644 --- a/doc/html/user/MUSR/WebHome.html +++ b/doc/html/user/MUSR/WebHome.html @@ -1,7 +1,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -124,7 +124,8 @@ pre {

    Welcome to the MUSR web

    Documentation of the μSR data analysis suite musrfit

    --- AS & BMW - last update May 31, 2012
    +-- AS & BMW - last update June 19, 2012

    @@ -159,10 +160,9 @@ pre {

    -

    - +

    diff --git a/src/tests/analyticFakeData/analyticFakeData.C b/src/tests/analyticFakeData/analyticFakeData.C index 7544ecda..209c7d71 100644 --- a/src/tests/analyticFakeData/analyticFakeData.C +++ b/src/tests/analyticFakeData/analyticFakeData.C @@ -164,7 +164,7 @@ void analyticFakeData(const TString type) } // create histos - UInt_t n0[8] = {100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0, 100.0}; + UInt_t n0[8] = {1900.0, 1900.0, 1000.0, 1000.0, 1000.0, 1000.0, 1800.0, 1800.0}; UInt_t bkg[8] = {10.0, 11.0, 12.0, 13.0, 14.0, 15.0, 16.0, 17.0}; const Double_t tau = 2197.019; // ns // asymmetry related stuff @@ -203,7 +203,7 @@ void analyticFakeData(const TString type) histo[i]->SetBinContent(j+1, bkg[i]); } else { time = (Double_t)(j-t0[i])*timeResolution; - dval = (Double_t)n0[i]*TMath::Exp(-time/tau)*(1.0+a0[i]*TMath::Exp(-0.5*TMath::Power(time*sigma0,1.2))*TMath::Cos(TMath::TwoPi()*gamma*bb0*time+phase[i]) + dval = (Double_t)n0[i]*TMath::Exp(-time/tau)*(1.0+a0[i]*TMath::Exp(-0.5*TMath::Power(time*sigma0,2.0))*TMath::Cos(TMath::TwoPi()*gamma*bb0*time+phase[i]) +a1[i]*TMath::Exp(-0.5*TMath::Power(time*sigma1,2.0))*TMath::Cos(TMath::TwoPi()*gamma*bb1*time+phase[i]))+(Double_t)bkg[i]; histo[i]->SetBinContent(j+1, (UInt_t)dval); }