Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class CPYCPPYY_CLASS_EXTERN PyResult {
operator PyObject*() const;

private:
PyObject* fPyObject; //! actual python object
PyObject* fPyObject; ///<! actual python object
};

} // namespace CPyCppyy
Expand Down
2 changes: 1 addition & 1 deletion bindings/pyroot/cppyy/CPyCppyy/include/CPyCppyy/TPyArg.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class CPYCPPYY_CLASS_EXTERN TPyArg {
static void CallDestructor(PyObject*& pyself);

private:
mutable PyObject* fPyObject; //! converted C++ value as python object
mutable PyObject* fPyObject; ///<! converted C++ value as python object
};

#endif // !CPYCPPYY_TPYARG_H
2 changes: 1 addition & 1 deletion bindings/pyroot/pythonizations/inc/TPyDispatcher.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class TPyDispatcher : public TObject {
PyObject *Dispatch(const char *name, const TList *attr);

private:
PyObject *fCallable; //! callable object to be dispatched
PyObject *fCallable; ///<! callable object to be dispatched
};

#endif
2 changes: 1 addition & 1 deletion bindings/tpython/inc/TPyArg.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TPyArg {
ClassDef(TPyArg, 1) // Python morphing argument type

private:
mutable PyObject *fPyObject; //! converted C++ value as python object
mutable PyObject *fPyObject; ///<! converted C++ value as python object
};

#endif
2 changes: 1 addition & 1 deletion bindings/tpython/inc/TPyReturn.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class TPyReturn {
ClassDef(TPyReturn, 1) // Python morphing return object

private:
PyObject *fPyObject; //! actual python object
PyObject *fPyObject; ///<! actual python object
};

#endif
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ class ParamHistFunc : public RooAbsReal {
int yz = 0;
int xyz = 0;
};
mutable NumBins _numBinsPerDim; //!
mutable NumBins _numBinsPerDim; ///<!
mutable RooDataHist _dataSet;

Int_t getCurrentBin() const;
Expand Down
8 changes: 4 additions & 4 deletions roofit/roofit/inc/RooBMixDecay.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,10 @@ class RooBMixDecay : public RooAbsAnaConvPdf {
Int_t _basisExp ;
Int_t _basisCos ;

double _genMixFrac ; //! do not persist
double _genFlavFrac ; //!
double _genFlavFracMix ; //!
double _genFlavFracUnmix ; //!
double _genMixFrac ; ///<! do not persist
double _genFlavFrac ; ///<!
double _genFlavFracMix ; ///<!
double _genFlavFracUnmix ; ///<!

ClassDefOverride(RooBMixDecay,1) // B Mixing decay PDF
};
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooCFunction1Binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ class RooCFunction1Ref : public TObject {
}

typedef VO (*func_t)(VI);
func_t _ptr; //! Pointer to embedded function
func_t _ptr; ///<! Pointer to embedded function

static RooCFunction1Map<VO,VI>* _fmap ; // Pointer to mapping service object

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooCFunction2Binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class RooCFunction2Ref : public TObject {
}

typedef VO (*func_t)(VI1,VI2);
func_t _ptr; //! Pointer to embedded function
func_t _ptr; ///<! Pointer to embedded function

static RooCFunction2Map<VO,VI1,VI2>* _fmap ; // Pointer to mapping service object

Expand Down
4 changes: 2 additions & 2 deletions roofit/roofit/inc/RooCFunction3Binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ class RooCFunction3Ref : public TObject {
}


typedef VO (*func_t)(VI1,VI2,VI3) ; //! Pointer to embedded function
func_t _ptr; //! Pointer to embedded function
typedef VO (*func_t)(VI1,VI2,VI3) ; ///<! Pointer to embedded function
func_t _ptr; ///<! Pointer to embedded function

