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

Merge remote-tracking branch 'origin/depthProf' into root6

Browse Source
This commit is contained in:
suter_a
2023-02-17 07:39:17 +01:00
parent 7f3cc5a18f 6c8c8d6706
commit 9e88ddb989
172 changed files with 18799 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/classes/PRunNonMusr.cpp
+25 -10
View File
@@ -60,7 +60,8 @@ PRunNonMusr::PRunNonMusr() : PRunBase()
* \param runNo number of the run within the msr-file
* \param tag tag showing what shall be done: kFit == fitting, kView == viewing
*/
PRunNonMusr::PRunNonMusr(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag) : PRunBase(msrInfo, rawData, runNo, tag)
PRunNonMusr::PRunNonMusr(PMsrHandler *msrInfo, PRunDataHandler *rawData, UInt_t runNo, EPMusrHandleTag tag, Bool_t theoAsData) :
PRunBase(msrInfo, rawData, runNo, tag), fTheoAsData(theoAsData)
{
// get the proper run
fRawRunData = fRawData->GetRunData(*(fRunInfo->GetRunName()));
@@ -198,6 +199,9 @@ Bool_t PRunNonMusr::PrepareData()
{
Bool_t success = true;
if (!fValid)
return false;
if (fRunInfo->GetRunNameSize() > 1) { // ADDRUN present which is not supported for NonMusr
std::cerr << std::endl << ">> PRunNonMusr::PrepareData(): **WARNING** ADDRUN NOT SUPPORTED FOR THIS FIT TYPE, WILL IGNORE IT." << std::endl;
}
@@ -442,15 +446,26 @@ Bool_t PRunNonMusr::PrepareViewData()
else
xStep = (xMax-xMin)/1000.0;
Double_t xx = xMin;
do {
// fill x-vector
fData.AppendXTheoryValue(xx);
// fill y-vector
fData.AppendTheoryValue(fTheory->Func(xx, par, fFuncValues));
// calculate next xx
xx += xStep;
} while (xx < xMax);
if (fTheoAsData) {
Double_t xx;
for (UInt_t i=0; i<fRawRunData->fDataNonMusr.GetData()->at(xIndex).size(); i++) {
// fill x-vector
xx = fRawRunData->fDataNonMusr.GetData()->at(xIndex).at(i);
fData.AppendXTheoryValue(xx);
// fill y-vector
fData.AppendTheoryValue(fTheory->Func(xx, par, fFuncValues));
}
} else {
Double_t xx = xMin;
do {
// fill x-vector
fData.AppendXTheoryValue(xx);
// fill y-vector
fData.AppendTheoryValue(fTheory->Func(xx, par, fFuncValues));
// calculate next xx
xx += xStep;
} while (xx < xMax);
}
// clean up
par.clear();