Skip to content

[RF] Speed up getting weights from RooDataHist #7859

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

Merged
guitargeek merged 5 commits into from
Apr 23, 2021
Merged

[RF] Speed up getting weights from RooDataHist #7859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
791ba7f
[RF] Speedup RooDataHist in case of no interpolation
guitargeek Apr 13, 2021
6f8c6d3
[RF] Remove redundant _realVars member from RooDataHist
guitargeek Apr 14, 2021
037591a
[RF] Speedup RooDataHist also for interpolation case
guitargeek Apr 14, 2021
c4baa2d
[RF] Add unit test for 2D interpolation of RooDataHist
guitargeek Apr 20, 2021
e9ea120
[RF][NFC] Add documentation to some RooDataHist member functions
guitargeek Apr 22, 2021
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
2 changes: 1 addition & 1 deletion roofit/histfactory/src/ParamHistFunc.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ ParamHistFunc::~ParamHistFunc()
///
/// RooRealVar currentParam = getParameter( getCurrentBin() );
Int_t ParamHistFunc::getCurrentBin() const {
Int_t dataSetIndex = _dataSet.getIndex( _dataVars ); // calcTreeIndex();
Int_t dataSetIndex = _dataSet.getIndex( _dataVars, true ); // calcTreeIndex();
return dataSetIndex;

}
Expand Down
20 changes: 17 additions & 3 deletions roofit/roofitcore/inc/RooDataHist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class RooDataHist : public RooAbsData, public RooDirItem {

/// Return weight of i-th bin. \see getIndex()
double weight(std::size_t i) const { return _wgt[i]; }
double weightFast(const RooArgSet& bin, int intOrder, bool correctForBinSize, bool cdfBoundaries);
Double_t weight(const RooArgSet& bin, Int_t intOrder=1, Bool_t correctForBinSize=kFALSE, Bool_t cdfBoundaries=kFALSE, Bool_t oneSafe=kFALSE);
/// Return squared weight sum of i-th bin. \see getIndex()
double weightSquared(std::size_t i) const { return get_sumw2(i); }
Expand Down Expand Up @@ -199,6 +200,15 @@ class RooDataHist : public RooAbsData, public RooDirItem {
///@}
////////////////////////////////////////////////////////////////////////////////////////////////////////////

/// Structure to cache information on the histogram variable that is
/// frequently used for histogram weights retrieval.
struct VarInfo {
size_t nRealVars = 0;
size_t realVarIdx1 = 0;
size_t realVarIdx2 = 0;
bool initialized = false;
};

protected:

friend class RooAbsCachedPdf ;
Expand All @@ -217,7 +227,7 @@ class RooDataHist : public RooAbsData, public RooDirItem {
const RooFormulaVar* cutVar, const char* cutRange, Int_t nStart, Int_t nStop, Bool_t copyCache) ;
RooAbsData* reduceEng(const RooArgSet& varSubset, const RooFormulaVar* cutVar, const char* cutRange=0,
std::size_t nStart=0, std::size_t nStop=std::numeric_limits<std::size_t>::max(), Bool_t copyCache=kTRUE) override;
Double_t interpolateDim(RooRealVar& dim, const RooAbsBinning* binning, Double_t xval, Int_t intOrder, Bool_t correctForBinSize, Bool_t cdfBoundaries) ;
double interpolateDim(int iDim, double xval, size_t centralIdx, int intOrder, bool correctForBinSize, bool cdfBoundaries) ;
const std::vector<double>& calculatePartialBinVolume(const RooArgSet& dimSet) const ;
void checkBinBounds() const;

Expand Down Expand Up @@ -250,7 +260,6 @@ class RooDataHist : public RooAbsData, public RooDirItem {
mutable double* _sumw2{nullptr}; //[_arrSize] Sum of weights^2
double* _binv {nullptr}; //[_arrSize] Bin volume array

RooArgSet _realVars ; // Real dimensions of the dataset
mutable std::vector<double> _maskedWeights; //! Copy of _wgtVec, but masked events have a weight of zero.

mutable std::size_t _curIndex{std::numeric_limits<std::size_t>::max()}; // Current index
Expand All @@ -265,10 +274,15 @@ class RooDataHist : public RooAbsData, public RooDirItem {
mutable Double_t _cache_sum{0.}; //! Cache for sum of entries ;

private:
double weightInterpolated(const RooArgSet& bin, int intOrder, bool correctForBinSize, bool cdfBoundaries);

void _adjustBinning(RooRealVar &theirVar, const TAxis &axis, RooRealVar *ourVar, Int_t *offset);
void registerWeightArraysToDataStore() const;

ClassDefOverride(RooDataHist, 5) // Binned data set
VarInfo _varInfo; //!
VarInfo const& getVarInfo();

ClassDefOverride(RooDataHist, 6) // Binned data set
};

#endif
Expand Down
Loading