Skip to content

Commit

Permalink
clean up more left-over timing functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
egpbos committed Jun 28, 2021
1 parent 2e3d43b commit d805a2c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 23 deletions.
6 changes: 0 additions & 6 deletions roofit/roofitcore/inc/RooRealIntegral.h
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,6 @@ class RooRealIntegral : public RooAbsReal {
Bool_t _cacheNum ; // Cache integral if numeric
static Int_t _cacheAllNDim ; //! Cache all integrals with given numeric dimension

public:
void setNumIntTiming(Bool_t flag);
void activateTimingNumInts();
private:
mutable Bool_t _timeNumInt ; //! do not persist

ClassDef(RooRealIntegral,3) // Real-valued function representing an integral over a RooAbsReal object
};

Expand Down
19 changes: 2 additions & 17 deletions roofit/roofitcore/src/RooRealIntegral.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ integration is performed in the various implementations of the RooAbsIntegrator
#include "RooHelpers.h"

#include "ROOT/RMakeUnique.hxx"
// getpid and getppid:
#include "unistd.h"

#include "TClass.h"

Expand Down Expand Up @@ -79,8 +77,7 @@ RooRealIntegral::RooRealIntegral() :
_numIntegrand(0),
_rangeName(0),
_params(0),
_cacheNum(kFALSE),
_timeNumInt(kFALSE)
_cacheNum(kFALSE)
{
TRACE_CREATE
}
Expand Down Expand Up @@ -721,8 +718,7 @@ RooRealIntegral::RooRealIntegral(const RooRealIntegral& other, const char* name)
_numIntegrand(0),
_rangeName(other._rangeName),
_params(0),
_cacheNum(kFALSE),
_timeNumInt(other._timeNumInt)
_cacheNum(kFALSE)
{
_funcNormSet = other._funcNormSet ? (RooArgSet*)other._funcNormSet->snapshot(kFALSE) : 0 ;

Expand All @@ -736,9 +732,6 @@ RooRealIntegral::RooRealIntegral(const RooRealIntegral& other, const char* name)
other._intList.snapshot(_saveInt) ;
other._sumList.snapshot(_saveSum) ;

// activate timing on numerical integrals
activateTimingNumInts();

TRACE_CREATE
}

Expand Down Expand Up @@ -1153,11 +1146,3 @@ Int_t RooRealIntegral::getCacheAllNumeric()
{
return _cacheAllNDim ;
}

void RooRealIntegral::setNumIntTiming(Bool_t flag) {
Int_t numIntDim = this->numIntRealVars().getSize();
// .. and activate timing if numeric integration occurs
if (numIntDim > 0) {
_timeNumInt = flag;
}
}

0 comments on commit d805a2c

Please sign in to comment.