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

correct handling of functions in norm for musrview

Browse Source
This commit is contained in:
nemu 2008-04-18 11:05:44 +00:00
parent 36b957995c
commit 0f08503c71
1 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/classes/PRunSingleHisto.cpp
View File

@ -218,7 +218,16 @@ void PRunSingleHisto::CalcTheory()
par.push_back((*paramList)[i].fValue); par.push_back((*paramList)[i].fValue);
// calculate asymmetry // calculate asymmetry
double N0 = par[fRunInfo->fNormParamNo-1]; double N0;
// check if norm is a parameter or a function
if (fRunInfo->fNormParamNo < MSR_PARAM_FUN_OFFSET) { // norm is a parameter
N0 = par[fRunInfo->fNormParamNo-1];
} else { // norm is a function
// get function number
unsigned int funNo = fRunInfo->fNormParamNo-MSR_PARAM_FUN_OFFSET;
// evaluate function
N0 = fMsrInfo->EvalFunc(funNo,fRunInfo->fMap,par);
}
// get tau // get tau
double tau; double tau;
@ -537,7 +546,16 @@ bool PRunSingleHisto::PrepareRawViewData()
par.push_back((*paramList)[i].fValue); par.push_back((*paramList)[i].fValue);
// calculate asymmetry // calculate asymmetry
double N0 = par[fRunInfo->fNormParamNo-1]; double N0;
// check if norm is a parameter or a function
if (fRunInfo->fNormParamNo < MSR_PARAM_FUN_OFFSET) { // norm is a parameter
N0 = par[fRunInfo->fNormParamNo-1];
} else { // norm is a function
// get function number
unsigned int funNo = fRunInfo->fNormParamNo-MSR_PARAM_FUN_OFFSET;
// evaluate function
N0 = fMsrInfo->EvalFunc(funNo,fRunInfo->fMap,par);
}
// get tau // get tau
double tau; double tau;
@ -681,7 +699,16 @@ bool PRunSingleHisto::PrepareViewData()
par.push_back((*paramList)[i].fValue); par.push_back((*paramList)[i].fValue);
// calculate asymmetry // calculate asymmetry
double N0 = par[fRunInfo->fNormParamNo-1]; double N0;
// check if norm is a parameter or a function
if (fRunInfo->fNormParamNo < MSR_PARAM_FUN_OFFSET) { // norm is a parameter
N0 = par[fRunInfo->fNormParamNo-1];
} else { // norm is a function
// get function number
unsigned int funNo = fRunInfo->fNormParamNo-MSR_PARAM_FUN_OFFSET;
// evaluate function
N0 = fMsrInfo->EvalFunc(funNo,fRunInfo->fMap,par);
}
//cout << endl << ">> N0 = " << N0; //cout << endl << ">> N0 = " << N0;
// get tau // get tau