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

Single Histo Fits: changed normalization from "per bin" to "per nsec" which has the advantage of being really instrument independent

Browse Source
This commit is contained in:
nemu 2008-11-12 07:09:46 +00:00
parent 5e70846347
commit 0bd41f5fd0
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ToDo.txt
View File

@ -104,6 +104,7 @@ short term:
* CHECK: the normalization for single histo fits should ALWAYS be (1/ns)! (as discussed with Dima) but * CHECK: the normalization for single histo fits should ALWAYS be (1/ns)! (as discussed with Dima) but
I guess it is (1/bin) at the moment. (1/ns) has the advantage that it is really instrument independent! I guess it is (1/bin) at the moment. (1/ns) has the advantage that it is really instrument independent!
**CHECKED AND FIXED** 08-11-12
* implement FFT with msr-interface * implement FFT with msr-interface

2
src/classes/PMusrCanvas.cpp
View File

@ -1303,7 +1303,7 @@ void PMusrCanvas::PlotData()
if (runList->at(0).fLifetimeCorrection) { // lifetime correction if (runList->at(0).fLifetimeCorrection) { // lifetime correction
yAxisTitle = "asymmetry"; yAxisTitle = "asymmetry";
} else { // no liftime correction } else { // no liftime correction
yAxisTitle = "N(t) per bin"; yAxisTitle = "N(t) per nsec";
} }
break; break;
case MSR_PLOT_ASYM: case MSR_PLOT_ASYM:

28
src/classes/PRunSingleHisto.cpp
View File

