Skip to content

StepTHn: speedup filling #15443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ktf wants to merge 1 commit into
base: dev
Choose a base branch
from
+26 −20
Open

StepTHn: speedup filling #15443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 24 additions & 1 deletion Framework/Core/include/Framework/StepTHn.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ class StepTHn : public TNamed
virtual Long64_t Merge(TCollection* list) = 0;

TAxis* GetAxis(int i) { return mPrototype->GetAxis(i); }
void Sumw2(){}; // TODO: added for compatibiltiy with registry, but maybe it would be useful also in StepTHn as toggle for error weights
void Sumw2() {}; // TODO: added for compatibiltiy with registry, but maybe it would be useful also in StepTHn as toggle for error weights

protected:
void init();
Expand All @@ -67,6 +67,7 @@ class StepTHn : public TNamed
void deleteContainers();

Long64_t getGlobalBinIndex(const Int_t* binIdx);
virtual void updateBin(int iStep, Long64_t bin, double weight) = 0;

Long64_t mNBins; // number of total bins
Int_t mNVars; // number of variables
Expand Down Expand Up @@ -107,6 +108,28 @@ class StepTHnT : public StepTHn
}
}

void updateBin(int iStep, Long64_t bin, double weight) override
{
if (!mValues[iStep]) {
mValues[iStep] = createArray();
LOGF(info, "Created values container for step %d", iStep);
}

if (weight != 1.) {
if (!mSumw2[iStep]) {
mSumw2[iStep] = createArray(mValues[iStep]);
LOGF(info, "Created sumw2 container for step %d", iStep);
}
}

auto* arr = static_cast<TemplateArray*>(mValues[iStep])->GetArray();
arr[bin] += weight;
if (mSumw2[iStep]) {
auto* sw2 = static_cast<TemplateArray*>(mSumw2[iStep])->GetArray();
sw2[bin] += weight * weight;
}
}

ClassDef(StepTHnT, 1) // THn like container
};

Expand Down
21 changes: 2 additions & 19 deletions Framework/Core/src/StepTHn.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ void StepTHn::Fill(int iStep, int nParams, double positionAndWeight[])
mLastBins[i] = tmpBin;
mLastVars[i] = positionAndWeight[i];
}
//Printf("%d", tmpBin);
// Printf("%d", tmpBin);

// under/overflow not supported
if (tmpBin < 1 || tmpBin > mNbinsCache[i]) {
Expand All @@ -436,24 +436,7 @@ void StepTHn::Fill(int iStep, int nParams, double positionAndWeight[])
// Printf("%lld", bin);
}

if (!mValues[iStep]) {
mValues[iStep] = createArray();
LOGF(info, "Created values container for step %d", iStep);
}

if (weight != 1.) {
// initialize with already filled entries (which have been filled with weight == 1), in this case mSumw2 := mValues
if (!mSumw2[iStep]) {
mSumw2[iStep] = createArray(mValues[iStep]);
LOGF(info, "Created sumw2 container for step %d", iStep);
}
}

// TODO probably slow; add StepTHnT::add ?
mValues[iStep]->SetAt(mValues[iStep]->GetAt(bin) + weight, bin);
if (mSumw2[iStep]) {
mSumw2[iStep]->SetAt(mSumw2[iStep]->GetAt(bin) + weight * weight, bin);
}
updateBin(iStep, bin, weight);
}

template class StepTHnT<TArrayF>;
Expand Down