diff --git a/bindings/pyroot/cppyy/CPyCppyy/include/CPyCppyy/PyResult.h b/bindings/pyroot/cppyy/CPyCppyy/include/CPyCppyy/PyResult.h index e996379d676fe..7e43dffc9fa09 100644 --- a/bindings/pyroot/cppyy/CPyCppyy/include/CPyCppyy/PyResult.h +++ b/bindings/pyroot/cppyy/CPyCppyy/include/CPyCppyy/PyResult.h @@ -57,7 +57,7 @@ class CPYCPPYY_CLASS_EXTERN PyResult { operator PyObject*() const; private: - PyObject* fPyObject; //! actual python object + PyObject* fPyObject; ///* _fmap ; // Pointer to mapping service object diff --git a/roofit/roofit/inc/RooCFunction2Binding.h b/roofit/roofit/inc/RooCFunction2Binding.h index f03c9c4102eb0..76e30a43a1bfc 100644 --- a/roofit/roofit/inc/RooCFunction2Binding.h +++ b/roofit/roofit/inc/RooCFunction2Binding.h @@ -145,7 +145,7 @@ class RooCFunction2Ref : public TObject { } typedef VO (*func_t)(VI1,VI2); - func_t _ptr; //! Pointer to embedded function + func_t _ptr; ///* _fmap ; // Pointer to mapping service object diff --git a/roofit/roofit/inc/RooCFunction3Binding.h b/roofit/roofit/inc/RooCFunction3Binding.h index 2d34c617397ee..8bfbb86ec8bc4 100644 --- a/roofit/roofit/inc/RooCFunction3Binding.h +++ b/roofit/roofit/inc/RooCFunction3Binding.h @@ -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) ; ///* _fmap ; // Pointer to mapping service object diff --git a/roofit/roofit/inc/RooCFunction4Binding.h b/roofit/roofit/inc/RooCFunction4Binding.h index bcdf4fa191d51..0e3a8c02cb62e 100644 --- a/roofit/roofit/inc/RooCFunction4Binding.h +++ b/roofit/roofit/inc/RooCFunction4Binding.h @@ -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; ///* _fmap ; // Pointer to mapping service object diff --git a/roofit/roofit/inc/RooJeffreysPrior.h b/roofit/roofit/inc/RooJeffreysPrior.h index f15a9da8f2060..65ac32a98f99d 100644 --- a/roofit/roofit/inc/RooJeffreysPrior.h +++ b/roofit/roofit/inc/RooJeffreysPrior.h @@ -47,7 +47,7 @@ class RooJeffreysPrior : public RooAbsPdf { return list; } }; - mutable RooObjCacheManager _cacheMgr; //! + mutable RooObjCacheManager _cacheMgr; /// makeRatio(const char *name, const char *title, RooArgList &nr, RooArgList &dr); private: - mutable RooObjCacheManager _cacheMgr; //! The cache manager + mutable RooObjCacheManager _cacheMgr; /// _sampleMap; RooListProxy _physics; diff --git a/roofit/roofit/inc/RooMomentMorph.h b/roofit/roofit/inc/RooMomentMorph.h index 2992bfdf01ad2..e295c6f061754 100644 --- a/roofit/roofit/inc/RooMomentMorph.h +++ b/roofit/roofit/inc/RooMomentMorph.h @@ -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 ; /// _dataPtsR; std::vector > _weights0; // Plain weights std::vector > _weights1; // Weights for adaptive kernels - std::vector >* _weights{nullptr}; //! Weights to be used. Points either to _weights0 or _weights1 + std::vector >* _weights{nullptr}; /// _sortTVIdcs; //! + std::vector _sortTVIdcs; /// _rho; RooArgSet _dataVars; diff --git a/roofit/roofit/inc/RooPolynomial.h b/roofit/roofit/inc/RooPolynomial.h index 22ed7d8b11238..e2bee8a527d19 100644 --- a/roofit/roofit/inc/RooPolynomial.h +++ b/roofit/roofit/inc/RooPolynomial.h @@ -49,7 +49,7 @@ class RooPolynomial : public RooAbsPdf { RooListProxy _coefList; Int_t _lowestOrder = 1; - mutable std::vector _wksp; //! do not persist + mutable std::vector _wksp; /// _wksp; //! do not persist + mutable std::vector _wksp; /// _coefCache; //! - mutable std::vector _boundaryCache; //! + mutable std::vector _coefCache; /// _boundaryCache; /// _cacheList; //! list of caches + std::vector _cacheList; /// _boolAttrib; // Boolean attributes std::map _stringAttrib; // String attributes - std::set _boolAttribTransient; //! Transient boolean attributes (not copied in ctor) + std::set _boolAttribTransient; /// cache; bool isDirty = true; }; - ProxyListCache _proxyListCache; //! cache of the list of proxies. Avoids type casting. + ProxyListCache _proxyListCache; ///::max(); //! Set by the RooFitDriver for this arg to - //! retrieve its result in the run context + std::size_t _dataToken = std::numeric_limits::max(); /// _uniqueId; //! + const RooFit::UniqueId _uniqueId; /// _norm; } ; - mutable RooObjCacheManager _normMgr ; //! The cache manager + mutable RooObjCacheManager _normMgr ; /// _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; ///::Value_t _lastNormSetId = RooFit::UniqueId::nullval; /// _coefCache; ///>; /// 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 _ranges{new RangeMap_t()}; //! + std::shared_ptr _ranges{new RangeMap_t()}; /// _catRef ; ///< Reference values for categories bool _checkVal = false; ///< Check contents as well if true - bool _init = false; //! + bool _init = false; /// _cacheAuxInfo ; //! Auxiliary Cache information (do not persist) + // mutable std::map _cacheAuxInfo ; ///& hooks() ; static std::map* _hooks ; - RooWorkspace* _ws ; //! Associated workspace + RooWorkspace* _ws ; /// const& uniqueId() const { return _uniqueId; } /// /// private: -/// const UniqueId _uniqueId; //! should be non-persistent +/// const UniqueId _uniqueId; /// _coefficients; - mutable RooArgSet *_nset; //! + mutable RooArgSet *_nset; /// _at; ///operator*();} private: - std::shared_ptr fIterImpl; //! + std::shared_ptr fIterImpl; /// createCacheElem(const RooArgSet* nset, const RooArgSet* iset, const char* isetRangeName=nullptr) const; - mutable RooObjCacheManager _cacheMgr ; //! The cache manager + mutable RooObjCacheManager _cacheMgr ; /// compileForNormSet(RooArgSet const &normSet, RooFit::Detail::CompileContext & ctx) const override; protected: - mutable RooObjCacheManager _normIntMgr; //! The integration cache manager + mutable RooObjCacheManager _normIntMgr; /// _altBinning ; ///< Optional alternative ranges and binnings - bool _ownBinnings{true}; //! + bool _ownBinnings{true}; /// _refCount; - mutable std::vector _orderedStorage; //! + mutable std::vector _orderedStorage; ///> _weightBuffer; //! Buffer for weights in case a batch of values is requested. + mutable std::unique_ptr> _weightBuffer; /// _c2fmap ; // List of contained classes std::map _fmap ; // List of contained files std::map _ehmap ; // List of extra header files - bool _compiledOK ; //! Flag indicating that classes compiled OK + bool _compiledOK ; /// _wksp; /// _x; //! do not persist + std::vector _x; /// _x; //! Current coordinate + std::vector _x; /// _x; //! do not persist + std::vector _x; /// minimizeNLL(std::string const &prefix); RooAbsPdf* fPdf = nullptr; - std::unique_ptr fNll; //! + std::unique_ptr fNll; /// fNode; //! - std::shared_ptr fTopNode; //! + std::shared_ptr fNode; /// fTopNode; /// &_fr); public: - std::shared_ptr fr; //! + std::shared_ptr fr; ///> { }; static InteractiveObject *gIntObj; - mutable std::shared_ptr fComp; //! + mutable std::shared_ptr fComp; /// fParent; //! + std::shared_ptr fParent; ///::quiet_NaN(), double high = std::numeric_limits::quiet_NaN()); // *MENU* const char *GetRange() const; - mutable std::string fRange; //! only here so can have char* GetRange return so can return nullptr for no range set - //! (required for RooCategory) + mutable std::string fRange; /// - fXAxis; //! appears that if was fXaxis then dialog box for SetXaxis will take as current value + fXAxis; /// fProvider; //! like a parent but only for use by getObject + std::shared_ptr fProvider; /// parentPdf() const; // find first parent that is a pdf