Log of /trunk/roofit/roofitcore/inc/RooCachedReal.h
Parent Directory
Revision
46156 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 25 08:40:08 2012 UTC (2 years, 3 months ago) by
wouter
File length: 3158 byte(s)
Diff to
previous 43190
*** Speedup of caching of parameterized integrals ***
o RooAbsCachedReal
- Add interface to activate option of RooAbsCachedReal to keep clone of source object in cache for faster operation
(the downside of this is that future structural changes of the source object will not be detected)
o RooCachedReal
- Implement source cloning and persistence (based on code originally in RooAbsReal::fillDataHist)
o RooAbsPdf
- in syncNormalization() activate source caching feature for parameterized normalization integrals
*** Improve robustness of level-2 likelihood optimization 'cache-and-track' ***
o RooVectorDataStore
- in cachArgs() detect cache-and-track object labeled with a CATCondSet or CATNormSet string label
and reconstitute the corresponding set of conditional observables / normalization observables
from the RooNameSet transcript in the label. Fill initial content of cache-and-track elements
with these labels with the appropriate normalization set and associate the set with the RealVector
element that is used for future cache updates.
- In recalculateCache() pick up custom normalization set for conditional product terms as specified
in cacheArgs
o RooAbsOptTestStatistic
- in optimizeConstantTerms() check for non-default normalization specifications of RooProdPdf components
and if found, transcribe the specification to the component object in a CATCondSet or CATNormSet label
so that the cache-and-track optimizer can evaluate these according to the RooProdPdf specs.
o RooProdPdf
- Make findPdfNSet() public so that RooAbsOptTestStatistic can use it.
o RooNameSet
- Add content() method as accessor to the payload.
*** Miscellaneous ***
o RooAbsGenContext
- Fix compiler warning
o RooDataSet
- In ctor import weight variable of imported dataset if no weight variable is specified
(fixes Savannah #95641)
Revision
43190 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 1 12:09:43 2012 UTC (2 years, 10 months ago) by
wouter
File length: 2845 byte(s)
Diff to
previous 42950
Import last set changes from 532 patch branch
-----------------------------------------
Fix 2 related bugs
- Handling of pdfs with conditional observables in the likelihood
- Make pdf integrals that are cached and interpolated also work
when one of the pdf observables is conditional
o RooCachedReal
- Propagate OperMode ADirty to function being cached
o RooAbsCachedReal
- Propagate OperMode ADirty to RooHistFunc that implements cache
o RooVectorDataStore
- NOCacheAndTrack will also disable caching of constant terms
o RooAbsAnaConv
- Declare original resolution model as NOCacheAndTrack to prevent
superfluous cache calculations
o RooAbsReal
- In createIntObj() set caching wrapper to ADirty if the original integral
is auto-determined to be so
o RooAbsTestStatistic
- Add debug option NCPU=-1, which amounts to NCPU=1, but run the the MP interface
o RooNormSetCache
- Fix bug in copy ctor
o RooRealIntegral
- Fix bug in autoSelectDirtyMode() - only consider value servers, not sterile servers
o RooAbsTestStatistic
- Mark conditional observables in pdf, rather than in dataset, as that is what the new
vector-data-store uses
--------
o RooVectorDataStore
- In recalculateCache() only remove projected observables if they are defined
(is more efficient when this feature is not used)
-------
o RooParamHistFunc/RooHistConstraint
- New classes representing a flexible histogram shape, and class representing a product of Poisson
constraints on each of these bins
Revision
42950 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 9 21:21:53 2012 UTC (2 years, 11 months ago) by
wouter
File length: 2820 byte(s)
Diff to
previous 36209
Assorted bug fixes
o RooChi2Var, RooXYChi2Var, RooDataWeightedAverage, RooNLLVar
- Deploy upgraded interface of recalculateCache()
o RooAbsDataStore
- Extend interface for recalculateCache() to take needed
info for smart recalculation when using NCPU>1 and to
pass needed info for proper handling of normalization
observables
o RooCompositeDataStore
- Forward recalculateCache() to components (should not
be needed but just in case)
o RooVectorDataStore
- Treat conditional observables properly in the normalization
set passed to cached pdfs
- Only update elements that are actually being recalculated
when using NumCPU>1
o RooAbsAnaConv
- Persist _model so that generation works after persistence
o RooAbsReal
- Disable cache-and-track when making plot projections
with DataWeightedAverage, as this cannto work because
the needed information for normalization is not available
- Reinstate cloning of the function in fillDataHist(). Without
it is is possible to trigger as accidental 'self-destruct'
of cached normalization objects that call fillDataHist()
o RooCachedReal
- Make evaluate() return _func instead of null to make
disableCache mode of base class functional
- Initialize data member _useCdfBoundaries in all ctors
Revision
33802 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 9 14:34:02 2010 UTC (4 years, 7 months ago) by
wouter
File length: 2785 byte(s)
Diff to
previous 28259
o RooNumRunningInt, RooCachedPdf, RooCachedReal
- Use aggregateCacheUniqueSuffix() advertised by content to
distinguish objects with identical structure that have
different non-parametric content (such as likelihood functions)
o RooAbsCachedPdf, RooAbsCachedReal
- Allow addition of additional suffix to name of object cached
in expensive object store
o RooAbsReal
- Introduce virtual function cacheUniqueSuffix() that allow function
objects that have non-parametric content that can cause two instance
of an object with the same parameter to behave differently (e.g. likelihoods that
have different datasets but the same pdf) to advertise a string suffix
that can be attached to the index name in the expensive object cache to
distinguish different instances
- Introduct method aggregateCacheUniqueSuffix() that concatenates all suffixes
produced by any branch node into a single string
o RooAbsOptTestStatistic
- Advertise dataset pointer as unique cache suffix
Revision
24261 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 13 10:18:57 2008 UTC (6 years, 7 months ago) by
wouter
File length: 2798 byte(s)
Diff to
previous 24119
o RooCachedPdf RooCachedReal RooChi2Var RooAddModelRooChangeTracker RooCategory RooAddPdf
RooAdaptiveGaussKronrodIntegrator1D RooCacheManager RooArgList RooCatType RooBanner RooBrentRootFinder
RooArgProxy RooCategorySharedProperties RooAddGenContext RooCategoryProxy RooBinning RooAddition RooAcceptReject RooArgSet
- Upgrade inline documention: make sure that every member function has some descriptive comments, every
data member has a descriptive comment, make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
o RooAddPdf
- Add DIV0 protection in updateCoefficients() when running in extended ML mode
Revision
24119 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by
wouter
File length: 2019 byte(s)
o RooAbsSelfCachedPdf
- Follow changes in RooAbsCachedPdf
o RooCachedPdf
- Add option to override default choice of cache observables
(the normalization observables) with a specific set of variables
to make it possible to also cache p.d.f values for all values
of given parameters as well.
- Forward analytical integration capabilities to actual cache p.d.f
- Forward calls on preferred observable order to cached p.d.f
o RooDataHist
- Add option to bin dataset in alternate binning configuration, as
specified by binning name in constructor.
- Add feature to weight() function to enforce special boundaries
when interpolating a histogram representing a cumulative distribution function.
If so, lower-side bounds are forced to zero and upper-side bounds are
forced to 1.0 instead of the default mirroring strategy
o RooMsgService
- Add new topic NumericIntegration
- Show PROGRESS level messages by default
o RooAbsSelfCachedReal
- New base class for self-caching RooAbsReal objects analoguous
to RooAbsSelfCachedPdf
o RooCachedReal
- New class to cache arbitrary RooAbsReal function objects,
analogous to RooAbsCachedPdf
o RooRealBinding
- Add feature to save and restore values of input variables,
used by RooRealIntegral to restore observable values after numeric
integration to original values.
o RooLinearMorph
- New operator p.d.f class implementing using the algorithm described
by Alex Read in NUM A 425 (1999) 357-369 'Linear interpolation of histograms'.
This class implements a generalization for continuous p.d.f
o RooAbsRealLValue
- Following changes in RooAbsLValue
o RooHistFunc
- Real-valued function modeled by external RooDataHist object, analoguous to RooHistPdf,
but without normalization support and allowing negative histogram values
o RooAbsCachedReal
- New abstract base class for caching functions, analoguous to RooAbsCachedPdf.
o RooFracRemainder
- New dedicated helper class to calculate the remainder fraction of a RooAddPdf, i.e. 1-sum(i)x_i
for a given RooArgSet x
o RooCustomizer
- Fix memory management issue for sterile use
o RooAbsCategoryLValue
- Follow changes in RooAbsLValue
o RooNumCdf
- Specialization of RooNumRunningInt to calculate running integrals of p.d.f.s:
the running integral is by construction normalized to one exactly, taking out
any possible imprecisions in the regular integral calculation and by imposing
special constraints on the RooHistFunc that models the output so that the boundaries
are constrained to exactly 0 and 1 when interpolation is used.
o RooFFTConv
- Fix bug in cache naming algorithm
- Follow changes in RooAbsCachedPdf
o RooChangeTracker
- New special purpose object that tracks changes in a given set of variables, used
to determine if cached p.d.fs in RooAbsCachedPdf and RooAbsCachedReal need to
be recalculated due to parameter changes. In addition to valueDirty tracking,
an explicit comparison can be made to stored reference values of variables,
to avoid recalculation of expensive quantities in case a valueDirty is propagated
even if the value did not change (this can e.g. happen when you step though
a RooDataHist where usually only one of the observables changes value, but
all observables propagate a valueDirty every time)
o RooHist
- Bug fix in makeResidual()
o RooAbsReal
- Fix small memory leak in createIntegral
- Expand functionality of fillDataHist: optional correction for binVolume
when filling, and optional progress indication.
- Modify logEvalError() so that when cumulative logging for Minuit is disabled
that messages are printed through the standard message logging service.
- Modify error logging so that name of objects are stored in addition to
pointers so that delayed logging of errors of (cache) objects that no
longer exists can be performed correctly.
- Add virtual function preferredObservableScanOrder() to indicate preferred
order in which multi-dimensional functions should be scanned into a
RooHistPdf, which may matter greatly for the performance of certain
p.d.f.s like RooFFTConvPdf and RooLinearMorph
- Add new function createRunningIntegral() which constructs for a given F(x,y)
a Int[xlo,x] F(x',y) dx. The default strategy is to construct the underlying
integral with createIntegral() and adapt it with a RooCustomizer and a RooParamBinning
to a running integral. In case it concerns a one-dimensional numeric running
integral, the running integral is represented by a dedicated class RooNumRunningInt
which scans the integrand and numerically integrates the scanned histogram
o RooAbsCollection
- Bug fix in nameFieldLength handling of print routine
o RooAbsCachedPdf
- Introduce explicitly the strategy that the cache contains the _normalized_ p.d.f. values,
so that no postior normalization integral is required. This has the added advantages that
the cache p.d.f can be instructed to consider itself normalized skipping an explicit
normalization step in the RooHistPdf.
- Add utility function getCachePdf() and getCacheHist() to retrieve cache p.d.f and histogram
for a given choice of normalization set
- Clean up structure of CacheElem nested class by making guts private and providing accessor
function for derived CacheElem classes. Virtualize cache creation with a new member function
createCache that will allow derived classes to create a derived CacheElem.
- Forward integration handling to cache pdf actually being used
o RooDataHistSliceIter
- Follow changes in RooDataHist for alternate binning
o RooRealMPFE
- Follow changes in eval error logging in RooAbsReal
o RooAbsPdf
- Add createCdf() function to create cumulative distribution functions from p.d.f.s. This is
quite similar to RooAbsReal::createRunningIntegral() but with some c.d.f specific features
related to constraints on normalization
o RooAbsArg
- Fix bug in optimizeCacheMode()
o RooBrentRootFinder
- Improve error messaging through RooMsgService interface.
o RooCmdArg
- Expand payload from 2 to 3 strings
o RooSimWSTool
- Complete rewrite of RooSimPdfBuilder integrated with RooWorkspace for object storage.
o RooNumRunningInt
- New dedicated class to calculate running integral of any function that does not have
an analytical integral implementation. This class scans such a function in a histogram
and then numerically integrates the histogram. The filling of the histogram is performed
adaptively using a recursion division strategy with a precision cutoff to save time
of the filling of smooth functions in finely binned histograms
o RooMultiCategory, RooSuperCategory
- Minor tweak in name of proxies
o RooAbsIntegrator
- Deploy save and restore functionality of RooAbsFunc/RooRealBinding to restore observable
values to prior values after an intergration step.
o RooMinuit
- Fix gcc 4.3 compiler warning
o RooWorkspace
- Add bulk import() function taking a const RooArgSet instead of a RooAbsArg
- Add RecycleConflictNodes() option to ignore conflicts and simply recycle internal
nodes when a different external node is encountered.
- Add new accessors catfunc() for category functions, arg() for generic RooAbsArgs,
and funcArg() for fundamental arguments of any type.
- Add separate section for category functions in Print()
o RooHistPdf
- Add option to declare contents unit normalized. When activated, the analytical
integral is hardwired to 1.
- Add option to propagate cdfBoundaries mode to the underlying RooDataHist.
o RooAbsOptTestStatistic
- Optimize handling of empty rangeName specification (from Alfio)
o RooSimultaneous
- Tune proxy names
- Make p.d.f return zero, in case index category is in state where no p.d.f is assigned,
rather that assert(0)
o LinkDef3.h, Module.mk
- Add new class definitions
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.