@ -434,6 +434,7 @@ bool PRunSingleHisto::PrepareFitData()
// everything looks fine, hence fill data set // everything looks fine, hence fill data set
double value = 0.0; double value = 0.0;
double normalizer = 1.0;
// data start at data_start-t0 // data start at data_start-t0
// time shifted so that packing is included correctly, i.e. t0 == t0 after packing // time shifted so that packing is included correctly, i.e. t0 == t0 after packing
fData.fDataTimeStart = fTimeResolution*(((double)start-t0)+(double)fRunInfo->fPacking/2.0); fData.fDataTimeStart = fTimeResolution*(((double)start-t0)+(double)fRunInfo->fPacking/2.0);
@ -449,13 +450,14 @@ bool PRunSingleHisto::PrepareFitData()
} else { // packed data, i.e. fRunInfo->fPacking > 1 } else { // packed data, i.e. fRunInfo->fPacking > 1
if (((i-start) % fRunInfo->fPacking == 0) && (i != start)) { // fill data if (((i-start) % fRunInfo->fPacking == 0) && (i != start)) { // fill data
// in order that after rebinning the fit does not need to be redone (important for plots) // in order that after rebinning the fit does not need to be redone (important for plots)
// the value is normalize to per bin // the value is normalize to per 1 nsec
value /= fRunInfo->fPacking; normalizer = fRunInfo->fPacking * (fTimeResolution * 1e3); // fTimeResolution us->ns
value /= normalizer;
fData.fValue.push_back(value); fData.fValue.push_back(value);
if (value == 0.0) if (value == 0.0)
fData.fError.push_back(1.0); fData.fError.push_back(1.0);
else else
fData.fError.push_back(TMath::Sqrt(value/fRunInfo->fPacking)); fData.fError.push_back(TMath::Sqrt(value/normalizer));
// reset values // reset values
value = 0.0; value = 0.0;
} }
@ -581,17 +583,19 @@ cout << endl << ">> time resolution = " << fTimeResolution;
cout << endl << ">> start = " << start << ", t0 = " << t0 << ", packing = " << fRunInfo->fPacking; cout << endl << ">> start = " << start << ", t0 = " << t0 << ", packing = " << fRunInfo->fPacking;
cout << endl << ">> data start time = " << fData.fDataTimeStart; cout << endl << ">> data start time = " << fData.fDataTimeStart;
*/ */
double normalizer = 1.0;
fData.fDataTimeStep = fTimeResolution*fRunInfo->fPacking; fData.fDataTimeStep = fTimeResolution*fRunInfo->fPacking;
for (unsigned i=start; i<end; i++) { for (unsigned i=start; i<end; i++) {
if (((i-start) % fRunInfo->fPacking == 0) && (i != start)) { // fill data if (((i-start) % fRunInfo->fPacking == 0) && (i != start)) { // fill data
// in order that after rebinning the fit does not need to be redone (important for plots) // in order that after rebinning the fit does not need to be redone (important for plots)
// the value is normalize to per bin // the value is normalize to per 1 nsec
value /= fRunInfo->fPacking; normalizer = fRunInfo->fPacking * (fTimeResolution * 1e3); // fTimeResolution us->ns
value /= normalizer;
fData.fValue.push_back(value); fData.fValue.push_back(value);
if (value == 0.0) if (value == 0.0)
fData.fError.push_back(1.0); fData.fError.push_back(1.0);
else else
fData.fError.push_back(TMath::Sqrt(value/fRunInfo->fPacking)); fData.fError.push_back(TMath::Sqrt(value/normalizer));
// reset values // reset values
value = 0.0; value = 0.0;
} }
@ -834,18 +838,20 @@ cout << endl << ">> start time = " << fData.fDataTimeStart << ", step = " << fDa
cout << endl << ">> start = " << start << ", end = " << end; cout << endl << ">> start = " << start << ", end = " << end;
cout << endl << "--------------------------------"; cout << endl << "--------------------------------";
*/ */
double normalizer = 1.0;
for (unsigned int i=start; i<end; i++) { for (unsigned int i=start; i<end; i++) {
if (((i-start) % fRunInfo->fPacking == 0) && (i != start)) { // fill data if (((i-start) % fRunInfo->fPacking == 0) && (i != start)) { // fill data
// in order that after rebinning the fit does not need to be redone (important for plots) // in order that after rebinning the fit does not need to be redone (important for plots)
// the value is normalize to per bin // the value is normalize to per 1 nsec
value /= fRunInfo->fPacking; normalizer = fRunInfo->fPacking * (fTimeResolution * 1e3); // fTimeResolution us->ns
value /= normalizer;
// 1st term start time, 2nd term offset to the center of the rebinned bin // 1st term start time, 2nd term offset to the center of the rebinned bin
time = ((double)start-t0)*fTimeResolution + time = ((double)start-t0)*fTimeResolution +
(double)(i-start-fRunInfo->fPacking/2.0)*fTimeResolution; (double)(i-start-fRunInfo->fPacking/2.0)*fTimeResolution;
expval = TMath::Exp(+time/tau)/N0; expval = TMath::Exp(+time/tau)/N0;
fData.fValue.push_back(-1.0+expval*(value-bkg)); fData.fValue.push_back(-1.0+expval*(value-bkg));
//cout << endl << ">> i=" << i << ",time=" << time << ",expval=" << expval << ",value=" << value << ",bkg=" << bkg << ",expval*(value-bkg)-1=" << expval*(value-bkg)-1.0; //cout << endl << ">> i=" << i << ",time=" << time << ",expval=" << expval << ",value=" << value << ",bkg=" << bkg << ",expval*(value-bkg)-1=" << expval*(value-bkg)-1.0;
fData.fError.push_back(expval*TMath::Sqrt(value/fRunInfo->fPacking)); fData.fError.push_back(expval*TMath::Sqrt(value/normalizer));
//cout << endl << ">> " << time << ", " << expval << ", " << -1.0+expval*(value-bkg) << ", " << expval*TMath::Sqrt(value/fRunInfo->fPacking); //cout << endl << ">> " << time << ", " << expval << ", " << -1.0+expval*(value-bkg) << ", " << expval*TMath::Sqrt(value/fRunInfo->fPacking);
value = 0.0; value = 0.0;
} }
@ -955,9 +961,9 @@ bool PRunSingleHisto::EstimateBkg(unsigned int histoNo)
bkg += runData->fDataBin[histoNo][i]; bkg += runData->fDataBin[histoNo][i];
bkg /= static_cast<double>(end - start + 1); bkg /= static_cast<double>(end - start + 1);
fBackground = bkg; // keep background (per bin) for chisq, max.log.likelihood fBackground = bkg / (fTimeResolution * 1e3); // keep background (per 1 nsec) for chisq, max.log.likelihood, fTimeResolution us->ns
cout << endl << ">> fRunInfo->fRunName=" << fRunInfo->fRunName.Data() << ", histNo=" << histoNo << ", bkg=" << bkg; cout << endl << ">> fRunInfo->fRunName=" << fRunInfo->fRunName.Data() << ", histNo=" << histoNo << ", fBackground=" << fBackground;
return true; return true;
} }