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

adopted for meta info in functions needed for DKS.

Browse Source
This commit is contained in:
suter_a
2020-06-18 08:51:14 +02:00
parent 32bac0e197
commit 2c0f16a317
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/classes/PRunListCollection.cpp
View File

@ -1368,6 +1368,9 @@ Int_t PRunListCollection::GetSingleHistoParams(UInt_t idx, const std::vector<Dou
// get flag if scaling of N0 and Nbkg is wished // get flag if scaling of N0 and Nbkg is wished
dksp.fScaleN0AndBkg = fRunSingleHistoList[idx]->GetScaleN0AndBkg(); dksp.fScaleN0AndBkg = fRunSingleHistoList[idx]->GetScaleN0AndBkg();
// get the meta data needed to calculate the functions
PMetaData metaData = fRunSingleHistoList[idx]->GetMetaData();
// check if norm is a parameter or a function // check if norm is a parameter or a function
PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx); PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx);
if (runInfo.GetNormParamNo() < MSR_PARAM_FUN_OFFSET) { // norm is a parameter if (runInfo.GetNormParamNo() < MSR_PARAM_FUN_OFFSET) { // norm is a parameter
@ -1376,7 +1379,7 @@ Int_t PRunListCollection::GetSingleHistoParams(UInt_t idx, const std::vector<Dou
// get function number // get function number
UInt_t funNo = runInfo.GetNormParamNo()-MSR_PARAM_FUN_OFFSET; UInt_t funNo = runInfo.GetNormParamNo()-MSR_PARAM_FUN_OFFSET;
// evaluate function // evaluate function
dksp.fN0 = fMsrInfo->EvalFunc(funNo, *runInfo.GetMap(), par); dksp.fN0 = fMsrInfo->EvalFunc(funNo, *runInfo.GetMap(), par, metaData);
} }
// get tau // get tau
@ -1411,7 +1414,7 @@ Int_t PRunListCollection::GetSingleHistoParams(UInt_t idx, const std::vector<Dou
Int_t funcNo = 0; Int_t funcNo = 0;
for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) { for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) {
funcNo = fMsrInfo->GetFuncNo(i); funcNo = fMsrInfo->GetFuncNo(i);
dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par)); dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par, metaData));
} }
// get map vector // get map vector
@ -1444,6 +1447,9 @@ Int_t PRunListCollection::GetAsymmetryParams(UInt_t idx, const std::vector<Doubl
// init param // init param
InitDKSParams(dksp); InitDKSParams(dksp);
// get the meta data needed to calculate the functions
PMetaData metaData = fRunAsymmetryList[idx]->GetMetaData();
// get alpha // get alpha
PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx); PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx);
ival = runInfo.GetAlphaParamNo(); ival = runInfo.GetAlphaParamNo();
@ -1470,7 +1476,7 @@ Int_t PRunListCollection::GetAsymmetryParams(UInt_t idx, const std::vector<Doubl
Int_t funcNo = 0; Int_t funcNo = 0;
for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) { for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) {
funcNo = fMsrInfo->GetFuncNo(i); funcNo = fMsrInfo->GetFuncNo(i);
dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par)); dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par, metaData));
} }
// get map vector // get map vector
@ -1503,6 +1509,9 @@ Int_t PRunListCollection::GetMuMinusParams(UInt_t idx, const std::vector<Double_
// get run block // get run block
PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx); PMsrRunBlock runInfo = fMsrInfo->GetMsrRunList()->at(idx);
// get the meta data needed to calculate the functions
PMetaData metaData = fRunMuMinusList[idx]->GetMetaData();
// init param // init param
InitDKSParams(dksp); InitDKSParams(dksp);
@ -1521,7 +1530,7 @@ Int_t PRunListCollection::GetMuMinusParams(UInt_t idx, const std::vector<Double_
Int_t funcNo = 0; Int_t funcNo = 0;
for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) { for (Int_t i=0; i<fMsrInfo->GetNoOfFuncs(); i++) {
funcNo = fMsrInfo->GetFuncNo(i); funcNo = fMsrInfo->GetFuncNo(i);
dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par)); dksp.fFun.push_back(fMsrInfo->EvalFunc(funcNo, *runInfo.GetMap(), par, metaData));
} }
// get map vector // get map vector

1
src/include/PRunBase.h
View File

@ -59,6 +59,7 @@ class PRunBase
virtual Double_t GetTimeResolution() { return fTimeResolution; } ///< returns the native raw data time resolution virtual Double_t GetTimeResolution() { return fTimeResolution; } ///< returns the native raw data time resolution
virtual UInt_t GetRunNo() { return fRunNo; } ///< returns the number of runs of the msr-file virtual UInt_t GetRunNo() { return fRunNo; } ///< returns the number of runs of the msr-file
virtual PRunData* GetData() { return &fData; } ///< returns the data to be fitted virtual PRunData* GetData() { return &fData; } ///< returns the data to be fitted
virtual PMetaData GetMetaData() { return fMetaData; } ///< returns the meta data
virtual void CleanUp(); virtual void CleanUp();
virtual Bool_t IsValid() { return fValid; } ///< returns if the state is valid virtual Bool_t IsValid() { return fValid; } ///< returns if the state is valid