static RooCFunction3Map<VO,VI1,VI2,VI3>* _fmap ; // Pointer to mapping service object

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooCFunction4Binding.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ class RooCFunction4Ref : public TObject {


typedef VO (*func_t)(VI1,VI2,VI3,VI4);
func_t _ptr; //! Pointer to embedded function
func_t _ptr; ///<! Pointer to embedded function

static RooCFunction4Map<VO,VI1,VI2,VI3,VI4>* _fmap ; // Pointer to mapping service object

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooJeffreysPrior.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ class RooJeffreysPrior : public RooAbsPdf {
return list;
}
};
mutable RooObjCacheManager _cacheMgr; //!
mutable RooObjCacheManager _cacheMgr; ///<!

ClassDefOverride(RooJeffreysPrior,2) // Sum of RooAbsReal objects
};
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooKeysPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class RooKeysPdf : public RooAbsPdf {
private:
// how far you have to go out in a Gaussian until it is smaller than the
// machine precision
static const double _nSigma; //!
static const double _nSigma; ///<!

Int_t _nEvents = 0;
double *_dataPts = nullptr; //[_nEvents]
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooLagrangianMorphFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ class RooLagrangianMorphFunc : public RooAbsReal {
static std::unique_ptr<RooRatio> makeRatio(const char *name, const char *title, RooArgList &nr, RooArgList &dr);

private:
mutable RooObjCacheManager _cacheMgr; //! The cache manager
mutable RooObjCacheManager _cacheMgr; ///<! The cache manager
double _scale = 1.0;
std::map<std::string, int> _sampleMap;
RooListProxy _physics;
Expand Down
4 changes: 2 additions & 2 deletions roofit/roofit/inc/RooMomentMorph.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class RooMomentMorph : public RooAbsPdf {
const RooRealVar* frac(Int_t i ) const ;
void calculateFractions(const RooMomentMorph& self, bool verbose=true) const;
} ;
mutable RooObjCacheManager _cacheMgr ; //! The cache manager
mutable RooArgSet* _curNormSet = nullptr; //! Current normalization set
mutable RooObjCacheManager _cacheMgr ; ///<! The cache manager
mutable RooArgSet* _curNormSet = nullptr; ///<! Current normalization set

friend class CacheElem ; // Cache needs to be able to clear _norm pointer

Expand Down
4 changes: 2 additions & 2 deletions roofit/roofit/inc/RooMomentMorphFunc.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ class RooMomentMorphFunc : public RooAbsReal {
const RooRealVar *frac(Int_t i) const;
void calculateFractions(const RooMomentMorphFunc &self, bool verbose = true) const;
};
mutable RooObjCacheManager _cacheMgr; //! The cache manager
mutable RooArgSet *_curNormSet = nullptr; //! Current normalization set
mutable RooObjCacheManager _cacheMgr; ///<! The cache manager
mutable RooArgSet *_curNormSet = nullptr; ///<! Current normalization set

friend class CacheElem; // Cache needs to be able to clear _norm pointer

Expand Down
8 changes: 4 additions & 4 deletions roofit/roofit/inc/RooNDKeysPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ class RooNDKeysPdf : public RooAbsPdf {

bool _fixedShape{false};
bool _mirror{false};
bool _debug{false}; //!
bool _verbose{false}; //!
bool _debug{false}; ///<!
bool _verbose{false}; ///<!

Int_t _nDim{0};
Int_t _nEvents{0};
Expand All @@ -150,9 +150,9 @@ class RooNDKeysPdf : public RooAbsPdf {
std::vector<TVectorD> _dataPtsR;
std::vector<std::vector<double> > _weights0; // Plain weights
std::vector<std::vector<double> > _weights1; // Weights for adaptive kernels
std::vector<std::vector<double> >* _weights{nullptr}; //! Weights to be used. Points either to _weights0 or _weights1
std::vector<std::vector<double> >* _weights{nullptr}; ///<! Weights to be used. Points either to _weights0 or _weights1

std::vector<itVec> _sortTVIdcs; //!
std::vector<itVec> _sortTVIdcs; ///<!

mutable std::vector<double> _rho;
RooArgSet _dataVars;
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooPolynomial.h
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class RooPolynomial : public RooAbsPdf {
RooListProxy _coefList;
Int_t _lowestOrder = 1;

mutable std::vector<double> _wksp; //! do not persist
mutable std::vector<double> _wksp; ///<! do not persist

/// Evaluation
double evaluate() const override;
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofit/inc/RooPowerSum.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class RooPowerSum : public RooAbsPdf {
RooListProxy _coefList;
RooListProxy _expList;

mutable std::vector<double> _wksp; //! do not persist
mutable std::vector<double> _wksp; ///<! do not persist

// CUDA support
void doEval(RooFit::EvalContext &) const override;
Expand Down
4 changes: 2 additions & 2 deletions roofit/roofit/inc/RooStepFunction.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ class RooStepFunction : public RooAbsReal {
RooListProxy _coefList ;
RooListProxy _boundaryList ;
bool _interpolate = false;
mutable std::vector<double> _coefCache; //!
mutable std::vector<double> _boundaryCache; //!
mutable std::vector<double> _coefCache; ///<!
mutable std::vector<double> _boundaryCache; ///<!

ClassDefOverride(RooStepFunction,1) // Step Function
};
Expand Down
26 changes: 13 additions & 13 deletions roofit/roofitcore/inc/RooAbsArg.h
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ class RooAbsArg : public TNamed, public RooPrintable {

RooRefArray _proxyList; // list of proxies

std::vector<RooAbsCache *> _cacheList; //! list of caches
std::vector<RooAbsCache *> _cacheList; ///<! list of caches

// Proxy management
friend class RooArgProxy;
Expand All @@ -587,7 +587,7 @@ class RooAbsArg : public TNamed, public RooPrintable {
// Attribute list
std::set<std::string> _boolAttrib; // Boolean attributes
std::map<std::string, std::string> _stringAttrib; // String attributes
std::set<std::string> _boolAttribTransient; //! Transient boolean attributes (not copied in ctor)
std::set<std::string> _boolAttribTransient; ///<! Transient boolean attributes (not copied in ctor)

void printAttribList(std::ostream &os) const;

Expand Down Expand Up @@ -618,12 +618,12 @@ class RooAbsArg : public TNamed, public RooPrintable {
std::vector<RooAbsProxy *> cache;
bool isDirty = true;
};
ProxyListCache _proxyListCache; //! cache of the list of proxies. Avoids type casting.
ProxyListCache _proxyListCache; ///<! cache of the list of proxies. Avoids type casting.

// Debug stuff
static bool _verboseDirty; // Static flag controlling verbose messaging for dirty state changes
static bool _inhibitDirty; // Static flag controlling global inhibit of dirty state propagation
bool _deleteWatch = false; //! Delete watch flag
bool _deleteWatch = false; ///<! Delete watch flag

bool inhibitDirty() const;

Expand All @@ -645,21 +645,21 @@ class RooAbsArg : public TNamed, public RooPrintable {
mutable bool _fast = false; // Allow fast access mode in getVal() and proxies

// Owned components
RooArgSet *_ownedComponents = nullptr; //! Set of owned component
RooArgSet *_ownedComponents = nullptr; ///<! Set of owned component

mutable bool _prohibitServerRedirect = false; //! Prohibit server redirects -- Debugging tool
mutable bool _prohibitServerRedirect = false; ///<! Prohibit server redirects -- Debugging tool

mutable RooExpensiveObjectCache *_eocache{nullptr}; //! Pointer to global cache manager for expensive components.
mutable RooExpensiveObjectCache *_eocache{nullptr}; ///<! Pointer to global cache manager for expensive components.

mutable const TNamed *_namePtr = nullptr; //! De-duplicated name pointer, equal for all objects with the same name.
bool _isConstant = false; //! Cached isConstant status
mutable const TNamed *_namePtr = nullptr; ///<! De-duplicated name pointer, equal for all objects with the same name.
bool _isConstant = false; ///<! Cached isConstant status

mutable bool _localNoInhibitDirty = false; //! Prevent 'AlwaysDirty' mode for this node
mutable bool _localNoInhibitDirty = false; ///<! Prevent 'AlwaysDirty' mode for this node

mutable RooWorkspace *_myws = nullptr; //! In which workspace do I live, if any
mutable RooWorkspace *_myws = nullptr; ///<! In which workspace do I live, if any

std::size_t _dataToken = std::numeric_limits<std::size_t>::max(); //! Set by the RooFitDriver for this arg to
//! retrieve its result in the run context
std::size_t _dataToken = std::numeric_limits<std::size_t>::max(); ///<! Set by the RooFitDriver for this arg to
///<! retrieve its result in the run context

/// \cond ROOFIT_INTERNAL
// Legacy streamers need the following statics:
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooAbsCachedPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ class RooAbsCachedPdf : public RooAbsPdf {
virtual RooAbsArg& pdfObservable(RooAbsArg& histObservable) const { return histObservable ; }
virtual void fillCacheObject(PdfCacheElem& cache) const = 0 ;

mutable RooObjCacheManager _cacheMgr ; //! The cache manager
mutable RooObjCacheManager _cacheMgr ; ///<! The cache manager
Int_t _ipOrder ; // Interpolation order for cache histograms

std::string cacheNameSuffix(const RooArgSet& nset) const ;
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooAbsCategory.h
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ class RooAbsCategory : public RooAbsArg {
static const decltype(_stateNames)::value_type& invalidCategory();

private:
TreeReadBuffer *_treeReadBuffer = nullptr; //! A buffer for reading values from trees
TreeReadBuffer *_treeReadBuffer = nullptr; ///<! A buffer for reading values from trees

ClassDefOverride(RooAbsCategory, 4) // Abstract discrete variable
};
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooAbsCollection.h
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ class RooAbsCollection : public TObject, public RooPrintable {

static void throwAddTypedException(TClass *klass, RooAbsArg *arg);

const RooFit::UniqueId<RooAbsCollection> _uniqueId; //!
const RooFit::UniqueId<RooAbsCollection> _uniqueId; ///<!

ClassDefOverride(RooAbsCollection,3) // Collection of RooAbsArg objects
};
Expand Down
6 changes: 3 additions & 3 deletions roofit/roofitcore/inc/RooAbsPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,8 @@ class RooAbsPdf : public RooAbsReal {
virtual bool syncNormalization(const RooArgSet* dset, bool adjustProxies=true) const ;

mutable double _rawValue = 0;
mutable RooAbsReal* _norm = nullptr; //! Normalization integral (owned by _normMgr)
mutable RooArgSet const* _normSet = nullptr; //! Normalization set with for above integral
mutable RooAbsReal* _norm = nullptr; ///<! Normalization integral (owned by _normMgr)
mutable RooArgSet const* _normSet = nullptr; ///<! Normalization set with for above integral

class CacheElem : public RooAbsCacheElement {
public:
Expand All @@ -322,7 +322,7 @@ class RooAbsPdf : public RooAbsReal {
RooArgList containedArgs(Action) override { return RooArgList(*_norm) ; }
std::unique_ptr<RooAbsReal> _norm;
} ;
mutable RooObjCacheManager _normMgr ; //! The cache manager
mutable RooObjCacheManager _normMgr ; ///<! The cache manager

bool redirectServersHook(const RooAbsCollection & newServerList, bool mustReplaceAll,
bool nameChange, bool isRecursiveStep) override;
Expand Down
4 changes: 2 additions & 2 deletions roofit/roofitcore/inc/RooAbsReal.h
Original file line number Diff line number Diff line change
Expand Up @@ -541,8 +541,8 @@ class RooAbsReal : public RooAbsArg {
TString _label; ///< Plot label for objects value
bool _forceNumInt = false; ///< Force numerical integration if flag set
std::unique_ptr<RooNumIntConfig> _specIntegratorConfig; // Numeric integrator configuration specific for this object
TreeReadBuffer *_treeReadBuffer = nullptr; //! A buffer for reading values from trees
bool _selectComp = true; //! Component selection flag for RooAbsPdf::plotCompOn
TreeReadBuffer *_treeReadBuffer = nullptr; ///<! A buffer for reading values from trees
bool _selectComp = true; ///<! Component selection flag for RooAbsPdf::plotCompOn
mutable RooFit::UniqueId<RooArgSet>::Value_t _lastNormSetId = RooFit::UniqueId<RooArgSet>::nullval; ///<!

static bool _globalSelectComp; // Global activation switch for component selection
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooAddPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ class RooAddPdf : public RooAbsPdf {
mutable std::vector<double> _coefCache; ///<! Transient cache with transformed values of coefficients


mutable RooObjCacheManager _projCacheMgr ; //! Manager of cache with coefficient projections and transformations
mutable RooObjCacheManager _projCacheMgr ; ///<! Manager of cache with coefficient projections and transformations
AddCacheElem* getProjCache(const RooArgSet* nset, const RooArgSet* iset=nullptr) const ;
void updateCoefficients(AddCacheElem& cache, const RooArgSet* nset, bool syncCoefValues=true) const ;

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooCategory.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ class RooCategory final : public RooAbsCategoryLValue {
using RangeMap_t = std::map<std::string, std::vector<value_type>>;
/// Map range names to allowed category states. Note that this must be shared between copies,
/// so categories in datasets have the same ranges as their counterparts outside of the dataset.
std::shared_ptr<RangeMap_t> _ranges{new RangeMap_t()}; //!
std::shared_ptr<RangeMap_t> _ranges{new RangeMap_t()}; ///<!
RangeMap_t* _rangesPointerForIO{nullptr}; ///< Pointer to the same object as _ranges, but not shared for I/O.

void installLegacySharedProp(const RooCategorySharedProperties* sp);
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooChangeTracker.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class RooChangeTracker : public RooAbsReal {
std::vector<Int_t> _catRef ; ///< Reference values for categories
bool _checkVal = false; ///< Check contents as well if true

bool _init = false; //!
bool _init = false; ///<!

double evaluate() const override { return 1 ; }

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooFFTConvPdf.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ class RooFFTConvPdf : public RooAbsCachedPdf {
PdfCacheElem* createCache(const RooArgSet* nset) const override ;
TString histNameSuffix() const override ;

// mutable std::map<const RooHistPdf*,CacheAuxInfo*> _cacheAuxInfo ; //! Auxiliary Cache information (do not persist)
// mutable std::map<const RooHistPdf*,CacheAuxInfo*> _cacheAuxInfo ; ///<! Auxiliary Cache information (do not persist)
double _bufFrac ; // Sampling buffer size as fraction of domain size
BufStrat _bufStrat ; // Strategy to fill the buffer

Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooFactoryWSTool.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class RooFactoryWSTool : public TNamed, public RooPrintable {
static std::map<std::string,IFace*>& hooks() ;
static std::map<std::string,IFace*>* _hooks ;

RooWorkspace* _ws ; //! Associated workspace
RooWorkspace* _ws ; ///<! Associated workspace

void clearError() { _errorCount = 0 ; }
Int_t errorCount() { return _errorCount ; }
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooFit/UniqueId.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ namespace RooFit {
/// UniqueId<MyClass> const& uniqueId() const { return _uniqueId; }
///
/// private:
/// const UniqueId<MyClass> _uniqueId; //! should be non-persistent
/// const UniqueId<MyClass> _uniqueId; ///<! should be non-persistent
///
/// };
/// ~~~
Expand Down
2 changes: 1 addition & 1 deletion roofit/roofitcore/inc/RooLinearCombination.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
class RooLinearCombination : public RooAbsReal {
RooListProxy _actualVars;
std::vector<RooFit::SuperFloat> _coefficients;
mutable RooArgSet *_nset; //!
mutable RooArgSet *_nset; ///<!

public:
RooLinearCombination();
Expand Down
Loading
Loading