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

bug in asymmetry fit with fixed background

Browse Source
This commit is contained in:
nemu 2011-04-08 13:08:37 +00:00
parent 49619fcffb
commit abeaf81812
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -4,6 +4,10 @@
# $Id$ # $Id$
#--------------------------------------------------------------------- #---------------------------------------------------------------------
changes since 0.9.0
===================================
FIXED bug in asymmetry fit with fixed background
musrfit 0.9.0 - changes since 0.8.0 musrfit 0.9.0 - changes since 0.8.0
=================================== ===================================
NEW added NeXus support. Still a lot of testing will be needed, documentation updated, etc. NEW added NeXus support. Still a lot of testing will be needed, documentation updated, etc.

14
src/classes/PRunAsymmetry.cpp
View File

@ -554,6 +554,7 @@ Bool_t PRunAsymmetry::PrepareData()
} }
} }
} }
// group histograms, add all the backward histograms to the one with backwardHistoNo[0] // group histograms, add all the backward histograms to the one with backwardHistoNo[0]
for (UInt_t i=1; i<backwardHistoNo.size(); i++) { for (UInt_t i=1; i<backwardHistoNo.size(); i++) {
for (UInt_t j=0; j<runData->GetDataBin(backwardHistoNo[i])->size(); j++) { for (UInt_t j=0; j<runData->GetDataBin(backwardHistoNo[i])->size(); j++) {
@ -634,10 +635,19 @@ Bool_t PRunAsymmetry::PrepareData()
*/ */
Bool_t PRunAsymmetry::SubtractFixBkg() Bool_t PRunAsymmetry::SubtractFixBkg()
{ {
Double_t dval;
for (UInt_t i=0; i<fForward.size(); i++) { for (UInt_t i=0; i<fForward.size(); i++) {
fForwardErr.push_back(TMath::Sqrt(fForward[i]+fRunInfo->GetBkgFix(0) * fTimeResolution * 1.0e3)); if (fForward[i] != 0.0)
dval = TMath::Sqrt(fForward[i]);
else
dval = 1.0;
fForwardErr.push_back(dval);
fForward[i] -= fRunInfo->GetBkgFix(0) * fTimeResolution * 1.0e3; // bkg per ns -> bkg per bin; 1.0e3: us -> ns fForward[i] -= fRunInfo->GetBkgFix(0) * fTimeResolution * 1.0e3; // bkg per ns -> bkg per bin; 1.0e3: us -> ns
fBackwardErr.push_back(TMath::Sqrt(fBackward[i]+fRunInfo->GetBkgFix(1) * fTimeResolution * 1.0e3)); if (fBackward[i] != 0.0)
dval = TMath::Sqrt(fBackward[i]);
else
dval = 1.0;
fBackwardErr.push_back(dval);
fBackward[i] -= fRunInfo->GetBkgFix(1) * fTimeResolution * 1.0e3; // bkg per ns -> bkg per bin; 1.0e3: us -> ns fBackward[i] -= fRunInfo->GetBkgFix(1) * fTimeResolution * 1.0e3; // bkg per ns -> bkg per bin; 1.0e3: us -> ns
} }