Log of /trunk/roofit/roofitcore/src/RooRealIntegral.cxx
Parent Directory
Revision
44507 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 4 12:30:41 2012 UTC (2 years, 7 months ago) by
axel
File length: 40366 byte(s)
Diff to
previous 43190
Remove
using namespace std;
from Riostream.h, which has huge consequences for all of ROOT.
Riostream.h is now a simple wrapper for fstream, iostream, iomanip for backward compatibility; Riosfwd.h simply wraps iosfwd.
Because of templates and their inline functions, Riostream.h needed to be included in headers, too (e.g. TParameter.h), which violated the assumption that Riostream.h is not exposing its using namespace std to headers.
ROOT now requires R__ANSISTREAM, R__SSTREAM, which does not change the set of supported compilers.
Without "using namespace std", several identifiers are now prefixed by std::; e.g. roofit/* source files now have a using namespace std to keep their coding style.
TFile::MakeProject() now generates "using namespace std" to convert the CINT-style class names into C++ ones.
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: 40344 byte(s)
Diff to
previous 42984
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
42984 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Feb 13 15:30:31 2012 UTC (2 years, 11 months ago) by
wouter
File length: 40816 byte(s)
Diff to
previous 42546
Assorted bug fixes
o Roo1DMomentMorphFunction, RooFunctorBinding, RooFunctor1DBinding, RooProdPdf, RooAbsRealLValue,
RooSimSplitGenContext, RooBinIntegrator, RooVectorDataStore, RooSegmentedIntegrator, RooChangeTracker,
RooAbsReal,RooFactoryWSTool, RooRealIntegral, RooTreeDataStore, RooUnitTest, RooAbsPdf
- Coverity fixes (mostly missing initialization)
o RooDataHist
- Fix in bin volume correction for partial integrals
o RooAbsData
- Remove stray debug comment
o RooObjCacheManager
- Follow change in RooCacheManager
o RooCacheManager
- Back out LHCb version - new version that does same thing but works correctly
Revision
42546 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Dec 20 09:53:42 2011 UTC (3 years, 1 month ago) by
wouter
File length: 40684 byte(s)
Diff to
previous 42528
o RooPlot, RooHist
- Add option to use average instead of bin center for residual and
pull histograms (variant on proposed patch #4948)
o RooAbsReal
- Use createIntegral() instead of RooRealIntegral in createPlotProjection
so that projection over multiple ranges is supported in ProjectionRange()
o RooRealIntegral
- In createIntegral() defer handling of no-integral scenarion to RooAbsReal
to implement consistent behaviour that is needed for createPlotProjection
o RooAbsData
- Add a conditional TH1::Sumw2() call to fillHistogram to fix Savannah #83858
Revision
42528 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 16 15:52:23 2011 UTC (3 years, 1 month ago) by
wouter
File length: 40520 byte(s)
Diff to
previous 42233
o RooVectorDataStore
- In cacheArg() removes nodes from input argset cacheArgs
that end up not being cache (i.e NOCacheAndTrack is set
and the node is not constant).
o RooRealIntegral
- In evaluate() restore status of setDirtyInhibit() to previous
value instead of kFALSE
Revision
42233 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 24 23:35:45 2011 UTC (3 years, 2 months ago) by
wouter
File length: 40766 byte(s)
Diff to
previous 41862
o PiecewiseInterpolation, RooProdPdf, RooRealSumPdf, RooProduct, RooAddPdf,
RooAddition, RooHistPdf, RooHistFunc
- Implement isBinnedDistribution
o RooSimSplitGenContext
- New implementation of RooAbsGenContext for simultaneous pdf.
The difference with the existing RooSimGenContext is that
the logic is implemented at the generate() level rather than
the generateEvent() level, which allows to perform mixed
binned/unnbinned generation
o RooBinnedGenContext
- New implementation of RooAbsGenContext that performs binned
generation, with an unbinned weighted dataset as output.
This new context implements the algorithm of
the now deprecated method RooAbsPdf::generatedWeightedUnbinned()
o RooSimultaneous
- Implement method autoGenContext() that selects a split context
can case (partially) binned generation is requested
- Deprecate generateMixed() - now absorbed in generate()
o RooAbsGenContext
- Make generate() virtual
- Implement processing of extend mode here too
o RooCompositeDataStore
- Fix compiler shadowing warnings
o RooAbsPdf
- Add method binnedGenContext() to return a generator context
for binned generation
- Add method autoGenContex() that can return either a binned
or unbinned context depending on the input and circumstances
- Add support for ExpectedData(),GenBinned(),AllBinned() and AutoBinned()
in generate()
- Deprecate generateWeightedUnbinned() - now absorbed in generate()
o RooLinkedList, RooLinkedListElem
- Adjust memory management of chain elements to avoid slow heap growth
o RooGlobalFunc
- Add GenBinned(),AllBinned() and AutoBinned()
o Module.mk
- Add RooSimSplitGenContext, RooBinnedGenContext
Revision
41862 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 10 09:44:32 2011 UTC (3 years, 2 months ago) by
wouter
File length: 40767 byte(s)
Diff to
previous 41676
o PiecewiseInterpolation, RooAbsCachedReal, RooAbsCachedPdf
- Follow adjustment in RooCacheManager
o RooConvCoefVar, RooEffProd, RooResolutionModel, RooErrorVar, RooProjectedPdf, RooAbsHiddenReal
- Migrate to getValV
o RooProdPdf
- Follow adjustment in RooCacheManager
- Migrate to getValV
o RooVectorDataStore
- Various small fixes
- Allow storage of non-constant 'track-and-change' cache entries.
These are cached PDF nodes that are not constant, but need
to be recalculated when selected parameters change. A
RooChangeTracker data member is added to the vectors to
do this dependency checking, and recalculation (as needed)
is performed in method recalculateCache() to be called from
the test stat before looping of the data.
o RooAbsReal
- Introduce new non-virtual inline getVal() methods that handles
clean-cache state cases and delegates all other cases to a
virtual method getValV() that corresponds to the original
getVal() method
- Add 'ignore' more to eval error logging protocal
o RooAddPdf
- Follow adjustment in RooCacheManager
- Optimize control structure in evaluate() to be more efficient
(move conditional outside loop)
o RooAbsTestStatistic
- Add extra argument to constOptimizeTestStatistic to control
activation of track-and-change optimization
o RooRealMPFE
- Migrate to getValV()
- Add support for new track-and-change option argument in
transmission of const optimization request to servers
o RooRealVar
- Exploit new _fast flag of RooAbsReal to choose non-virtual
handling of getVal()
- Migrate to getValV() [ but still dummy ]
- Small fix in attachToVStore()
o RooNLLVar
- Add data member tracking first use
- After first use, trigger wiring of all caches in RooCacheManagers
to speed up trivial cache selection decisions (i.e those where
only a single cache entry exists)
- Add call to RooAbsDataStore::recalculateCache() to implement
track-and-change update prior to likelihood loop
o RooConstVar
- Migrate to getValV()
o RooAbsArg
- Eliminate flipACLean() protocol since no longer used
- Simplify method opermode() now that flipAClean is abandoned.
- In findConstantNodes() add support for change tracking
and include nodes with "ChangeTracking" atttribute in
list of constants. Mark all truly constant expressions
with attribute "ConstantExpression"
- Add extra argument to constOptimizeTestStatistic to control
activation of track-and-change optimization
- In printCompactTree() also print valueDirty state when in Auto mode
- Add method wireAllCaches() which propagates cache wiring request
to all registered cache nodes on all branches nodes
- Add transient data member with namereg pointer to string with
current object name. Overload SetName() and SetName() and title
to clear pointer whenever name changes.
o RooAbsPdf
- Migrate to getValV(). Eliminate handling of clean-cache cases
as this is now done in RooAbsReal::getVal()
- Disable use of RooAbsPdf::raiseEvalError() protocol as this
is now communicated through RooAbsReal::logEvalError()
o RooRealIntegral
- Migrate to getValV()
- Use setInhibitDirty() instead of flipAClean() in evaluate()
when performing numeric integrations
o RooTreeDataStore
- In cachArgs() add code to select only cache items with
label "ConstantExpression" as tree store is unable to
cache track-and-change items
o RooAbsCategory
- When printing also show index associated to label
o RooAbsOptTestStatistic
- Add extra argument to constOptimizeTestStatistic to control
activation of track-and-change optimization
- In optimizeConstantTerms() when trackChanges option is active
request change tracking for all component nodes of RooAddPdf
and RooRealSumPdf, unless these components are RooProdPdf/RooProducts
respectively in which case the components of these products are tracked
o RooRealProxy
- Use _fast attribute of RooAbsArg to directly return value cache
of RooAbsReals if that is allowed
o RooAbsCache
- Add virtual method wireCache()
o RooCacheManager
- Add new method getObj() that takes isetRangeName as 'const char*'
instead of 'const TNamed *' to be able to eliminate the conversion
when in wired mode
- Implement cache wiring - If at moment of the request only a single
cached entry exists - always return that one from here one.
o RooAbsDataStore
- Implement virtual method calculateCache()
Revision
41676 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 1 15:44:30 2011 UTC (3 years, 2 months ago) by
wouter
File length: 40382 byte(s)
Diff to
previous 39949
*** Miscellaneous speed improvements ***
o PiecewiseInterpolation
- Import changes from Max baak (new interpolation options)
- Deploy fast iterators
o RooGaussian
- Bug fix in analytical integral over 'mean' parameter (Lorenzo Moneta)
o RooBernstein
- Deploy fast iterators
o RooProdPdf
- Reorganize code for improved speed
o RooDataHist
- Add support for vector-based data storage
o RooGenContext
- Improve generation speed by putting internal pdf clone to ADirty mode
o RooRealBinding
- Minimize number of calls to min() and max() for efficiency reasons
o RooAbsRealLValue
- In randomize() Minimize number of calls to min() and max() for efficiency reasons
o RooDataSet
- Make addFast() even faster by disable state propagation
o RooAbsGenContext
- Disable state propagation in output dataset for efficiency reasons
- Call initGenerator() only on the first generation sequence
o RooVectorDataStore
- Add support for native vs current buffers, to support the functioning
of addColumn(s)() and cacheArgs() when the datastore is attached
to a pdf in RooAbsOptTestStatistics
o RooAbsCategoryLValue
- Support change in RooAbsCategory to operate nominally by index rather than by label
o RooXYChi2Var
- Change code to support new pdf/data attachment scheme in RooAbsOptTestStatistics
where only the store buffers are reattached and the variable objects themselves
o RooFFTConvPdf
- Bug fix in getActualObservables() - functionality of setCacheObs() is now restored
o RooAbsReal
- Small adjustments in getVal() to make it faster in most cases
o RooAbsCollection
- Add datamember to keep track contents is exclusively RooRealVars. For those that
do implement a faster version of assignFast()
o RooAbsData
- Add methods attachBuffers() and resetBuffers() - forwarded to datastore - that
facilite new 'fast-attach' methods used in RooAbsOptTestStatistic
o RooCompositeDataStore
- Fix copy constructors so that they clone and own the subsidiary datasets
- Operate index by value rather than by string label for efficiency reasons
o RooRealVar
- Bug fix in attachToVStore() to properly handle RRVs with StoreError tags
o RooAbsPdf
- Adjustments in getVal() to make it faster for most cases
- Modify generate(GenSpec*) to initialize specInit flag that
triggers one-time call of initGenerator()
- Modify generate() to not repeatedly call initGenerator() for the same gencontext
o RooAbsArg
- Deploy fast iterators in more places
- Add various new inline methods performing multiple ops (e.g retrieving and
clearing one or more dirty flags) for improbed RooAbsReal/RooAbsPdf::getVal()
operations
o RooBanner
- Increment version tag to 3.48
o RooRealIntegral
- Add overloaded getVal() method that also checks for shapeDirty flag,
which was removed from RooAbsReal::getVal() as it is not needed for
any class other than RooRealIntegral
o RooAddGenContext
- Disable state propagation in output dataset for efficiency reasons
- Replace ROOT container classes with STL versions for efficiency reasons
o RooMultiCatIter
- Adjust code to new RooCatType behaviour that by default only tracks the
integer representation of type
o RooProdGenContext
- Replace ROOT container classes with STL versions for efficiency reasons
o RooTreeDataStore
- Adjust code so that it works with the new fast-attach mechanism used
in RooAbsOptTestStatistic
o RooRealProxy
- In lvptr() remove explicit check for lvalue
o RooSimGenContext
- Disable state propagation in output dataset for efficiency reasons
- Replace ROOT container classes with STL versions for efficiency reasons
- In createDataSet() create a prototype dataset in the first call, and
clone that for subsequent calls rather than calling the expensive named
argument constructor each time
o RooTrace
- Add (dummy) method callgrind_zero() and callgrind_dump() as hook functions
to facilitate improved callgrind profiling
o RooAbsCategory
- Adjust class so that it works with the integer representation of types only
and lookup associated string label on the fly, whenever it is requested
o RooFormular
- Eliminate overloaded getVal() as its functionality is now provided in
RooAbsReal::getVal()
o RooAbsOptTestStatistic
- Implement new fast-attach mechanisms for pdf and datasets: only readjust the
buffer pointers of the dataset to the pdf observables, rather than reattaching
the pdf to the dataset observables. This results in a _much_ faster
operation of setData() and no longer entangles the test statistics with observables
of datasets that may be deleted during the lifetime of the test statistic
o RooSimultaneous
- Overload fillDataHist() with new version with correct normalization (from Scott Snyder)
o RooCategory
- Adjust getLabel() so that it retries labels associated with the current index on the fly
o RooCatType
- Make label contents 'transient', i.e. it is not copied on assignment for faster
category operations. RooAbsCategory will load the associated labels on demand from now on.
Revision
39949 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 24 15:13:35 2011 UTC (3 years, 7 months ago) by
wouter
File length: 39761 byte(s)
Diff to
previous 38909
o RooAbsReal, RooFactoryWSTool, RooRealIntegral
- Fix inline of statics for windows
o RooBanner
- Increment version tag to 3.16
o SimpleLikelihoodRatioTestStatistic
- Allow reuse of NLL optimization (OFF by default)
Revision
37380 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Dec 7 21:26:55 2010 UTC (4 years, 1 month ago) by
wouter
File length: 39188 byte(s)
Diff to
previous 36210
....Last changes for 5.28...
o RooLegendre, RooSpHarmonic
- Robustness improvements (from G. Raven)
o RooRealIntegral
- Fixes to default ctor for persistence
o RooObjCacheManager
- Fixes to default ctor for persistence
o RooAbsTestStatistic
- Fixes to default ctor for persistence
o RooAbsOptTestStatistics
- Allow sealing of test statistics
o RooWorkspace
- Handling of sealed test statistics
Revision
34064 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 22 15:05:19 2010 UTC (4 years, 7 months ago) by
wouter
File length: 39096 byte(s)
Diff to
previous 31258
Import roofit/roofit(core) changes from dev/roostats branch to trunk
=== r34062 ===
o RooProdPdf
- Fix compilation error on Windows
- Fix memory leak
- Fix some shadowing problems
o RooDataHist
- Fix memory leak
o RooFactoryWSTool
- Add syntax checker routine to factory front-end. At present
this counts only of all pairs of (),[],{} match.
- Add factory syntax 'set::name(a,b,c)' as factory syntax for
RooWorkspace::defineSet("name","a,b,c") ;
o RooAddPdf
- Fix memory leak
o RooAbsNumGenerator, RooAcceptReject, RooFoamGenerator
- Fix uninitialized pointer problem spotted by valgrind
o RooRealMPFE
- Fix gcc 4.4 warnings by checking return values of all read(),write()
and pipe() calls.
o RooAbsPdf
- Fix variable shadowing issue
o RooRealIntegral
- Fix memory leak
o RooTreeDataStore
- Fix memory leak
o RooSimultaneous
- Fix variable shadowing issue
o RooGlobalFunc, LinkDef2
- Include fix from Kyle/Axel to solve include guard issue in macros
for namespace RooFit
=== r34020 ===
Update to RooRealSumPdf where normalization had memory leak
=== r33961 ===
o RooAbsReal
- Add new method setEvalErrorLoggingMode() that takes three options
PrintErrors (default), CountErrors (new) and CollectErrors (supports
structured printing during minimization
o RooRealMPFE, RooMinimizerFCN, RooMinimizer, RooMinuit
- Follow changes in RooAbsReal
o RooAbsPdf
- Make getLogVal() return log(0) when probability is zero, rather than zero,
to support operation of (non-log) likelihood functions
=== r33945 ===
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
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple n
=== r33943 ===
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple normalization ranges
=== r33758, r33720 ===
o RooPoisson
- Fixes in internal generation code
o RooLogNormal, RooGamma, LinkDef1
- New classes contributed by Gregory Schott
Revision
31258 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 17 22:41:06 2009 UTC (5 years, 2 months ago) by
wouter
File length: 38120 byte(s)
Diff to
previous 30447
o RooAbsDataStore
- Add pure virtual interface for handling of event weights
o RooCompositeDataStore
- Implement forwarder function for weights handling
- Keep track of 'current' in data member to allow forwarding
of calls to 'current' dataset
o RooDataHist
- Export pointers to weights and errors array to RooTreeDataStore
o RooDataSet
- Adjust to store weight variable in RooTreeDataStore
- Modify Link() argument in ctor to take both RooDataHist and RooDataSet objects
- Migrate all handling of weights to RooTreeDataStore
- Deprecate support for changing name of weight variable after construction,
it is incompatible with the new dataset organization structure.
o RooEffProd
- Fix bug in persistency
o RooGlobalFunc
- Change argument of Link() from RooDataSet to RooAbsData
o RooHistPdf
- Fix two bugs in handling of partial integrals:
1) Correctly fill analVars argument with observables actually
integrated internally in getAnalyticalIntegralWN().
2) Transfer values of pdf observable to histogram observables in
analyticalIntegralWN() so that correct slice position is taken
into account in integral calculation
o RooNumRunningInt
- Fix array overflow bug
o RooTreeDataStore
- Add data members that can optionally hold externaly arrays of weights,
and add methods to support manipulation of these
- Implement handling of event weights, either from a weight variable,
or from an external weights array
o RooNDKeysPdf
- Bug fix in gauss()
o RooStepFunction
- Step function defined by external input functions
for return values and boundaries (contribution bu T. Dupree)
o RooMultiBinomial
- New pdf that implements multiple binominals defined from
N external categories and associated efficiency functions
(contribution by T. Dupree)
o RooBanner
- Increment version tag to v3.11
o RooRealIntegral
- Fix small memory leak
o roostats/MarkovChain
- Follow change in RooDataSet
Revision
30447 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Sep 25 12:44:02 2009 UTC (5 years, 3 months ago) by
wouter
File length: 38087 byte(s)
Diff to
previous 30333
o RooFitResult,LinkDef2
- Apply explicit conversion of correlation matrix data from
V1 streamer data to TMatrix representation
o RooRealIntegral
- Initialize data member in ctor that did not exist in V1
Revision
26878 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 12 15:21:17 2008 UTC (6 years, 1 month ago) by
wouter
File length: 33363 byte(s)
Diff to
previous 26044
o RooAbsPdf
- Handle Optimize() argument in createNLL()
o RooBanner
- Increment version tag to v2.95
o RooAbsArg
- Credit Kyle for original concept of GraphViz use
- Make operMode() properly reflect status of flipAClean()
o RooRealIntegral
- Remove spurious double application of jacobian term
o RooChebychev
- Do not advertise internal integral if integration over
range is requested as internal implemention currently
only handles complete range
Revision
26044 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 31 16:45:22 2008 UTC (6 years, 2 months ago) by
wouter
File length: 33713 byte(s)
Diff to
previous 25184
(Fixes inferred from valgrinding of expanded stressRooFit test suite)
o RooParamBinning
- Fix initialization of _owner in default ctor
o RooAbsRealLValue
- Fix small memory leak in createHistogram()
o RooDataSet
- Fix small memory leak in constructor
o RooCurve
- Fix leaking of array of sampling hints in addPoints()
o RooAbsReal
- Fix small leak in plotAsymOn()
- Fix double ownership problem in createIntRI()
o RooProduct
- Fix two small memory leaks
o RooAbsTestStatistics
- Downgrade initSimMode message from ERROR to INFO
o RooAbsPdf
- Add Warning() modifier to plotOn() to set MINUIT SET NOWarn option
- Fix small memory leak in fitTo() when using constraints
- Fix glitch in generate() in extended mode when nPoisson=0
- Fix small memory leak in plotOn() when using ranges
o RooRealIntegral
- Fix small memory leak in constructor
o RooPolyVar
- Add destructor that deletes internal iterator
o RooMinuit
- Add interface to suppress MINUIT warnings
o RooGlobalFunc
- Define Warnings() named argument
o RooArgSet
- Add protection to pool allocation scheme in case pool size is not
exactly N times object size
o RooSimultaneous
- Fix small memory leak
Revision
25184 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 20 13:59:55 2008 UTC (6 years, 5 months ago) by
wouter
File length: 33696 byte(s)
Diff to
previous 24285
o RooAbsSelfCachedPdf
- Declare embedded RooHistPdf as self-normalized to prevent
superfluous calculation of unit normalization
o RooDataHist
- Add new named argument ctor that can collate multiple
TH[123] into a N+1 dimensional RooDataHist which has
an extra RooCategory to distinguish the source, as
well as import single a TH[123] objects
- Add ctor that can do the same, but specified from
a map<string,TH1> specification.
- Add new importTH1Set(),importTH1() utility methods to implement
common functionaly of both new ctors
- Add adjustBinning() method that encapsulates the functionality
to adjust the RooDataHist observable binning to match that
of a given (imported) TH1, which was formerly contained in the ctor
- Speed up code in interpolateDim() by reducing number of required
lookups of the observable binning definition.
o RooParamBinning
- Add tree printout of boundary functions, if defined in verbose
printing mode
o RooMsgService
- Add special handling of PROGRESS message level: automatically
insert newline when switching from a PROGESS to another message level.
o RooPlot
- In verbose printing, add index number to printout of each contained
plotable object
o RooGenContext
- Fix for handling of observables with parameterized ranges
- Eliminate forgotted debug print statement
o RooAbsRealLValue
- Implement new binning interface methods that take binning reference
rather than binning name, for faster use in internal operations
- Implement new RooAbsLValue methods with RooAbsBinning pointers
o RooDataSet
- Add new named argument constructor that can generically handle imports
of TTrees, RooDataSet and can collate multiple RooDataSets into
a N+1 dimensional RooDataSet with an extra RooCategory that labels
the source dataset
o RooDLLSignificanceModule
- Tune some of the names of the produced output observables
o RooChi2Var
- Set the default error type to RooAbsData::SumW2
o RooCustomizer
- Modify the sterile build() routine to make the returned
head node own all the created components rather than
the customizer itself.
o RooAbsCategoryLValue
- In copyCache(), check that the value copied is in fact
valid for the destination.
o RooFitResult
- Tune the line widths of the objects created in plotOn()
when creating the error ellipse.
- Add a method correlationHist() that returns a 2D histogram
with the correlation matrix element values, which is labeled
with the parameter names.
o RooCurve
- Add explicit handling for evaluation errors that can occur
when sampling the function being represented. New constructor
arguments control how evaluation errors are logged to
RooMsgService, in similar style to RooMinuit, and control
how the drawn output value is affected (as calculated, or
substituted with a user controlled value).
o RooFFTConvPdf
- Add automated handling of FFT sampling windows of the 'physics'
pdf and the 'resolution' pdf. In the new setup the second pdf
is always assumed to be a 'resolution' pdf and its sampling window
is chosen symmetrically around zero, regardless of the definition
of the range of the convolution observable. The width of the sampling
window, and the number of sampling bins is still tied to the "cache"
binning defined in the convolution observable. Added setShift()
modifiers allow the user to manually control the sampling window
shifts on both pdf. The shift introduced by sampling a shifted
window of the resolution effect is correct a posteriori by
performing a compensating rotation of the final FFT buffer.
- Modify FFTCacheElem to cache a functional clone of both pdf
with optional shift transformations applied through a RooLinearVar
substitution of the original convolution observable. Instruct
caching RooDataHist not to forward dirty state propagation calls
and set sampling pdf clones to AlwaysDirty to increased operational
efficiency.
o RooChangeTracker
- Add parameters() method returning the tracked parameters
o RooRealSumPdf
- Implement component selection functionality in plotting as
is available for RooAddPdf
o RooEfficiency
- Implement analytical integral over acceptance category
(it is always 1.0)
o RooHist
- Implement ability to handle RooAbsData::None error bars
(i.e no errors)
- Expand functionality of constructor taking two TH1s
to also represent the efficiency binomial in addition
to the assymmetry binomial
- Add addEfficiencyBin() method to handle calculation
of efficiency bins.
o RooAbsReal
- Make named argument version of fitTo() default method
when invoked with no arguments
- In fitTo(), if pdf is extendable and no explicit Extended() argument
is given, automatically included extended likelihood term
- In fitTo(), disable default running of MINOS when invoked without
arguments
- Move component selection functionality from RooAbsPdf
to here so that it also works for RooRealSumPdf, which
takes RooAbsReals as components rather than RooAbsPdf
- Add simplified createHistogram() method that takes
string with comma separated observable names and
three optional bin numbers.
- Add createHistogram() method that takes a list of
RooCmdArgs that can serve as backend for all user
interface methods.
- In plotOn() support the new Slice() argument for categories
that allow inline specification of of the slice position.
- Also add support for the PrintEvalErrors(Int_t numErr) and
EvalErrorValue(Double_t value) arguments to allow better control
of evaluation error handlign during plotting.
- Also add support for the MoveToBack() argument that immediately
inserts the curve at the bottom of a RooPlot stack.
o RooProduct
- Remove erroneous assert()
o RooAbsCollection
- In snapshot(), only add "Snaphot of" to name if original
has a non-null name.
- In verbose printing mode, remove printing of 'extras' and
only print '(owning contents)' of collection has a non-null name
o RooAddPdf
- Fix logic of recursive fractions constructor. Recursive additions
happen start on the rightmost pair of pdfs, recursively adding
one more pdf to the left at each iteration. Coefficients describe
the fractions of the leftmost pdf in each recursive addition,
starting with the outermost addition of the 1st pdf to the
som of all other pdfs, continuing with the fraction of the
2nd pdf being added to the sum of pdf 3-n etc...
o RooAbsCachedPdf
- Degrade 'parameters have changed' message from INFO to DEBUG
- Interface cache histogram objects to RooExpensiveObjectCache
with associated parameters given by RooChangeTracker
- Fix bug in printing: only print normalization object of
cache if it actually exists
o RooAbsTestStatistic
- Reimplement copy constructor to initialize from scratch from
original contents, to support sane implemlementation of
copying of optimized test statistics with multi-process
calculations.
- Fix redirectServers method for objects implementing multi-process
test statistics
o RooRecursiveFraction
- Invert incoming list of plain fractions when filling internal
list in ctor so that last fraction is 'special' instead of first
to support improved handling of recursive fractions in RooAddPdf
o RooAbsData
- Fix client-server reconnect handling for dataset observables
with parameterized ranges in terms of other dataset observables
- Add simplified createHistogram() method that takes
string with comma separated observable names and
three optional bin numbers. If bin counts are negative,
the ranges of output histogram are automatically calculated.
If the bin counts are positive, the ranges of the observables
are used for the histogram, unless the observable has an
open-ended ranges, in which case the automatic calculation
is used.
- Add createHistogram() method that takes a list of
RooCmdArgs that can serve as backend for all user
interface methods.
- Extend createHistogram() method with named arguments
to take AutoBinning and AutoSymBinning arguments to
automatically calculate the ranges of the output histogram
with the specified number of bins.
- Add a table() method that takes a set of RooCategories
and returns a table of the output states of a RooSuperCategory
of the given input categories.
o RooProfileLL
- Add option to start minimization always from parameters
of global minimum.
o RooRealMPFE
- Remove some forgotted debug printouts
- Pass IsConstant() state of RooRealVars being transferred in
addition to their value and error.
- Fix copy constructor
o RooRealVar
- In printing interface, maker error part of 'value' rather
than of 'extras'
- Fix bug in format() concerning constant parameters with
errors.
o RooAbsPdf
- Move component selection support for RooAddPdf to RooAbsReal
so that it also works with RooRealSumPdf.
- Remove some superfluous DEBUG level print messages
- Add support for EvalErrorWall() named argument in fitTo
to give user control of the 'NLL wall' feature used to
force MINUIT to retreat from regions with evaluation errors
- Enlarge default size of box created by paramOn()
o RooAbsArg
- Add pointer to expensive object cache to use for any expensive
objects to be cached in association with this object
- Add recurseNonDerived option to branchNodeServerList
- Overload printAddress() to so that RooAbsArg base address
is printed rather than RooPrintable base address, which
can be different due to multiple inheritance
- In constant term optimization, prevent addition of
observables with parameterized ranges to cache.
- Add interface methods to get and set the associated
expensive object cache
- Add flipAClean() accessor method for corresponding
static data member to solve windows linkage problems.
o RooRealIntegral
- Add support for cache values of >1D integrals in
expensive object cache
o RooExpensiveObjectCache
- New repository class that holds expensive components of RooAbsArg
function objects along with the parameters value for which the
stored expensive object is valid. All newly created objects
are associated with a default singleton instance in memory,
but objects in RooWorkspaces are associated with a cache in the
workspace.
o RooMCStudy
- Add Silence() named argument to ctor that will silence all
RooFit messages during running below the PROGRESS level
- Store generated number of events in fitParDataSet()
- Only store generated parameter values in fitParDataSet()
if constraints were used
- Give fitParDataSet() a unique named, named after the
fit and/or generator model used.
o RooNumRunningInt
- Fix bug in calculation of cdfs.
o RooMinuit
- Deprecate support for error handling mechanisms that are now
phase out.
- Implement option to ignore evaluation errors
- Improve the contour() method to return a RooPlot containing
contour TGraphs, rather than drawing them directory on a canvas
o RooDouble
- Set name to string representation of value
o RooGlobalFunc
- Add various named argument constructors needed by other code
o RooCintUtils
- New name space with CINT interaction utilities
- Add function to match a given functin pointer to a string with
a function argument list specification to facilitate manual overloading
of method on function pointer declarations, which is not supported
directly by CINT
o RooPrintable
- Introduce printAddress() method to print address
o RooRandomizeParamMCSModule
- Fix bug in init()
o RooAcceptReject
- Adjust code to make it work with observables with parameterized ranges
o RooWorkspace
- Add an embedded expensive object cache to each workspace. Connect each
inserted object to the internal expensive object cache and transfer
any cache contents upon insertion as necessary.
o RooNumIntConfig
- Tune non-verbose printing output
o RooAbsOptTestStatistic
- Implement correct handling of test statistics with observables
that have parameterized ranges in terms of other observables
- Implement sane copy constructor.
o RooHistError
- Add method to calculate confidence intervals for efficiency binomials.
o RooSentinel
- Add cleanup handler for expensive object cache global instance
o RooBinningCategory
- New real->cat function that represents binning associated with
any given RooAbsRealLValue as category functions. Category states
mapping to observable bins are automatically created and named
o RooSimultaneous
- Add support for new Slice() arguments that allow to specify the
slice position for category observables.
o RooTreeData
- More fixes for infernal warning messages from TTree concerning
improperly constructed memory resident trees
- Forward TTree::Draw() method with cut expression.
- Add Efficiency() named argument to plotOn() method to support
plotting of efficiencies represent by a category observable
that indicates which event do (not) pass a given cut
- Support FillColor() and FillStyle() named arguments in plotOn()
for the benefit of bar chart representations of histograms
- Add plotEffOn() method to implement internal handling specific
to efficiency plotting
- Extend functionality of getRange() method to automatically
include margins and optional interval symmetrization around
the mean if requested.
- Adjust observable pruning algorithm in data reading optimization
mode to take observables with parameterized ranges into account
o RooDirItem
- When creating a memory resident object, do not change directory if
already in memory directory.
Revision
24285 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 16 15:05:15 2008 UTC (6 years, 7 months ago) by
wouter
File length: 32472 byte(s)
Diff to
previous 24280
o RooProdPdf RooParamBinning RooMsgService RooStreamParser RooPlot
RooRealBinding RooSharedPropertiesList RooPullVar RooNameSet RooNumCdf
RooThreshEntry RooNumber RooSegmentedIntegrator1D RooRangeBinning
RooRealSumPdf RooProduct RooRefCountList RooSharedProperties RooTable
RooRecursiveFraction RooNormSetCache RooNumConvPdf RooProfileLL
RooObjCacheManager RooQuasiRandomGenerator RooRealMPFE RooRealVar
RooNLLVar RooPlotable RooRealIntegral RooStringVar RooRealConstant
RooNumIntFactory RooMultiCatIter RooNumRunningInt RooMPSentinel
RooResolutionModel RooTruthModel RooMultiCategory RooPolyVar
RooSetProxy RooNumConvolution RooRealVarSharedProperties
RooProdGenContext RooMinuit RooProjectedPdf RooNameReg RooPrintable
RooRandom RooRandomizeParamMCSModule RooUniformBinning RooRealProxy
RooSimGenContext RooThresholdCategory RooSuperCategory RooTrace
RooNumIntConfig RooSegmentedIntegrator2D RooRealAnalytic RooSentinel
RooSimultaneous RooTreeData
- Update of function member documentation.
Revision
24280 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sun Jun 15 20:57:45 2008 UTC (6 years, 7 months ago) by
wouter
File length: 31714 byte(s)
Diff to
previous 23538
o RooMCIntegrator RooMCStudy RooMinuit RooMsgService RooMultiCategory RooMultiCatIter RooNameReg RooNameSet RooNLLVar
RooNormSetCache RooNumber RooNumCdf RooNumConvolution RooNumConvPdf RooNumIntConfig RooNumIntFactory RooNumRunningInt
RooObjCacheManager RooParamBinning RooPlot RooPlotable RooPolyVar RooPrintable RooProdGenContext RooProdPdf RooProduct
RooProfileLL RooProjectedPdf RooPullVar RooQuasiRandomGenerator RooRandom RooRandomizeParamMCSModule RooRangeBinning
RooRealAnalytic RooRealBinding RooRealConstant RooRealIntegral RooRealMPFE RooRealProxy RooRealSumPdf RooRealVar
RooRealVarSharedProperties RooRecursiveFraction RooRefCountList RooResolutionModel RooScaledFunc RooSegmentedIntegrator1D
RooSegmentedIntegrator2D RooSentinel RooSetPair RooSetProxy RooSharedProperties RooSharedPropertiesList RooSimGenContext
RooSimPdfBuilder RooSimultaneous RooSimWSTool RooStreamParser RooStringVar RooSuperCategory RooTable RooThreshEntry
RooThresholdCategory RooTObjWrap RooTrace RooTreeData RooTruthModel RooUniformBinning RooWorkspace
- Upgrade inline documention: make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
- Updating of data, function member documentation _not_ done yet
Revision
23538 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 24 21:02:00 2008 UTC (6 years, 9 months ago) by
wouter
File length: 30425 byte(s)
Diff to
previous 23134
Import changes from development branch
==== Date: Wed Feb 20 22:33:28 2008 =====
o RooRealSumPdf
- Do _not_ use normalization of RooAbsPdf input components
in numerator of RooRealSumPdf expression since it is
already explicitly occurring in denominator of RooRealSumPdf.
(Fixes wrong normalization reported by Tristan)
o RooObjCacheManager
- Register owner of cache with each cache elememt to
facilitate callbacks
o RooAbsCacheElement
- Add storage for pointer to owner of cache and
supply setOwner() function
o RooAbsPdf
- Use RooObjCacheManager callback mechanism to zero
'last used normalization' pointer in RooAbsPdf
when the cache-owned object pointed is about
to be deleted.
o RooAbsArg
- Make crc32 function static
o RooWorkspace
- Add CodeRepo nested class that allows to store C++ code
of RooAbsArg derived classes that are not in ROOT distribution
but are contained in workspace. When reading any missing
class, code is compiled on the fly allowing for transparent
reading of workspace object from file. Code is found in
location pointed to from TClass objects. Additional search
path for declaration and implementation files can be provided
to be able to handle non-trivial cases.
- Add WSDir nested class that represents information contained
in workspace as read-only TDirectory for easy interactive use.
Directory representation is created using makeDir() member function.
o LinkDef3
- Add nested classes in RooWorkspace
===== Date: Wed Mar 26 23:04:26 2008 =====
o RooProdPdf
- Fix typo in ctor documentaion
- Improve error message in expectedEvents() when no extendable p.d.f.s are found
- Implement getConstraints() function to retrieve constraint p.d.f terms from product
expression given set of observables and set of parameters to be constrained.
o RooMsgService
- Add PROGRESS message level between INFO and WARNING
- Add globalKill level for messages to be able to quickly eliminate all messages below
a given level without interfering with the stream structore of RooMsgService
o RooPrintable
- Implement new printing interface with more details control over items printed trhough contents enum
(multiple ORable options) and style of printing (inline, single line, (verbose) multiline) with style
enum (exclusive options).
- Introduce generic virtual functions for printing of name,title,value,arguments,
and extras of each object.
- Each class can overload the default contents used for all printing
uses (inline,verbose,standard) etc as well as the default printing style invoked by Print()
o RooPlot,RooGenContext, RooAbsRealLValue,RooDataSet,RooNameSet,RooCustomizer, RooAbsGenContext, RooAddModel,
RooFitResult,RooCurve,RooAbsAnaConv,RooHist,RooAbsReal,RooAbsCollection,RooAddPdf,RooTable,RooAbsData,
RooMappedCategory,RooFormula,RooFormulaVar,RooCatType,RooRealVar,RooAbsArg,RooAbsPdf,RooPlotable,RooRealIntegral,
RooAbsBinning,Roo1DTable,RooAddGenContext,RooGenericPdf,RooResolutionMode,RooAbsHiddenReal,RooMultiCategory,
RooAbsString,RooSetProxy,RooProdGenContext,RooConvGenContext,RooGenCategory,RooGrid,RooSimGenContext,
RooThresholdCategory,RooAcceptReject,RooSuperCategory,RooEllipse,RooNumIntConfig,RooAbsCategory,RooListProxy,
RooLinearVar,RooTreeData,RooTreeData
- Update to new RooPrintable interface
o RooGenContext,RooAbsGenContext,RooAddGenContext,RooProdGenContext,RooConvGenContext,RooSimGenContext
- Implement attach() function to simplify management of changing parameters during lifetime of context
o RooAbsRealLValue
- Eliminate inFitRange() warning message as it is gives too many false warnings when used with
parameterized ranges
o RooCustomizer
- Make owning of contents optional to simplify release of created components
o RooAbsReal
- Implement new evaluation error logging mechanism. Rather than passing zero p.d.f values, push error message with
details on a static stack (if logging is enabled by e.g. RooMinuit).
- Augment functionality of createIntegral: explicitly allow integration over ranges with bounds parameterized in
in terms of other integrated observables. Integrals of this type are automatically recognized and cast
as recursive integrals in case of >1-D integrals to integrate over requested phase space.
- Add createIntObj() helper function for above functionaliy.
- Eliminate a lot of commented out debug code from createPlotProjection()
- Modify fillHistogram(): when plot observables are cloned, explicitly interconnect clones again to facilitate
proper plotting of N-D integrals with entangled parameterized ranges
- Add ScaleFactor() argument to fillHistogram to control use of histogram density correction scale factor in Z-scale
of filled histogram
o RooProduction
- Fix bug for persistence
o RooRealMPFE
- Extend client/server protocol with message to retrieve RooAbsReal evaluation error log from server side and
merge with error log on client side
o RooRealVar
- Introduced concept of non-shared alternative binnings(ranges) required to accommodate RooParamBinning ranges
that cannot be shared across instances because of their client/server connection to other objects in p.d.f
expression trees. Modify setBinning to automatically recognize non-shareable binnings and divert those to
non-shared alternative binning container.
- Add setRange([const char*,] RooAbsReal&,RooAbsReal&) methods to simplify creation of parameterized ranges.
o RooAbsArg
- Introduce concept of owned components with addOwnedComponents() interface to be able to make any RooAbsArg
object own any number of others. This can be used to simplify the memory management of object trees
- Introduce prohibitServerRedirect mode that will trigger fatal assert if any server redirect is attempted
to thus configured object. Useful as debugging tool to track faulty copy constructors that leave clone
object tree unintentionally connected to the original object tree.
- Migrate fixed--name-field management tool from RooAbsReal to RooAbsArg. Used to accomplish regular
formatting in RooAbsCollection::printStream.
- Add concept of transient boolean attributes that are not tranferred on copy construction. Mostly useful
for debugging.
- Extend leafNodeServerList and treeNodeServerList to distinguish to types of leaf-nodes: strict leaf modes
in the sense of the client-server tree structure and 'physical' leaf nodes that do not recurse into
nodes that have isDerived()==kFalse. The latter corresponds to the original concept of leaf nodes / variables,
which the former mode, a new addition, explicitly exposes any shape servers contained in parameterized
ranges of variables.
- Fix logic error in recursiveServerRedirect: do not recurse into nodes that are in the replacement list themselves.
- Fix bug in printCompactTree(): value/shape clients were not always properly indicated.
- Add getAllConstraints() method that finds all RooProdPdfs in expression trees and harvest constraints from all
of these from the getConstraint() method
o RooAbsPdf
- Implement new evaluation error logging mechanism for negative p.d.f values and zero normalization integrals
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to fitTo() method.
The Constrain() method retrieves any constraints p.d.f. on parameters multiplied in any RooProdPdf in the normal
p.d.f expression and adds those to the likelihood that is minimized. Only constraints on the listed parameters
will be picked up. Multiple constraints per parameter may exist. The ExternalConstrains() argument implements
similar functionality except that provided external constraint p.d.f.s are added rather than internal constraints.
- Fix potentially fatal bug in print statement in getContext()
- Add new method createCdf() to create a cumulative distribution function from given p.d.f. Given a set of observables x,
the returned c.d.f is implemented in terms of a RooRealIntegral of p.d.f(x') over a parameterized range from [ 0 - x ].
o Roo1DIntegrator
- Improve error message
o RooRealIntegral
- Fix bug in calculation of shape dependencies on observables.
- Add handling of dependencies of integral value on values of objects representing parameterized ranges of
integrated observables.
o RooMCStudy
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to constructor.
In addition to passing these arguments to the fitTo() call of the fit stage, modify event generation as
follows: instead of sampling events from 'static' generator p.d.f, sample value of constrained parameters
from joint constraints p.d.f and sample observables at those parameter settings. Save the generator parameters
for each toy as these change per toy. Change the pull calculation such that it uses the per-event truth values
rather than the per-study truth value if constraints are used.
o RooAddition
- Fix bug in evaluate() related to persistence
o RooMinuit
- Enable/disable new evaluation error logging mechanism prior to and just after each MINUIT call.
- Print logged error messages, if any, in glue function
o RooProjectedPdf
- Fix important bug: normalization set should always include integration set for each configuration
o RooGlobalFunc
- Add definition of Scaling(),Constrain() and ExternalConstraints() helper functions
o RooUniformBinning
- Remove dedicated print function as it output is identical to that of the generic print function in RooAbsBinningx
o RooAbsBinning
- Add virtual methods isParameterized(),lowBound() and highBound() to be to detect and analyze parameterized binnings
through abstract interface
- Add isShareable() method to be able to separate shareable and non-shareable binnings in RooRealVar.
- Add insertHook() and removeHook() function to allow connection of possible proxies present in binning to
owning RooAbsArg.
o RooWorkspace
- Improve code import facility by introducing a class->file mapping step in the CodeStore to correctly handle cases where
multiple classes are defined in a single file.
- Add check that TClass interface actually yields file names.
- Only require default constructor to be present for non-abstract classes. It should be there for abstract classes as
well but current TClass::HasDefaultConstructor() method will not tell us.
o RooTreeData
- Improve renameVariable() method to not only rename the RooAbsArg branch buffer but also any TTree branches involved as well.
While the tree branch names are generally invisible to the user, having branch names that are different from branch buffer names
may cause branch naming conflicts in merge() that are not detectable as branch buffer naming conflicts.
o RooParamBinning
- New class implementing binning with low and high points defined by external RooAbsReal objects
o RooConstrainSum
- Helper class for RooAbsPdf to represent likelihood of collection of constraint p.d.f.s.
==== Date: Fri Mar 28 10:04:57 2008 =====
o RooRecursiveFraction
- Helper function for RooAddPdf that calculates recursive fraction
f1*(1-f2)*(1-f3) from a given set of plain fractions
o RooAddPdf
- Add flag to ctor to optionally interpret fractions as recursive fractions.
If activated it constructs the recursive fractions using RooRecursiveFraction
from the original fractions
o LinkDef3.h, Module.mk
- Add new class RooRecursiveFraction
==== Date: Tue Apr 1 22:42:19 2008 ====
o RooDataWeightedAverage
- New implementation of RooAbsOptTestStatistics that calculates data weighted
average of any RooAbsReal. This class serves as successor of RooDataProjBinding
that no longer complies with new optimization scheme.
o RooRealBinding
- Implement name() function for more useful error messaging in integration
o RooChi2Var,RooNLLVar
- Follow changes in base class
o RooAbsReal
- In plotOn() support binning flag in ProjWData(). Reimplement data-weighted projections
using new RooDataWeightedAverage class instead of RooDataProjBinding which does not
work with new generic function optimization scheme.
- Add support for NumCPU() argument
in plotOn() to facilitate multi-processor calculation of projections. Extend NumCPU()
argument to pass interleaving option in MP splitting mode of RooAbsTestStatistic
- Move fixAddCoefNormalization() and fixAddCoefRange() from RooAbsPdf to RooAbsReal
o RooAbsTestStatistic
- Generalize functionality: allow RooAbsReals as input arguments instead of RooAbsPdfs only.
Also add virtual globalNormalization() function that allows to apply a global normalization
term after combinedValue() operation to facilitate functionality of RooDataWeightedAverage.
- Add option to split data in multiprocessor mode in interleave mode instead of in bulk mode.
Interleave mode is useful for parallel processing of histogram data where bulk partitions
may not contain equal amount of non-zero data points leading to non-optimal load balancing
between processes.
o RooAbsPdf
- Move fixAddCoefRange() and fixAddCoefNormalization to RooAbsReal to support operation of
new generalized RooAbsTestStatistic
o RooIntegrator1D
- Use name() of RooAbsFunc() to clarify warning and error messages.
o RooRealIntegral
- Rename _operMode to _intOperMode to avoid shadowing of equally named data member in RooAbsArg
- Fix bug in recursive printing
o RooSetProxy
- Fix bug in print()
o RooGlobalFunc
- Modify ProjWData() and NumCPU() helper functions with extra optional argument
o RooAbsOptTestStatistic
- Follow changes in RooAbsTestStatistic
o RooAbsFunc
- Add virtual name() function to facilitate better error and warning messages from integrators
=== Date: Tue Apr 15 17:57:32 2008 ===
o RooMsgService
- Add option to prefix streamed messages with process ID to simplify
debugging of parallel fits
o RooAbsProxy
- Add optional addContents flag to print()
o RooArgProxy, RooSetProxy, RooListProxy
- Implement addContents flag in print()
o RooAbsReal
- Reimplement stack of logged error messages in terms of custom EvalError class.
A separate list<EvalError> is now kept for each object that reports an error.
In addition to the given error message a record is constructed of the proxy
values at the time of reporting.
- In printEvalErrors() add option to restrict number of reported items per node.
If number is zero, only number of errors per node is shown (without details)
o RooRealMPFE
- Adjust ReportErrors message to changes EvalError implementation in RooAbsReal.
- Make sure to synchronize remote error logging state with state of parent process
before each evaluate()
o RooRealVar
- Move printing of error from printValue() to printExtras()
o RooNLLVar
- Fix bug in setting of interleave parameter of base class in certain ctors
o RooAbsPdf
- Improve passing of eval error messsages by make separate messages for NaN
and negative values and including details in the error message
- Add PrintEvalError(Int_t nErr) option to fitTo() to control new eval error
message control system
- Int printValue show both value (raw from evaluate()) as well as most recently
used normalization value (if available)
o RooMinuit
- Interface new eval error logging control by adding setPrintEvalErrors(Int_t numEvalErrors)
=== Date: Thu Apr 24 15:11:59 2008 ===
o Various classes
- Fix all -Wshadow compiler warnings
=== Date: Thu Apr 24 16:32:21 2008 ===
o RooMsgService
- Use TSystem::GetPid() rather than getpid() for portability
o RooAbsReal
- Make nested class EvalError public
o RooWorkspace
- Fix windows compiler warning
========================================
o RooBanner
- Increment version tag to 2.40
Revision
20988 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 22 14:54:13 2007 UTC (7 years, 2 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 28987 byte(s)
Diff to
previous 20879
** Bringing trunk up-to-date w.r.t recent changes in branches/dev/roofit branch **
Aggregated messages from branch commits follow
--- Date: Fri Oct 19 20:35:30 2007 New Revision: 20422 ---
o RooAbsArg
- Add debug level print statement in findConstantNodes()
o RooAbsAnaConvPdf
- Do not expose cached RooCoefVars to constant term finding process.
--- Date: Fri Oct 19 21:03:40 2007 New Revision: 20423 ---
o RooPlot
- Add forwarding function for all revent Set*() methods of TH1
--- Date: Fri Oct 19 21:48:40 2007 New Revision: 20424 ---
o RooAbsAnaConvPdf
- Back out special handling of exposure of cached RooCoefVars
to constant term finding process.
o RooObjCacheManager
- Do not perform constant term finding on cache contents
if cache manager is configured to perform clearOnRedirect
for server redirects.
--- Date: Wed Oct 31 23:36:10 2007 New Revision: 20587 ---
o RooAbsRealLValue
- Remove stray debug print statements
o RooAddPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Add forgotten initializer to regular ctor
o RooAbsCachedPdf
- Add formal server-link dependency on cache parameters to
RooHistPdf cache representation so that the constant term
optimizer can make the correct decision
- Make RooObjCacheManager a persistent data member
o RooObjCacheManager
- Add debug message level information
- Make _optCacheObservables a transient data member and initialize
it in the default ctor.
o RooAbsPdf, RooProjectedPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Make RooObjCacheManager a persistent data member
o RooAbsArg
- Add methods graphVizTree() that produce input files
for AT&Ts graphViz to make graphical representation
of object tree. (To make actual graphics run 'dot -Tps -o graph.ps %s'
where %s is argument passed to graphVizTree().
o RooSetProxy
- Remove stray debug print statements
o RooSimultaneous
- Initialize forgotten data member in all ctors
o RooProdPdf, RooAbsAnaConvPdf
- Make RooObjCacheManager a persistent data member
o RooSuperCategory
- Make contained iterator a transient data member
and initialize it in the default ctor.
o RooCacheManager
- Add explicit separate default ctor.
o RooAddModel
- Completely new implementation, based on existing RooAddPdf.
RooResolutionModel functionality (convolution(),basisCode())
taken from original RooAddModel. Reimplement integration strategy
with caching of integral objects, rather than implementing
only common analytical component
o RooAbsAnaConvPdf,RooResolutionModel,RooAbsPdf
- Remove special hook function that were required for functioning
of original RooAddModel
o RooObjCacheManager
- Keep all _optCacheObservables versions created alive in separate owned list
and only delete at end in dtor to avoid dangling pointer in complex
optimizations
o RooAbsArg
- In optimizeCacheMode() ignore nodes that already have been const optimized.
Although const optimization normally happens first, late cache optimization
that happen upon late creation of objects can take place after const optimization.
--- Date: Tue Nov 13 12:04:55 2007 New Revision: 20774 ---
o RooAddModel
- Completely new implementation, based on existing RooAddPdf.
RooResolutionModel functionality (convolution(),basisCode())
taken from original RooAddModel. Reimplement integration strategy
with caching of integral objects, rather than implementing
only common analytical component
o RooAbsAnaConvPdf,RooResolutionModel,RooAbsPdf
- Remove special hook function that were required for functioning
of original RooAddModel
o RooObjCacheManager
- Keep all _optCacheObservables versions created alive in separate owned list
and only delete at end in dtor to avoid dangling pointer in complex
optimizations
o RooAbsArg
- In optimizeCacheMode() ignore nodes that already have been const optimized.
Although const optimization normally happens first, late cache optimization
that happen upon late creation of objects can take place after const optimization.
o RooMsgService
- Some restructuring to speed up code.
- Change topic naming from string to enum.
- Change debug-level print macros to take inline pre-decision
based on static RooMsgService boolean that indicates if any debug
stream is active. Also extend this speedup to doLogD() macro.
- Allow multiple Topic specifications in a single stream using bit-wise
or to reduce default number of streams from 6 to 2.
- Terminate matching logic to streams early for 'universal' streams
for which the logic does not depend on object properties.
o RooGlobalFunc
- Change Topic() argument from RooMsgService::MsgTopic to Int_t to allow specification
of multiple topics
o RooDataHist, RooMsgService, RooGenContext, RooAddModel, RooFFTConvPdf
RooAbsAnaConvPdf, RooAbsReal, RooAddPdf, RooAbsOptGoodnessOfFit, RooAbsCachedPdf
RooProfileLL, RooObjCacheManager, RooAbsArg, RooAbsPdf, RooRealIntegral
RooAddGenContext, RooProdGenContext, RooConvGenContext, RooProjectedPdf, RooClassFactory
RooWorkspace, RooTreeData
- Follow change in RooMsgService interface
--- Date: Tue Nov 13 13:13:05 2007 New Revision: 20776 ---
o RooMCStudy
- Initialize _genParams in 2nd ctor (fixes savannah #31139)
--- Date: Fri Nov 16 21:24:52 2007 New Revision: 20853 ---
o RooProdPdf, RooAddition
- Fix memory leaks found with valgrind
o RooMsgService, RooRealConstant, RooNumIntFactory, RooMinuit, RooNameReg, RooNumIntConfig, RooArgSet
- Add cleanup() function to delete singleton at exit
o RooMinuit
- Initialize _warnLevel data member (valgrind)
o RooAddModel
- Disable coefficient projections in convolution mode
(savannah #31302)
o RooTrace
- Remove messages about objects already deleted when not in verbose mode
o RooSentinel
- New class handling cleanup at exit
--- Date: Mon Nov 19 16:41:52 2007 New Revision: 20901 ---
o Makefile
- Makefile to build stressRooFit
o Makefile.arch
- Stolen from $ROOTSYS/test
o stressRooFit
- Driver framework, base class of unit tests and
automatic plot, curve, fit result comparison tools
that unit tests can request
o TestBasic1
- Basic test running fitting, generation and plotting on Gaussian p.d.f
--- Date: Wed Nov 21 17:58:28 2007 New Revision: 20965 ---
o stressRooFit
- Add regression test support for Double_t values
and RooTables
- In post-test analysis mode, analyze count of
(silent) ERROR messages and fail test if they
occcur
- Eliminate memory leaks in testing framework
- Add arguments '-n <N>' to run single test and
argument '-mc' to run suite in memory checking
mode in which case no references files are opened
to avoid ROOT I/O related noise in valgrind leak reports.
- Link in 21 new tests
o TestBasic2 ... TestBasic22
- New stress testing modules. Modules 4,6,7,11,21 and 22
are empty for now. All others are fully functional.
--- Date: Thu Nov 22 14:32:14 2007 New Revision: 20980 ---
o test/TestBasic15, test/TestBasic16, test/TestBasic20
- Fix memory leak in test code itself
o test/stressRooFit
- Activate RooFit internal memory tracing when run in memory check mode
o RooDataHist
- Fix memory leak
o RooMsgService
- Add Tracing subject
- Fix bug in printing of multi-subject streams
- Keep track of total number of (silent) ERROR messages
- Add method to access contents of stream configurations
o RooIntegrator1D, RooIntegrator2D, RooSegmentedIntegrator1D, RooSegmentedIntegrator2D,
RooGaussKronrodIntegrator1D, RooAdaptiveGaussKronronIntegrator1D, RooMCIntegrator, RooGrid
- Fix default ctor to initialize all values used in dtor
o RooAddModel
- Add optional boolean to ctor to take ownership of components. Used
in RooAddModel::convolution()
- Fix memory leak in convolution()
o RooFitResult
- Migrations to RooMsgService
- Add isIdentical() method for use in regression testing
o RooCurve, RooHist
- Add isIdentical() method for use in regression testing
o Roo1DTable
- Make persistable
- Add isIdentical() method for use in regression testing
o RooMath
- Migrations to RooMsgService
- Register static memory allocation of CERF lookup table in RooSentinel
for cleanup in atexit().
o RooAbsReal
- Migrations to RooMsgService
- Fix invalid read access due to wrong destructor order in plotAsymOn()
- Fix memory leak in plotOn()
o RooAbsCollection
- Restrict creation of hash tables to deep-copy operations
or shallow copy operations of lists with >30 elements
o RooAddPdf, RooRealVar, RooDataProjBinding, RooFormulaVar, RooTreeData
- Migrations to RooMsgService
o RooAbsOptGoodnessOfFit
- Fix memory leak
o RooAbsPdf
- Migrations to RooMsgService
- Fix memory leak in fitTo()
o RooNumIntFactory
- Delete all owned prototype integrators in dtor
o RooBinning
- Fix ctors to always initialize _xlo and _xhi
o RooResolutioModel
- Register static identity RooFormulaVar with RooSentinel
for cleanup in atexit()
o RooSimPdfBuilder
- Migrations to RooMsgService
- Delete all fitCats and RooSimultaneous instances created
by builder in dtor
- Return non-const top-level p.d.f. from buildPdf()
o RooLinkedList
- First delete hash tables, then clear list instead of
reverse order to avoid invalid read problems with TList
o RooMinuit
- Migrations to RooMsgService
- Initialize MINUIT print levels to -1 if RooMsgService
is operating in silent mode
- Trim initial error on parameters if param +/- 2*errors
is out of param range
o RooSentinel
- Add cleanup hooks from RooMath and RooResolutionModel
o RooSimultaneous
- Fix memory leak
- Migrations to RooMsgService
o RooProjectedPdf
- Implement RooProjectedPdf::CacheElem dtor
o RooTable
- Add pure virtual isIdentical() interface
Revision
20408 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 19 12:18:09 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 29015 byte(s)
Diff to
previous 20345
o RooAbsRealLValue
- Remove stray debug print statements
o RooAddPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Add forgotten initializer to regular ctor
o RooAbsCachedPdf
- Add formal server-link dependency on cache parameters to
RooHistPdf cache representation so that the constant term
optimizer can make the correct decision
- Make RooObjCacheManager a persistent data member
o RooObjCacheManager
- Add debug message level information
- Make _optCacheObservables a transient data member and initialize
it in the default ctor.
o RooAbsPdf, RooProjectedPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Make RooObjCacheManager a persistent data member
o RooAbsArg
- Add methods graphVizTree() that produce input files
for AT&Ts graphViz to make graphical representation
of object tree. (To make actual graphics run 'dot -Tps -o graph.ps %s'
where %s is argument passed to graphVizTree().
o RooSetProxy
- Remove stray debug print statements
o RooSimultaneous
- Initialize forgotten data member in all ctors
o RooProdPdf, RooAbsAnaConvPdf
- Make RooObjCacheManager a persistent data member
o RooSuperCategory
- Make contained iterator a transient data member
and initialize it in the default ctor.
o RooCacheManager
- Add explicit separate default ctor.
Revision
20161 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 29015 byte(s)
Diff to
previous 19826
o RooAbsCache
- New abstract base class for cache objects associated with RooAbsArgs.
Caches register themselves with the owning RooAbsArg and propagate
all necessary state changes and meta information to objects in the cache
o RooCacheManager
- Concrete template implementation of RooAbsCache with an interface
and functionality styled after RooNormListManager. The template class
provide no special handling for cache contents that includes RooAbsArg
objects and does not forward hook calls. It is thus mostly intended
to cache basic types indexed on a normalization/integration configuration
o RooObjCacheManager
- Class derived from RooCacheManager<RooAbsCacheElement> that implements
all proper call forwarding and handling of state and other meta information
to RooAbsArg objects embedded in the cache elements. To facilitate this
functionality the RooAbsCacheElement defines a pure virtual method
containedArgs() that must be implemented to expose its contents to
the cache manager. The default behavior on a serverRedirect hook is
to sterilize the cache. OperMode changes are not forwarded by default
to the cache contents as cached objects do not necessarily have the
same operation mode (e.g. if the cache contains an integral of its owner).
Any calls to optimizeCacheMode(), printCompactTreeHook(), and findConstantNodes()
are forwarded. Moreover, optimizeCacheMode() calls are remembered and
any objects inserted in the cache after such a call was received will be
optimized upon insertion in the cache
o RooAbsCacheElement
- Abstract base class for objects to be managed by RooObjCacheManager. Each
object must in addition to its payload implement the containedArgs()
member function that exposes the RooAbsArg object content to the manager
for processing. The argument passed to containedArgs() indicates the use
case for the returned list of objects, allowing the cache payload to
return different lists depending upon use. This is for most applications
not required.
o RooAbsCachedPdf
- Abstract base class derived from RooAbsPdf for p.d.f.s that implement
value caching in a grid over the entire domain of the observables.
The base class implements the overall caching logistics and manages
the RooDataHists and RooHistPdfs that respresent the cached contents.
Derived classes must inputBaseName() defined a unique name prefix for
all cache objects, actualObservales() and actualParameters() to
determined the actual observables and parameters given a set of
available observables and fillCacheObject() which should fill the
RooDataHist cache for a given obs/params configuration with the
p.d.fs values.
o RooAbsSelfCachedPdf
- Abstract base class derived from RooAbsCachedPdf that implements
all of the required logistics in RooCachedPdf and only require
derived classes from RooAbsSelfCachedPdf to implement evaluate().
Any class derived from RooAbsPdf can thus be trivially switched
to derived from RooAbsSelfCachedPdf and gain the caching functionality.
o RooCachedPdf
- Concrete class derived from RooAbsCachedPdf that implements
the caching of an externally provided p.d.f in the constructor.
o RooFFTConvPdf
- Concrete class derived from RooAbsCachedPdf that implement generic
numeric convolution of two input p.d.f.s using FFT technique
and convolution theorem. Actual FFTs are calculated by FFTW
through TVirtualFFT interface in ROOT. Present implementation only supports
convolution in one dimension, but this will be extended later
as there are no fundamental limitations in RooAbsCachedPdf nor FFTW.
o RooHistPdf
- Moved from RooFit to RooFitCore because it is used by caching classes
o RooProdPdf
- Use new RooObjCacheManager to store partial objects
- Fix memory leak (already patched in 15.0.14h)
o RooDataHist
- Use new RooCacheManager template to cache partial bin volumes
- Add new set(),setAllWeights() method to update current weight and all weights
respectively, for use in cached p.d.f.s
- Add sliceIterator() that iterates over all bins in a lower dimensional
slice of the dataset
o RooDataHistSliceIter
- Class derived from TIterator that implements the iteration
over a slice in a reduced number of dimensions in a RooDataHist
o RooMsgService
- Speed up processing of debug streams in cases where no debug streams are active
- add macros series oocoutX and oocxcoutX that allow to associate message with
a different object than *this
o RooRealBinding
- Interface new setValue method that allows value to be set outside default
domain, but inside given alternate named range. For use in numeric integrator
bindings
o RooAbsRealLValue
- Add new inRange() method with range name specifier to check against chosen
range instead of default range
o RooCmdConfig
- Fix dangling return pointer problem in decodeStringOnTheFly() method
o RooNameSet
- Fix bug in refoll()
o RooChi2Var, RooNLLVar
- Add processing of AddCoefRange() named argument
o RooConvCoefVar
- Hold p.d.f in proxy without value/shape state propagation to obtain
correct dependency of RooConvCoefVar through separate set proxy
with parameters that do have state propagation
- In getAnalyticalIntegral() ask for integration coefficient specific
to coefficient (following interface change in RooAbsAnaConv)
o RooEfficiency
- Follow interface change in RooCategoryProxy
o RooAbsAnaConvPdf
- Use new RooObjCacheManager to hold normalization and coefficient representations
- Extend getCoefAnalyticalIntegral() interface so that each coefficient
can have a separate integration configuration
- Modify makeCoefVars() such that it constructs the RooConvCoefVars with
actual dependents for each coefficients, rather than inserting dependencies
of any of the coefficients in each coefficient. This logic requires support
from the implementation class that is interface through a new member function
coefVars()
o RooAbsReal
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Remove superfluous _norm[] token in name returned by integralNameSuffix() if
no normalization set is supplied.
- Add a fillDataHist() method that fills a given RooDataHist with a sampling
of the given function. Added for support of caching p.d.f.s
- Downgrading warning on non-dependent projection variables in plotOn() to
a debug level message
- Remove function optimizeDirty(),doConstOpt(),undoConstOpt(),findCacheableBranches()
findUnusedDatasetVariables() and findRedundantCacheServers() as part of reorganization
of optimization functionality.
o RooAbsCollection
- Use iterator semantics instead of vector semantics to process RooLinkedList
contents in assignment operator
- Add utility function contentsString() returning stl string with names
of contents
o RooAddPdf
- Rewrite cache management using new RooObjCacheManager that holds projection
integrals, range integrals and supplemental normalization lists
o RooAbsOptGoodnessOfFit
- Improve handling of normalization ranges and reference ranges for test statistics
containing RooAddPdfs. New named argument in fitTo() and RooNllVar::ctor() pass
reference range for fractions in RooAddPdf components that do not have an explicit
fixed definition already. Name all normalization ranges explicitly after the
subrange to which the're applied to avoid name clashes and conflicts if multiple
normalization ranges are involved.
- Rewrite informational messages through RooMsgService
- Implement new constOptimizeTestStatistic() function that signals all test statistic
components of a RooAbsArg expression tree to perform their constant term optimization
- Implement new optimizeCaching() driver function that changes default lazy-evaluation-with-caching
scheme to test statistic scheme where only parameters objects propagate state changes and
where all components that depend directly or indirectly on observables have lazy evaluation
disabled. Changes to p.d.f objects are delegated to RooAbsPdf::optimizeCacheMode(). Changes
to dataset are delegated to RooAbsData::optimizeReadingWithCaching()
- Implement new optimizeConstantTerms() function that is back end for constOptimizeTestStatistic
implementation.
o RooAICRegistry, RooNormSetCache
- Remove tracking of allocation cycles of RooArgSets as this scheme is superseded by
memory pool mechanism for RooArgSet allocation
o RooMappedCategory
- Follow interface change in RooCategoryProxy.
o RooRealMPFE
- Follow reorganization of optimization functionality: implement new constOptimizeTestStatistic
function for forwarding to slave processes.
o RooRealVar
- Add new setVal() function with range name to facilite setting of values that are outside
default range, but inside specified alternate range. Needed for numeric integration and
certain RooAddPdf coefficient projection.
o RooAbsArg
- Make state management functions public [is/set][Value/ShapeDirty](), setOperMode90
- Add static _flipAClean boolean to support setACleanAdirty() static method.
- Implement mechanism for registration of cache objects with base class RooAbsCache.
Forward all calls to operModeHook(), redirectServersHook(), optimizeCacheMode()
and printCompactTreeHook() to all caches for further processing
- Define constOptimize() function and provide default implementation that forwards
to all servers
- Implement optimizeCacheMode() function that puts expression tree in optimized
caching for test-statistics operations (only cache/lazy evaluate nodes that
do not (indirectly) depend on observables
- Implement findConstantNodes() function that identifies all nodes that depend
exclusively on constant observables and >0 observables that are eligible
for precalculation and caching in test statistics operations by
RooAbsOptTestStatistic::optimizeConstantTerms()
- Define constOptimizeTestStatistics that signal an expression tree that any
embedded test statistic objects should perform their constant term optimization.
Default implementation in RooAbsArg forwards call to all servers.
o RooAbsPdf
- Use new RooObjCacheManager to manage normalization integrals cache.
- Process new SumCoefRange() option in fitTo() that sets the coeffient
interpretation range for all embedded RooAddPdf objects of which
the interpretation range was not explicitly set
- Extend interface of fixAddCoefNormalizationSet(): add extra argument
that controls if AddCoef normalization set are forcibly overruled
for objects that already have an explicit range setting.
o RooRealIntegral
- Add some informational messaging through RooMsgService, rewrite existing ones
- Speed up numeric summations by precreating the involved RooSuperCategory
in the ctor rather than in evaluate().
- Fix bug in dependency insertion: explicitly require servers to be value
server to avoid pulling in fake dependents.
- Remove obsolete data members
- Implement new setACleanADirty() function that atomically flips state of
all AClean objects to ADirty for the duration of the integration step.
Replaces the much more expensive prepareACleanFunc() that did this
only for the objects involved.
- Process factorizing terms in integral only if the list is not empty
- Process Jacobian terms in integral only if the list is not empty
o RooAddGenContext
- Adapt to cache management chanches in RooAddPdf
o RooNumIntFactory
- Use STL classes for internal memory management
o RooSetProxyy
- Implement operator new() and operator() delete as required because
RooArgSet implements them
o RooAbsGoodnessOfFit
- Store and forward AddCoefRange information for embedded RooAddPdf objects
- Implement constOptimizeTestStatistic() and forward to components
o RooErrorVar
- Follow inRange() interface change in RooAbsRealLValue
o RooConvGenContext
- Adapt code to make it work with both RooAbsAnaConv objects and
the newly introduced RooFFTConvPdf
o RooMinuit
- Follow reorganization of optimization functionality
o RooProjectedPdf
- Store projection using new RooObjCacheManager
o RooGlobalFunc
- Add RooFit::SumCoefRange() named argument for RooAbsPdf::fitTo()
and RooNLLVar::ctor() and RooChi2Var::ctor()
o RooClassFactory
- Extend existing makePdf(),makeFunction and makeClass() functions
to also accept RooAbsCategory arguments, to accept an optional string
inserted as the return value expression inserted in the
evaluate() method of the class created, as well as as option string
specifying one or more analytical integrations of the given function
expression that will be advertised in the generated getAnalyticalIntegral()
code and implemented in the generated analyticalIntegral() code
- Add makeAndCompileFunction() and makeAndCompilePdf methods that
generate the code and immediate compile it through ROOTs ACliC interface.
These functions have a simpler interface because the list of arguments
of the function to be created can be specified as a const RooArgSet&
rather than a string with a list of names, thus making it easier
for on-the-fly definition of compiled objects.
- Add defineFunction() and definePdf() methods define and compile
a function/pdf using the above functions and immediately instantiate
an object of the given type passing the specified RooArgSet arguments
to the constructor of the object. These functions make a compiled
equivalent of RooFormulaVar based on the TFormula interpreter, i.e.
RooAbsReal* f = new RooFormulaVar("f","D(1-2w)",RooArgSet(D,w)) ;
becomes
RooAbsReal* f = RooClassFactory::defineFunction("f","D(1-2w)",RooArgSet(D,w)) ;
o RooAbsCategory
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Construct explit clean name for TBranch name if node is cached, equivalent
to what is done in RooAbsReal. Needed because new constOptimizer can also
cache RooAbsCategory objects
o RooArgSet
- Implement operator new() and operator delete() to implement memory pool scheme
for RooArgSets. The goal of this implementation is to insure that two RooArgSet
pointers are _never_ the same. This allows to RooNormSet cache manager to safely
and quickly index integration and normalization configurations by evaluating
the contents of a RooArgSet only the first time it sees it.
o RooSimultaneous
- Implement caching of partial integrals using new RooObjCacheManager
- Following interface change in RooCategoryProxy ;
o RooAbsData
- Defined pure virtual methods optimizeReadingWithCache() and allClientsCached()
o RooTreeData
- Implement optimizeReadingWithCache() which determines given a p.d.f to be
evaluated and a list of the nodes that are cached for it, which observables
in the dataset are no longer required because they are either not an observable
of the p.d.f, or they exclusively feed nodes that are cached. Reading of these
observables is disabled through SetBranchStatus().
- Move allClientsCached() utility function here from RooAbsReal.
o RooCategoryProxy
- Remove const char*() conversion operator in favor of a const char* label() method
to remove possibly ambiguities in C++ math expressions involving category proxies.
o LinkDef3.h
- Add newly defined classes
Revision
12169 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 23 15:08:57 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26865 byte(s)
Diff to
previous 12082
o RooAbsArg
- Migrate RooAbsCategoryLValue::hasRange() pure virtual func to here
o RooAbsCategoryLValue
- Remove pure virtual function declarations hasRange() and inRange()
o RooAbsRealLValue
- Add hasRange() which forwards to hasBinning()
o RooCategory, RooSuperCategory
- Rename isInRange() to inRange()
- Fix copying of ranges in ctor of RooCategory
o RooRealIntegral
- Follow name change isInRange() to inRange()
o RooBanner, make_roofit_installkit
- Increment version number to v2.04
Revision
12082 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 20 15:45:21 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26867 byte(s)
Diff to
previous 12063
o RooBanner
- Update version number and copyright
o Many files
- Change <iostream> to "Riostream" to support compilation on platforms
that do not have iostream classes in namespace std
o RooAbsAnaConvPdf
- Fix bug in range integration in getAnalyticalIntegralWN()
- Change getCoefAnalyticalIntegral() signature to include rangeName in argument list
o RooAbsArg
- Add methods getObservables()/getParameters with const RooAbsData& argument
o RooAbsPdf
- Add support for Range(Double_t, Double_t) to specify fit range in fitTo()
- Migrate getMaxVal()/maxVal() to RooAbsReal [Gerhard]
- Fix bug in normalization of PDF projections over limited range: account for both
fraction of data in range and fraction of projection in range (calculation of latter
deferred to RooAbsReal::plotOn)
o RooAbsReal
- Migrate getMaxVal()/maxVal() from RooAbsReal [Gerhard]
- Add code in plotOn() to support normalization of PDF projections plotted in limited range
o RooAbsRealLValue, RooRealVar, RooErrorVar, RooLinearVar
- Change getBinning() so that it only creates a new binning on the fly if a newly added boolean argument
is true. Otherwise, return default binning
o RooAdaptiveGaussKronrodIntegrator1D, RooGaussKronrodIntegrator1D
- Declare prototypes for glue functions
o RooArgSet
- Fix readFromStream() and writeToStream() so that they are consistent with each other again for
both regular and scientific notation mode.
- Fix processing of include directives inside files in readFromFile()
- Suppress warning messages about ignored lines in files unless verbose flag is set. Add verbosity control
flag to readFromFile().
o RooCategory
- Support concept of ranges for categories as well through new member functions setRange(),addToRange(),
clearRange(),hasRange(),isInRange() and isStateInRange(). Ranges are named TLists containing a non-owned
subset of the possible RooCatTypes.
o RooCategoryProxy
- Make lvptr() const since it is.
o RooConvCoefVar
- Pass rangeName in getAnalyticalIntegral() to getCoefAnalyticalIntegral()
o RooPlotable, RooCurve, RooHist, RooEllipse
- Implement getFitRangeNEvt(Double_t, Double_t) that returns the number of events in the given sub-range.
o RooDataHist
- Fix bug using RooAbsData::plotOn --> using RooTreeData::plotOn
o RooGlobalFunc
- Add adjustNorm boolean argument to named argumentss Range()
o RooMultiCatIter
- Require that input is RooAbsCategoryLValue rather than RooAbsCategory.
o RooPlot
- Keep track of object that generated normalization event count in addition to event count itself.
This allows to later on calculate an event count in a limited range through getFitRangeNEvt(Double_t, Double_t)
o RooRealIntegral
- Support ranges in category summation in integration code.
o RooSimPdfBuilder
- Fix bug in unitarity constraint split of parameter in partial build: adjust formula for remainder fraction
so that it only uses the states that are actually built.
- Improve error handling
o RooSuperCategory
- Implement hasRange() and isInRange() functionality inherited from RooAbsRealLValue
o RooClassFactory
- New class that automatically generates code for PDFs and functions given a name and a list of argument names
o RooEffProd
- New class that implement product of PDF and efficiency function. Main feature is efficient implementation
of event generator in case input PDF has 'smart' event generator
o RooEffGenContext
- Generator context associated with RooEffProd
o Module.mk
- ROOT make file module needed to compile RooFit as part of ROOT
o make_roofit_installkit
- Script to package RooFit source as ROOT module for compilation with ROOT system
Revision
12063 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 16 09:31:32 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26838 byte(s)
Diff to
previous 11619
o RooFit.hh
- New global header file for compiler patches. Currently contains
single patch for SunOS imported from BaBar.hh
o All .cc files
- Include RooFit.hh as first header file
o RooAbsData
- Make all plotOn() methods public
o RooAbsProxy
- Include pragma to switch of VC++ warning C4355
"'this' : used in base member initializer list'"
which would otherwise be triggered on each proxy initialization.
(each proxy constructor _expects_ a base class ptr so the warning
is misleading)
o RooAdaptiveGaussKronrodIntegrator1D, RooDataHist, RooGaussKronrodIntegrator1D,
RooGraphSpring, RooMCIntegrator, RooPolyVar, RooTreeData
- Change pow --> TMath::power() to eliminate windows compiler warnings
o RooEllipse
- Change constant M_PI to TMath::Pi()
o RooGlobalFunc
- Change RooConst --> RooFit::RooConst as functions has been moved into namespace
o RooMath
- Add erf() and erfc() forwarder functions to TMath::Erf() and TMath::Erfc()
o RooRealConstant
- Move RooConst() function into namespace RooFit
o RooSimultaneous
- Remove one default parameter from implementation version of plotOn() to resolve
overloading ambiguity reported by AIX compiler
o RooTreeData
- Make nested struct PlotOpt public to avoid CINT access problems
o RooTruthModel
- Add explicit cast to fabs() of proxy as it gives warning in Windows C++
Revision
11172 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 23 15:10:06 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26715 byte(s)
Diff to
previous 11114
o All classes
- Migrate RooAbsArg::getDependents(),dependentOverlaps(),checkDependents(),recursiveCheckDependents() to
getObservables(),observableOverlaps(),checkObservables(),recursiveCheckObservables()
o RooAbsAnaConv
- Copy _convVar in copy ctor so that isDirectGenSafe() also works for copy constructed instances.
Use _isCopy instead of _convVar in declareBasis() to distinguish between original and copy constructed objects
o RooAbsArg
- Migrate RooAbsArg::getDependents(),dependentOverlaps(),checkDependents(),recursiveCheckDependents() to
getObservables(),observableOverlaps(),checkObservables(),recursiveCheckObservables(). Add old names
as forwarding functions to new names for backward compatibility
- Move cleanBranchName() and crc32() here from RooAbsReal
o RooAbsCollection
- Implement new InLine printing options as OneLine option without the newline at the end
- Upgrade printLatex() function to also take new Format() arguments with sub arguments
- Add Bool_t allInRange(const char* range) function that reports if all contained arguments
have values within the specified range
o RooAbsData
- Add plotOn() function that takes a RooLinkedList of RooCmdArgs
- Extend Double_t sumEntries() to take a cutSpec and a rangeSpec argument. If supplied
only the combined weight of entries meeting those criteria will be reported.
o RooAbsGoodnessOfFit
- Add verbose flag to constructor and make printing of informational messages conditional
to verbose flag being set
o RooAbsOptGoodnessOfFit
- Add verbose flag to constructor and make printing of informational messages conditional
to verbose flag being set
o RooAbsPdf
- Add fitTo() function that takes a RooLinkedList of RooCmdArgs
- Add support for Range(), PrintLevel() arguments in fitTo(). Support fitting composite
ranges by constructing composite NLLs using RooAddition.
- Implement named argument version of generate() supporting arguments ProtoData(), Extended(), Verbose() and NumEvents().
Copy support for protodata randomization for extended poisson over/under sampling from RooMCStudy
- Add named argument version of paramOn() supporting named arguments Label(),Layout(),ShowConstants(),Format(),Parameters().
This version also does not require an input data set to weed out observables: the normalization set from the frame is
used instead.
o RooAbsReal
- Add named argument version of createIntegral() function taking NumIntConfig(),NormSet() and Range() arguments.
Supports composite ranges through multiple Range() arguments
- Move algorithm to automatically generate name of integral in a given configuration to separate function integralNameSuffix()
- In plotOn() retire RangeWithVLine() named argument in favor of a separate VLines() argument.
- Move cleanBranchName(), crc32() functions to RooAbsArg
- Add verbose arguments to findCacheableBranches(),doConstOpt(),optimizeDirty(),findRedundantCacheServers() and findUnusedDataVariables()
and make printing of informational messages conditional on verbose flag being set.
o RooAbsRealLValue
- Add version of frame() accepting a RooLinkedList of RooCmdArgs. Add support for AutoRange(const RooAbsData&) and AutoSymRange(const RooAbsData&)
arguments that automatically calculate range that holds all points in given dataset with a specified margin. The latter function guarantees
a range symmetric around the mean of the distribution, unless domain limits of variable prohibit that.
- Add named argument version of createHistogram() taking Binning(), YVar() and ZVar() arguments where latter two arguments also take
optional Binning arguments
o RooChi2Var, RooNLLVar
- Add support for optional Verbose() argument in named argument constructor and pass flag to RooAbsOptGoodnessOfFit
o RooCmdArg
- Implement and interface linked list of sub-arguments. Add flag that controls if RooCmdConfig directly processes subarguments ot not.
- Implement assignment operator
o RooCmdConfig
- Add defineMutex() functions with 3, 4 arguments to facilitate definitions of many-way mutexes
- Add appendMode boolean to defineString(). If set, multiple instances of given string will be concatenated with
comma separattion, instead of multiple instances superceding each other.
- Add static function decodeStringOnTheFly()
o RooDataHist, RooDataSet
- Implement sumEntries() with cutSpec and rangeSpec arguments
o RooDataSet
- Add binnedClone() function
o RooFormula
- Add ifdef construction so that code compiles both with ROOT3 and with ROOT4
o RooGlobalFunc
- Move all global functions into namespace RooFit
o RooIntegrator1D
- Remove spurious debug print message
o RooMCStudy
- Add named argument constructor accepting arguments FitModel(),ConditionalObservables(),ProtoData(),Verbose(),Extended(),
FitOptions()
- Migrate function randomizeProtoOrder to RooAbsPdf
- Reimplement pull calculations using new class RooPullVar
- Add named argument function plotParamOn(). All named arguments are passed to RooAbsData::plotOn()
- Add named argument functions plotParam(),plotError(),plotPull(),plotNLL() taking arguments FrameRange(),
FrameBins(),Frame() and all arguments taken by RooAbsData::plotOn(). All sub arguments of Frame() are
passed to RooAbsRealLValue::frame(). Function plotNLL() takes additional argument FitGauss() that
adds Gaussian fit to plot. All methods default to AutoRange frames, except for plotPull() which
defaults to AutoSymRange()
o RooMinuit
- Suppress informational messages if printLevel is set to -1
o RooNumIntConfig
- Fix bug in printToStream() method
o RooPrintable
- Add InLine printing level. Implement default InLine method as OneLine method without the terminating newline character.
o RooProdPdf
- Reimplement makeRGGPName in terms of RooAbsReal::integralNameSuffix()
o RooRealIntegral
- Make RooAbsReal::getAnalyticalIntegral() return code supercede any information returned through anaSet to
avoid confusion.
o RooRealVar
- Add version of format() function that parses Format() named argument.
- Add setFitBins() function for backward compatibility.
o RooStreamParser
- Fix bug in putBackToken(): forgot to reinsert space to avoid collation with next token.
o RooTreeData
- Implement plotOn() function taking RooLinkedList of RooCmdArgs. Fix bug in determination
of default bin width if explicit binning is given. Add support for parsing of composite ranges.
- Add optional cutSpec and cutRange arguments to moment(),meanVar() and rmsVar() and rework
implementations to support this feature.
- Add named argument version of statOn() taking arguments Label(),Layout(),Format(),What(),Cut(),CutRange().
- Add getRange() function returning highest and lowest value of given variable in dataset.
o RooAddition
- New Utility class that inherits from RooAbsReal that represents a sum of RooAbsReal objects, or
a sum of products of RooAbsReal objects (when constructed with two RooArgLists). Can optionally
own components and is suitable for use with RooMinuit as it passes the errorLevel() definition
of its components
o RooPullVar
- New utility class that inherits fro RooAbsReal that calculates the pull of one RooRealVar
(with errors) w.r.t. another RooRealVar representing the truth value. If asymmetric errors
are defined in the former RRV those will be used for the pull calculation.
Revision
11114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Feb 14 20:44:30 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26551 byte(s)
Diff to
previous 10648
o RooNameReg
- Registry for unique string name IDs. Converts a 'const char*' string into
a unique 'const TNamed*' and back. General purpose utility to to map
string identifiers to unique 32-bit numbers
o RooAbsReal
- In getAnalyticalIntegral(WN) and analyticalIntegral(WN) add extra argument
const char* rangeName to identify range over which integration should
be performed
o All RooAbsReal derived classes
- Modify getAnalyticalIntegral(WN) and analyticalIntegral(WN) to follow
change in RooAbsReal. Pass rangeName argument to min() and max() functions
of RooRealProxy to retrieve requested range instead of default range
o RooAbsArg
- Add virtual inRange(const char* rangeName) member function.
o RooAbsCategoryLValue
- Name change get/setFitBin() --> get.setBin(), numFitBins() --> numBins()
getFitBinWidth --> getBinWidth
o RooAbsCollection
- Add printLatex() method for formatted LaTeX printing of lists.
Supports named arguments Columns() to change number of columns,
Format() to change printing format, OutputFile() for printing
directly to file and Sibling() to print along side on or more other lists.
o RooAbsData
- Sanitize plotOn() arrangement: just keep version with RooCmdArg arguments
- Add optional rangeName argument to fillHistogram
o RooAbsGenContext
- Pass normalization set to expectedEvents() to support calculation of
fractional intergrals in extended term (e.g. in RooExtendedPdf)
o RooAbsLValue
- Name change: setFitBin(),getFitBin(),numFitBins(),getFitBinWidth() -->
setBin(),getBin(),numBins(),getBinWidth()
o RooAbsOptGoodnessOfFit
- Follow name changes in RooAbs(Real)Lvalue
o RooAbsPdf
- Modernize syncNormalization by using createIntegral internally
- Add getNormObj() function that returns const RooRealIntegral*
pointer to specified normalization integral. Takes optional
rangeName argument for calculation of fractional integrals.
- Sanitize plotOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Change expectedEvents() and extendedTerm() function signature to
take normalization set argument that can be used to calculated
normalization-dependent fractional integrals (e.g. in RooExtendedPdf)
- Migrate named argument global helper functions for plotOn() to RooGlobalFunc.cc
o RooAbsReal
- Modify createIntegral() method to take optional rangeName argument.
- Sanitize plotOn() and plotAsymOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Migrate named argument global helper functions for plotOn() to RooGlobalFunc.cc
- Add Name() feature to plotOn() to give chosen name to resulting RooCurve
- Add ProjectionRange() feature to plotOn() -- Project PDF only over limited
range as specified by range name to show finite width slices
in projection dimensions
- Add Invisible() feature to plotOn() which stores curve invisibly in
RooPlot.
- Add AddTo() feature to plotOn() which adds curve to existing curve
in Rooplot.
o RooAbsRealValue
- Name change get/set/hasFitMin/Max() --> get/set/hasMin/Max() etc.
o RooAcceptReject
- Follow changes in RooAbsRealLValue
o All numeric integrator engines
- Add "#include RooArgSet.hh" to compensate for removal of stray include in RooCmdConfig.hh
o RooAddPdf
- Add feature to fix interpretation of fractional coefficients in particular reference range
that can be different from default range
o RooChi2Var
- Migrate named argument global helper functions for constructor to RooGlobalFunc.cc
o RooCmdConfig
- Modify defineObject() to also be able to process arrays of objects
- Add process() method with 8 RooCmdArg arguments
- Modify getString() so that it can optionally return an empty string as a null pointer
o RooConvGenContext,RooConvIntegrandBinding
- Follow name changes in RooAbsRealLValue
o RooCurve
- Add constructor that takes two existing curves and two weights. New curve is construction
for OR set of points that define both input curves. Points on one curve that do not exist
on the other are calculate using interpolation.
o RooDataHist, RooDataSet
- Sanitize plotOn() functions
- Follow name changes in RooAbsRealLValue
o RooErrorVar
- Follow name changes in RooAbsRealLValue
o RooExtendPdf
- Completely rewrite using newly introduced fractional integral technology. Change
constructor to take optional const char* rangeName argument to denote restricted
range for expectedEvents() interpretation.
o RooFitResult
- Follow name changes in RooAbsRealLValue
o RooFormula
- Add new interface to make it work with ROOT version 4 as well as ROOT version 3
o RooGenProdProj
- Make it work with optional restricted integration ranges as well
o RooHist
- Add constructor that constructs RooHist from two existing RooHists. Both input
RooHist must have identical structure. In Poisson mode error is recalculated for
total number of events in each bin. In SumW2 mode errors of input RooHists are
combined.
o RooMCStudy,RooMinuit,RooNLLVar
- Follow changes in RooAbsRealLValue and RooAbsPdf::expectedEvents().
o RooNormManager,RooNormListManager,RooNormSetCache
- Make managers aware of range names that are associated with integral definitions.
o RooPlot
- Add optional argument to addPlotable(),addObject(),addTH1() functions to add
given object invisibly.
- Modify updateFitRangeNorm() to optionally refresh the normalization event count
even if it has already been set
- Add getObject() method that identifies object by index rather than by name
- Add internal RooPlot::DrawOpt class that conversion ROOT draw options and
RooPlot options from and to a const char* string.
o RooProdPdf
- Make it work with integrals over restricted ranges
o RooRealAnalytic, RooRealBinding
- Take optional rangeName argument in constructor that modifies output
of getMin() and getMax() functions
o RooRealIntegral
- Take optional rangeName argument in constructor and pass it to analytical integrals
and numeric integrators.
o RooRealProxy
- Modify min() and max() functions to take optional rangeName argument
o RooRealVar
- Follow name changes in RooAbsRealLValue
- Implement getFit*() functions for backward compatibility.
- Augment format() with extra LaTeX formatting options used
in RooAbsCollection::printLatex()
o RooTObjWrap
- Modify so that it can also store lists of objects in addition to single objects
o RooTreeData
- Sanitize plotOn() and plotAsymOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Add Name() feature to plotOn() to give resulting RooHist chosen name
- Add XErrorSize() feature to plotOn() to explicitly control size of X error bars
- Add Invisible() feature to plotOn() to be able to store RooHist invisible to RooPlot
- Add AddTo() feature to plotOn() to be able to add RooHist to an existing RooHist
in RooPlot
- Add RefreshNorm() feature to plotOn() which causes normalization event count in RooPlot
to be refreshed with event count from this plot operation
- Add optional rangeName argument to fillHistogram()
o RooGlobalFunc
- Move all global helper functions that create RooCmdArg named arguments here
- Additionally create short-hand helper functions C(), L() and S() respectively
that create a RooConst, a RooArgList and a RooArgSet. These shorthand functions
are stored in namespace RooFitShortHand and thus not by default available
in the global namespace
Revision
10648 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 29 20:24:44 2004 UTC (10 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26177 byte(s)
Diff to
previous 10638
o All Classs
- Remove '#include BaBar/BaBar.hh' that was erroneously
introduced by the BaBar IOstream migration utilities
o Several class
- Initializion order changes, removal of unused variables,
addition of missing return statements to make all code
compile cleanly with '-Wall -Wno-parentheses'
o RooAbsFunc
- Make resetNumCall() const
o RooAbsIntegrator
- Add calculate() method that wrape integral() between
profiling code the track the number of integrand
function calls
o RooIntegrator1D,RooImproperIntegrator1D,RooSegmentedIntegrator1D,
RooSegmentedIntegrator2D,RooMCIntegrator
- Change interface to take RooNumIntConfig class instead
of now deprecated RooIntegratorConfig class
- Add member function that advertise capability of the integrator:
canIntegrate1D,2D,ND,OpenEnded()
o RooAbsReal
- Change normalization integral management classes
(createIntegral(), (set)defaultIntegratorConfig(),
(set)specialIntegratorConfig()) to work with new
RooNumIntConfig class.
o RooArgSet
- Add new convenience functions get/setRealValue(),
get/setCatLabel/Index(), get/setStringValue() to
manage common content of RooArgSet.
o RooConvCoefVar, RooConvGenContext
- Support class name change RooConvolutedPdf -> RooAbsAnaConfPdf
o RooCustomizer
- Add function setCloneBrancSet() that allows to specify
an external set that takes ownership of the cloned branch
nodes so that customized objects can live beyond the lifetime
of the RooCustomizer instance
o RooImproperIntegrator1D
- Add code to handle limit scenario changes (closed to open ended
and vice versa) on the fly
o RooIntegrator1D
- Add fixSteps option to terminate integral calculation after
fixed number of steps w/o extrapolation. This is more robust
for certain types of integrals
o RooRealIntegral
- Change interface to take RooNumIntConfig class instead of
RooIntegratorConfig class
- Delegate instantiation of numeric integration engines to
new class RooNumIntFactory
o RooNumIntConfig
- New class to store configuration of numeric integator engines.
This class has a brief common section with common properties
like absolute and relative precision convergence criteria,
and a section with implementation specific details for each
engine in the form of a RooArgSet. The default settings for
each existing engine are automatically added to the defaultConfig()
instance during run-time initialization
o RooNumIntFactory
- Factory class for numeric integration engines. Each existing
integrator engine automatically registers with the factory
stating its capabilities (1D,2D,ND / Open-ended). The
createIntegrator() function instantiates an integrator
appropriate for a given problem. In case more than one
integration engine can solve the given problem the (user
changable) information in the RooNumIntConfig passed along
with the call is used.
o RooGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,43, and 87 point rules in succession
until the desired accuracy is reached. Open-ended integrals are
automatically handled through a x -> 1/x coordinate transformation
o RooAdaptiveGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,31,41,51 or 61 point rule and
recursively subdivides the integration domain until the desired accuracy
is reached. For integrands with integrable singulaties the Wynn epsilon
rule can be selected to speed up the converges of these integrals. Open
ended integrals are automatically handles through a x -> 1/x
coordinate transformation
o RooNumConvPdf
- New operator PDF class that implements numeric convolution of
any two PDFs. The calculation of the convolution integrand
is implemented in the auxiliary class RooConvIntegrandBinding,
which in turn can be integrated with any 1-D numeric integration
engine. The default integration method for convolution integrals
is the adaptive Gauss-Kronrod method, which appears to give the
most stable results. By default the integration is performed
from -inf to +inf, but can optionally be restricted to a sliding
window using the setConvolutionWindow class, useful for relatively
narrow resolution PDFs.
o RooAbsAnaConvPdf
- New name of RooConvolutedPdf to clearly distinguish its functionality
from RooNumConvPdf
Revision
9370 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jul 2 07:39:04 2004 UTC (10 years, 6 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 27495 byte(s)
Diff to
previous 8538
This round of updates achieves two major goals
- Large (O(10-100)) speedup in handling of very
complex PDFS (>10000 nodes) by pervasive use
of self-expanding hash tables
- Fix outstanding problems with RooProdPdf
through new strategy to deal with cached
objects in cloning/server redirect operations
There is also a handful of minor fixes
------------------------------------------------
o RooSetPair
- New auxiliary class to store pair of RooArgSet pointers
o Roo1DTable
- Don't fill entries with zero weight
o RooAbsArg
- Add optional 2nd arg to printCompactTree() to store
output to file
o RooAbsCollection
- Initialize RooLinkedLists with hashing size threshold of 43
o RooAbsGoodnessOfFit, RooAbsOptGoodnessOfFit, RooProdPdf
- Follow changes in printCompactTree() syntax
o RooAbsOptGoodnessOfFit
- Remove all methods that implement dirty state optimization
and constant term caching (migration to RooAbsReal)
o RooAbsReal
- Various fixes in plotAsymOn fix plotting of asymmetries
in conjunction with ProjWData() and Slice()
- Add methods that implement dirty state optimization
and constant term caching (migration from RooAbsOptGoodnessOfFit)
o RooDataProjBinding
- Remove some old debug code
o RooHashTable
- New constructor option allow to choose hashing by name,
pointer or objects Hash() value
- Switch to using TMath::Hash() fast hashing method
using 'especially selected random numbers' (!)
- Add kludgy support for storage of RooLinkedListElem
and RooSetPair objects, which do not inherit from TObject.
(A full redesign of RooLinkedList and RooHashTable is needed
at some point)
o RooHist
- Fix print statement
o RooHistError
- Lower (n,m) threshold for calculation of approximate binomial
error to avoid factorial overflow problems.
o RooLinkedList
- Introduce automatically activated hashing by name and pointer
to speed up handling of long lists beyond size threshold
given in ctor (zero threshold disables this features)
- Automatically rehash tables when #entries becomes greater
than hash table size
o RooNameSet
- Sort contents upon insertion. This fixes broken operator==
for certain set comparisons
o RooNormListManager
- Add support for 'sterile' operation. If contents is sterilized
via new sterilize() member function or use of sterile copy
ctor RooNormSetCache information is retained (and thus
ordering and slot indeces used by client classes) but
stored contents associated with given iset/nset pairs
is deleted. A 'setNormList()' call that maps to a
sterilized slot will recycle that slot. Optional new argument
in getNormList will tell client that requested information
has been sterilized rather than not being there.
o RooNormSetCache
- Store set pair information in hash table of RooSetPair objects
rather than two fixed size arrays of RooArgSet pointers.
This greatly improves lookup speed (indexed by set pointers)
and automatically expands the capacity of the set cache
as is needed for very complex fits.
o RooProdPdf
- Abandon strategy to forward redirectServer requests to
cached product configurations. This strategy has turned
out to be flawed as insufficient information is available
in the redirectServers context to do the right thing
under all circumstances. Invocation of redirectServerHook()
will now sterilize the cache, using new RooNormListManager
feature
- Modify getAnalyticalIntegralWN(), which looks up cached
product configurations by index to recognize sterilized
entries. If such an entry is encountered, it is reconstituted
on the fly.
o RooRealIntegral
- Store owned clones of factorizing observables instead of linking
to instances provided in ctor as ownership related of those
turns out not to be well defined.
o RooRefCountedList
- Set hashing threshold of underlying RooLinkedList at 17
o RooSimPdfBuilder
- Increase buffer sizes of RooStringVars in set returned by
createProtoBuildConfig() to accomodate requests for ever
more complex pdf configurations.
Revision
8525 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 31 02:54:58 2004 UTC (10 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 27087 byte(s)
Diff to
previous 8523
o RooAbsArg
- In setOperMode() add new feature that propagates setting
of ADirty cache modes recursively to all value clients.
Feature is on by default
o RooRealIntegral
- in prepareACleanFunc modify call to setOperMode(ADirty)
to disable this new recursive propagation feature
Revision
6614 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 14 02:58:40 2003 UTC (11 years, 8 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26775 byte(s)
Diff to
previous 6604
o RooRealIntegral
- Interface segmented integrators (1D and 2D)
o All others
- Various fixes (mostly initialization orders in ctor,
unused variables) to achive clean complication
on Linux with '-Wall -Wno-parentheses'
o LICENSE
- Update copyright notice
Revision
6604 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon May 12 18:46:04 2003 UTC (11 years, 8 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26670 byte(s)
Diff to
previous 6572
o RooAbsPdf
- Move (normalization) integrator configuration to RooAbsReal
o RooAbsReal
- Move integrator configuration management from RooAbsPdf.
Extend functionality: configurations are now used for
all integrals, not only for normalization integrals.
Rename functions accordingly 'NormInt' --> 'Integrator'
o RooRealIntegral
- Use RooAbsReal::getIntegratorConfig() when no specific integrator
configuration is supplied in the ctor
o RooProdPdf
- Overload getVal() to save ptr actual nset that is passed to
getVal(). Evaluate() needs a 'live' nset to determine the
product factorization. The cached normalization set ptr
may be stale and can therefore not be used.
Revision
6572 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 7 21:06:25 2003 UTC (11 years, 8 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 26521 byte(s)
Diff to
previous 5909
Implementation of alternate 2D integration strategy
o RooAbsPdf
- Make interface for normalization integratator configuration
a bit easier to use
o RooAbsReal
- Add new forms of createIntegral() that can take a RooIntegratorConfig
as argument
o RooIntegrator1D
- Change code such that it can work with multi-dimensional functions.
The integrated dimension is always the first. The coordinates
in the remaining dimensions are optionally passed to integral()
o RooIntegrator1DBinding
- New RooAbsFunc binding for RooIntegrator1D
o RooIntegrator2D
- New 2D integrator derived from RooIntegrator1D. Instead of
integrating RooAbsFunc, integrate a 1-D integral of RooAbsFunc,
which is effectively becomes the 2D integral of the RooAbsFunc
o RooIntegratorConfig
- Add new flag useMCFor2D() to select integration technique
for 2D numeric integrals. MC integration is default to
retain backward compatibility.
o RooRealIntegral
- Implement optional use of new RooIntegrator2D class
o RooTreeData
- Small fix in fillHistogram() for weighted datasets.
Revision
5909 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 14 00:07:58 2003 UTC (12 years ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 25890 byte(s)
Diff to
previous 5674
o RooAbsArg & selected derived classes
- Extend redirectServersHook() argument list with one additional
boolean that indicates if the redirect is recursive
- Extend redirectServers() argument list with one additional
boolean indicating whether it is part of a recursive process
Pass recursion flag to redirectServersHook()
- In recursiveRedirectServers(), set recursion flag in calls
to redirectServers
o RooProdPdf
- In redirectServersHook(), only redirect servers on non-owning
product component lists in cache if recursion flag is set
Revision
5674 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 27 07:27:52 2002 UTC (12 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 25870 byte(s)
Diff to
previous 5534
o RooSimultaneous
- Logic fix for plotting asymmetries: do not adjust overall scale factor
when only plotting a subset of the components, as is done & needed
for regular plots
o RooTreeData
- Add forgotted frame->updateNormVars() to plotAsymOn()
o RooRealIntegral
- Speed up hybrid calculation by caching the branch node structure
of the integrated function for prepareCleanAFunc()
Revision
5534 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 4 22:35:34 2002 UTC (12 years, 2 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 25629 byte(s)
Diff to
previous 5360
o RooAbsData
- Bug fix: copy constructed now owns clone of _vars
- Bug fix: make (const char*) NULL and "" behave identically
in reduce()
o RooRealIntegral
- Bug fix: clear _restartNumIntEngine (set by redirectServersHook)
after engine has been restarted
- Print one time warning message is RooMCIntegrator is used
Revision
5360 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 30 00:57:29 2002 UTC (12 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 25372 byte(s)
Diff to
previous 5212
o RooAbsArg
- Add cyclical call protection to recursiveRedirectServers()
o RooAbsGoodnessOfFit
- Add missing return in evaluate()
o RooAbsPdf
- Implement redirectServersHook() to forward server redirection
to all cached normalization integrals
- Disable listing of indirectly selected components in plotCompOn()
(not that useful, and potentially very verbose)
o RooAddPdf
- Revert to version with single coefficient projection integral
(instead of ratio of integrals). Add supplemental normalization
term to coefficient projection integrals to handle projection
of RooAddPdfs where the set of dependents of the components
do not overlap (i.e. F(x,y) + G(y,z))
- Add operModeHook() and redirectServersHook() to forward
either operation to the cahced coefficient projection integrals
o RooNormManager
- Add getNormByIndex() and cacheSize() to facilitate server
redirection.
o RooProdGenContext,RooProdPdf
- Back out experimental version that allowed overlapping discrete dependents
due to unsolved problems
- Implement redirectServersHook() to forward operation to cached
projection lists
o RooRealIntegral
- Implement redirectServersHook() that causes restart of numerical
integration engine (if any) to pick up server changes
Revision
5174 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 24477 byte(s)
Diff to
previous 4645
Major new version (to become V00-01-00)
o README
- Update standalone compilation instructions
Refer BaBar users to RooFitBabar/README
o RooAICRegistry
- Fix memory leak
o RooAbsArg
- Add default implementation of constOptimize() that
forwards the call to all servers
- Add RooAbsOptGoodnessOfFit, RooRealMPFE as friends
- Add protected pure virtual method setTreeBranchStatus()
that can be used by the optimizer to disable reading
of the tree branch associated with the RooAbsArg
o RooAbsBinning
- Add description
o RooAbsCategory
- Add operator==()
- Implement setTreeBranchStatus()
o RooAbsCollection
- Add addClone(RooAbsCollection&,...) to add a list of clones
o RooAbsData
- Add pure virtual methods for new caching mechanism:
* cacheClone() returns a clone of the dataset with cache
* resetCache() clears the existing cache
* setArgStatus() disables reading of given args from tree
o New class RooAbsGoodnessOfFit
- Abstract base class for goodness-of-fit variables.
A goodness-of-fit is any quantity calculated from a PDF
and a dataset. This class orgamizes parallelization over multiple
CPUs and calculation of GOFs from simulatenous PDFs.
o New class RooAbsOptGoodnessOfFit
- Abstract base class for goodness-of-fit variables
that calculate the PDF value at each data point in the
given dataset. It implements various optimizations:
caching of constant terms, elimination of unused variables etc.
o RooAbsPdf
- Deploy new normalization integral manager RooNormManager
to cache multiple normalization integrals for a PDF.
This greatly increases the efficiency for certain situations
where PDFs are alternatingly called with 2 or more different
normalization choices
- Reimplement fitTo() in terms of RooNLLVar and RooMinuit.
- Reimplement plotNLLOn() in terms of RooNLLVar and plotOn()
- Migrate plotNLLContours to RooMinuit
- Remove obsolete method fitContext
o RooAbsReal
- Add operator==()
- Implement setTreeBranchStatus()
- Fix memory leak in createProjection()
o RooAbsString
- Implement setTreeBranchStatus()
o RooAddModel
- Eliminate getNormSpecial() construction that was originally
introduced to efficiently handle calls with 2 alternating
projection/normalization configurations originating from
RooConvolutedPdf. This is now handled by RooNormManager.
o RooAddPdf
- Reimplement caching of coefficient projection list and
supplemental normalization list using RooNormListManager.
(Also supports caching of multiple configurations now)
o RooArgSet
- Implement addClone(RooAbsCollection&,...)
o RooBanner
- Add description
o RooBinning
- Add description
o New class RooChi2Var
- Implementation of simple Chi^2 of RooAbsOptGoodnessOfFit
for a RooDataHist and a RooAbsPdf.
Chi^2 is calculated from PDF value at the bin center.
Poisson errors are used if no user defined errors are present
o RooConvolutedPdf
- Reimplement normalization integral management using
RooNormListManager
- Deprecate use of RooResolutionModel::getNormSpecial. No longer needed.
o RooCustomizer
- Fix memory leak
o RooDataHist
- Add lo/hi Error associated with each bin. Default implementation
returns poisson errors. Error is return by weightError().
- New set() function allows user to override poisson errors
o RooDataSet
- Fix copy ctor for weighted datasets
- Implement cacheClone()
o RooDirItem
- Add description
o RooDouble
- Add description
o RooExtendPdf
- Follow changes in normalization management of RooAbsPdf
o Removed class RooFitContext
- Replaced by RooMinuit/RooNLLVar
o RooFitResult
- Change terminology NLL -> FCN (fits are no longer NLL necessarily)
- Store and report accuracy code of minuit error matrix
- Minor tweaking of parameter dumps with mixed symmetric/asymmetric
errors
o RooGenericPdf
- Follow changes in RooAbsPdf normalization management
o RooIntegratorConfig
- Add description
o RooLinTransBinning
- Add description
o RooLinkedListElem
- Add description
o RooLinkedListIter
- Add description
o New class RooMPSentinel
- New class to keep track of server processes started for
parallelized goodness-of-fit calculations. On linux
hosts, these processes don't exit when the parent process
exits. This class sends termination signals when this
singleton class is deleted
o RooMath
- Activate CERF disk caching by default
o New class RooMinuit
- New seamless interface between RooFit objects and MINUIT
Class propagates information forth and back between RooAbsArg
objects and minuits internal memory buffer (e.g. parameter
values, errors, step sizes, constant status)
- This class minimizes any RooAbsReal function (doesn't need to
be a NLL or Chi2)
o Removed class RooNLLBinding
- Obsolete after introduction of RooNLLVar
o New class RooNLLVar
- Implementation for NLL of RooAbsOptGoodnessOfFit
o RooNameSet
- Fix memory leak
o New class RooNormManager
- New manager class for normalization/projection integrals for PDFs
This class matches RooArgSet pointer pairs to the integration
and normalization sets to previously registered integrals.
Multiple pointer pairs can point to the same integral (e.g.
pointer to different RooArgSets with the same contents) and
multiple integrals can be cached. This class doesn't create
the normalization integrals. It merely indicates if it has
one or not, and leaves it up to the owning class to create
and register new normalizations
o New class RooNormListManager
- Similar to RooNormManager, except that RooArgLists of normalization
integrals are caches instead of single integrals
o RooNormSetCache
- Rework functionality. This class, used by RooNorm(List)Manager
manages multiple redundant RooArgSet pointer pairs that represent
the same projection/normalization configuration
o RooProdPdf
- Almost complete rewrite in terms of RooNormListManager
o RooRealConstant
- Minor const changes
o RooRealIntegral
- Streamline iterator use: Create various interator in ctor
and reuse them in evaluate() instead of creating and deleting
them on the fly
o New class RooRealMPFE
- Front end for MultiProcessor calculations. Class RooRealMPFE
takes a RooAbsReal as argument and calculates it in separate
process. Calculations can be started asynchronously with
the calculate() call. The rest of the interface (and behaviour)
is identical to that of the original RooAbsReal.
o RooResolutionModel
- Deprecate getNormSpecial - superceded by RooNormManager
o RooSetProxy
- Implement addClone(const RooAbsCollection&,...)
o Removed class RooSimFitContext
- Obsolete - replaced by RooMinuit/RooNLLVar
o RooSimGenContext
- Fix memory leak
o RooSimultaneous
- remove obsolete fitContext() method
o RooTreeData
- Reimplement caching. Cached functions are now stored in
a separate tree in the dataset. Main benefit of the new
implementation is that caches can efficiently be reset
and refilled on the fly
o makedocs
- Add stanzas for new tutorial macros
Revision
4346 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 10 20:59:05 2002 UTC (12 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 24169 byte(s)
Diff to
previous 4266
o RooAbsArg
- Add global inhibit switch to dirty state propagation
- Change attachDataSet algorithm from a recursive algorithm
to an unrolled mechanism
- Change client lists from linked lists to hash lists
o RooAddPdf
- Add tolerance margin to 'sum of coefficient >1' warnings
o RooConvolutedPdf
- Propagate current operMode() to basis functions
o RooFitContext
- Disable dirty-state propagation from projected dependents
Instead trace their use in intergral and switch those
to ADirty mode
o RooFormulaVar
- Defer creation of RooFormula until first evaluate call
- Use temporary RooFormula in ctor to determine actual dependents.
Store actualDependents in list proxy
o RooHashTable
- add avgCollisions function to inspect collision statistics
o RooListProxy
- Add iterator as datamember for internal use
o RooRealIntegral
- Add code to facilitate dirty mode tracking in fit context
o RooSetProxy
- Add iterator as datamember for internal use
o RooSimFitContext
- Add CPU information per NLL calculation if profile and verbose
options are set
Revision
4266 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 29 03:19:01 2002 UTC (12 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 24039 byte(s)
Diff to
previous 4227
o RooAbsCollection
- add overlaps() function to check for common elements in to collections
o RooAbsReal
- New feature: Allow sliced variables to appear in projected data set.
If so, a reduced dataset is created on the fly consisting of only
events that are part of the current slice. This saves the caller
the work of creating a projection dataset for the subset of events
of the plotted slice
- Bug fix: before activating coefficient projection transformation,
check if transformation is not identity (e.g. from (A,B) -> (B,A))
o RooRealIntegral
- Make RooIntegratorConfig* pointer data member non-const. This gives
some trouble in the Streamer() generated by older root versions
o RooSimPdfBuilder
- Add buildConfig() methods that take a RooArgSet of dependents instead
of a dataset
o RooSimultaneous
- Overhaul of plotting interface. Now require that a projection dataset
with (at least) the components of the index category is always given,
even if only a single state is plotted.
This allows a consistent treatment of normalization in slice plotting
w.r.t to regular PDFs: the plotted PDF is multiplied by the fraction
of projected data events selected in the plotted slice.
Substantial work on index projection engine now allows all possible
slices, such as a slice in only one of the components of a composite
index category.
Implement 'auto-reduction' feature on projection dataset, as is done
in RooAbsReal::plotOn. In addition also remove index category-related
columns of dataset before passing it on the the RooAddPdf plot variable
This eliminates some fake warning messages
Major improvement in slicing/projection info messages
Revision
4227 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 22 22:43:58 2002 UTC (12 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 24017 byte(s)
Diff to
previous 3966
o RooAbsArg
- Keep track of cloning with attributes. add isCloneOf()
method to test if objects are clones
o RooAbsCollection
- Implement check of 'unique-name rule' in snapshot() method.
Disabled for the moment as we violate this rule in benign ways
in several places in the core code. This needs to be fixed first
o RooAbsPdf
- Add methods to specify numerical integrator configuration to be
used in normalization
There is one global default configuration (RooIntegratorConfig object)
and each PDF can optionally have a private configuration that
overrules the default one.
o RooAddPdf
- Add on-the-fly transformations for coefficients between
normalization sets. Users can now specify a
'reference normalization' via fixCoefNormalization() in
which the fractions will always be interpreted.
If no such reference set is specified the default behaviour
will prevail: the interpretation depends on the current normalization.
o RooAbsReal
- Change plotOn() such that when a PDF containing RooAddPdfs
is projected with data, an appropriate reference normalization
is set for each, if no user-supplied reference normalization
was set. This ensures intuitive behaviour of plotOn() for RooAddPdfs
- Add easy-to-use wrapper function for createProjection()
o RooErrorVar
- Add readFromStream/writToStream()
- Declare fundamental
o RooImproperIntegrator1D,RooIntegrator1D
- Add constructors from RooIntegratorConfig
o RooMCIntegrator
- Add constructor from RooIntegratorConfig
- Make #iterations and #call per iteration for grid refinement
and integration configurable parameters
o RooProdPdf
- Complete rewrite. Now _all_ permutations of integration/normalization
are correctly performed. New implementation uses a product
of partial integrals created with pdf->createIntegral()
o RooRealIntegral
- Add optional RooIntegratorConfig to ctor and pass to numerical
integrator ctors in various places
o RooSetProxy
- Fix server management for owning set proxies
o Many classes
- Anticipate potential failure of snapshot() due to unique-name
rule enforcement and handle such situations appropriately
Revision
3966 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 13 02:50:08 2002 UTC (12 years, 11 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23641 byte(s)
Diff to
previous 3879
o RooLinearVar
- Allow RooAbsRealLValue as input variable instead of RooRealVar
so that RooLinearVars can be changed
- Call input variables isJacobianOK() in isJacobianOK() and
multiply own jacobian term with input variables one in
jacobian()
o RooRealIntegral
- Bug fix in evaluate: Division by jacobianProduct() was accidentally
omitted for certain integration scenarios.
Revision
3879 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 6 01:31:38 2002 UTC (12 years, 11 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23601 byte(s)
Diff to
previous 3320
o RooAbsReal
- Improve naming scheme of integrals created with createIntegral()
- Improve some info messages in plotOn()
o RooRealIntegral
- Fix typo causing obscure crash
o RooSimGenContext
- Fix cases where index category is fundamental and
in prototype data set.
o RooSimultaneous
- Fix generation with fundamental index category in prototype
dataset
- Improve info messages in plotOn()
Revision
3320 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 28 19:49:00 2001 UTC (13 years, 1 month ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23600 byte(s)
Diff to
previous 3289
o RooMultiCatIter
- Modify to work with non-lvalue input categories. Iteration
will no longer change the states of the input categories.
The return TObject from Next() is now a TObjString containing
the composite state label
o RooSuperCategory
- Adapt to RooMultiCatIter changes
o RooMultiCategory
- Non-lvalue variant of RooSuperCategory. Input categories
are also not required to be lvalues
o RooRealIntegral
- In numeric summation code change from use of RooMultiCatIter
to RooSuperCategory
o RooSimPdfBuilder
- Generate composite splitting categories as RooMultiCategories
instead of RooSuperCategories, thereby allowing composite
splits in terms of non-lvalue components
Revision
3289 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 27 23:19:05 2001 UTC (13 years, 1 month ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23428 byte(s)
Diff to
previous 3240
o RooAcceptReject
- Implement 1M buffer reset in getMaxFuncVal()
o RooConvolutedPdf
- In getAnalyticalIntegralWN() only claim to handle
integrals of actual dependents instead of anything
that's in allVars
o RooFitContext/RooSimFitContext
- Rework setup of projected normalization to be
completely contained inside the fit context
(instead of passing attributes down to RooRealIntegreal)
Revision
3240 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 19 07:24:00 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23588 byte(s)
Diff to
previous 3141
o RooAbsArg
- Improved verboseDirty messaging a bit
o RooAbsCategoryLValue
- fix assignment operator (OSF compiler warnings)
- move RooAbsCategory& assignment operator here from RooCategory
o RooAbsPdf
- Improve verboseEval messaging a bit
- Add virtual fitContext() method that returns fit context
appropriate for top-level PDF
- Change fitTo() to use new fitContext method
- Add fitTo() method with added const RooArgSet& to specify
dependents to be projected with datat
o RooAbsReal
- Deprecate plot range / bins related functions
- Move frame() to RooAbsRealLValue
o RooAbsRealLValue
- Fix assignment operators (OSF compiler warnings)
- Add frame() method from RooAbsReal that passes the fit range/bins
to the RooPlot. Checks that ranges is not zero of open ended
- Add new frame() method that takes range and number of bins to
supercede the default (taken from fitrange/bins)
o RooAddModel
- Some fixes to normalization propagation when used as regular PDF
o RooArgList, RooArgSet
- Declare constructors with name (const char*) and from TCollection&
as 'explicit' to avoid funny implicit conversions (i.e. giving
a quoted string where a const RooArgSet& is expected would be ok...)
o RooCategory
- Move assignment operator from RooAbsCategory to RooAbsCategoryLValue
o RooDataHist
- Deprecate plotBins/Range propagation
o RooDataSet
- Force uniqe name of each THx created with createHistogram() by
adding static counter to name. (Without THx objects with the
same name supercede each other)
o RooErrorHandler
- include stdlib (OSF compiler warning)
o RooErrorVar
- Make inherit from RooAbsRealLValue instead of RooAbsReal.
Add methods and datamembers for fitRange/Bins
o RooFitContext
- Add support for dependent intergration via projection
- Change nLogLikelihood to take extended status from argument
instead of from _extendMode datamember
- Improve dirty state optimizer to only declare branches
as 'always dirty' that actually depend on the the dataset
variable
o RooHistError
- Remove default value of last arg in implementation
asymmetry ctor (Solaris compiler error)
- Change name of BinomialSum data members from _n,_N
to _n1,_N1 to work around bizarre Solaris compiler bug
o RooHistPdf
- Fix overzealous getAnalyticalIntegal()
o RooLinearVar
- Deprecate plotRange/Bins forwarding
o RooLinkedList
- Add optional hashtable lookup (off by default)
o RooHashTable
- Simple hash table implementation
o RooLinkedListIter
- Fix assignment operator (OSF compiler warning)
o RooMCStudy
- Changes due to plotRanges/Bins deprecation
o RooPlot
- Add ctor from RooAbsReal with alternate range and bins
- Add nameOf() utility function to access element properties
by index
o RooRealIntegral
- Implement dependent integration via projection
(i.e. simply treat those dependents as parameters)
o RooRealVar
- Deprecate plotRange/Bins interface
- Modify readFromStream/writeToStream to no longer read/write
plot ranges tokens (existing tokens will be ignored with
a warning message). Also change prefix of fitRange token
from F to L in preparation of renaming fitRange to limits.
readFromStream() currently still accepts F without warning
o RooResolutionModel
- Fix normalization behaviour when used as a regular PDF
o RooSimFitContext
- Add support for dependents normalized via projection
- Allow mixed extended/regular components in extended mode
o RooSimultaneous
- Change condition for extendability from having only extendable
PDFs to having any extendable PDF
- Deprecate custom fitTo()
- Overload fitContext() to return specialized RooSimFitContext
o RooStringVar
- Fix assignment operator (OSF compiler warnings)
o RooTruthModel
- Fix return values of evaluate/analyticalIntegral() (Solaris compiler
warnings)
o RooPolyVar
- New RooAbsReal derived class implementing a polynomial function
with RooAbsReals as coefficients
Revision
3141 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 31 07:19:31 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23060 byte(s)
Diff to
previous 3025
o RooAbsArg
- In redirectServers, propagate nameChange flag to redirectServersHook()
o RooArgList
- Suppress warning about extra EOL characters in readFromStream()
in non-verbose mode
o RooFormula
- Add nameChange flag to changeDependents() and process accordingly
o RooFormulaVar,RooGenericPdf,RooResolutionModel
- Change redirectServersHook() function to accept nameChange flag
and process accordingly
o RooPlot
- change findObject(),getAttLine(),getAttFill(),
getAttMarker(),getAttText() to accept null ptr as
object name string. In such case the object/attribute
of the last added object will be returned.
o RooRealIntegral
- Remove obsolete redirectServersHook() function
o RooResolutionModel
- Overload printToStream() to print out basis function details
in verbose mode
o RooTreeData
- In table() set name of table to '<dataset_name>(<cut_spec>)'
instead of "dataset"
o RooTruthModel
- Adapt to implement new set
of 9 (exp/sin/cos) X (plus/minus/sum) basis functions
Revision
3025 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 13 21:53:22 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23190 byte(s)
Diff to
previous 3012
Fix coding errors and memory leaks found by
CodeWizard, Insure++ and Chaperon such as
- Omitted tests for self assignment in operator=
- Iterators and cloneSets not deleted
- delete[] instead of delete
- Classes with virtual member functions w/o virtual dtor
Revision
3012 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Oct 11 01:28:51 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23211 byte(s)
Diff to
previous 3002
o RooAbsArg
- Extend dependsOn() methods with optional ignoreVar
RooAbsArg argument, which will be ignored in the
dependency determination.
o RooAbsCollection
- Introduce safeDeleteList() method that attempts
to delete the contents of the list in a safer order:
Iteratively, objects without any client in the list are deleted.
This effectively deletes a tree structure contained in the
list top down.
- Use safeDelete() in dtor and removeAl() methods of owning
collections
- Fix remove() member that assumed that every object has
a unique name. If matchByName is set, all objects that
match the given name will be deleted
o RooDataSet
- Introduce write(const char* filename) method that writes
the dataset out as an ascii file.
o RooErrorVar
- New auxiliary class that represents the error of a RooRealVar
as separate variable. This class allows to recycle existing
technology for calculations involving a RRVs error, such
as calculating the pull
o RooFitContext
- Store MINUIT final status in RooFitResult
o RooFormula
- Elaborate 'Formula doesn't compile error with offending construction
o RooMath
- Export interpolate() function as public
o RooMCStudy
- Reimplementation of most of RFTs RooMCStudy class
o RooRealIntegral
- Minor modification is storage of function normalization argset
o RooRealVar
- add errorVar() method that instantiates a RooErrorVar representing
the error of this RooRealVar
- Overload RooAbsRealLValue::attachToTree() to also attach
the error as a TBranch, resulting in persistence of the error
- Overload copyCache() to copy the error from another RooRealVar
o RooTreeData
- Cleanup header
Revision
3002 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Oct 9 00:44:01 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23145 byte(s)
Diff to
previous 2995
o RooAbsCollection,RooArgSet
- Add addOwned(const RooAbsCollection&,..)
o RooPdfCustomizer
- Make branch list an owned list and removed Delete()
call in destructor(). (That call was now forwarded
to TObject::Delete as RooArgSet doesn't inherit any
more from TList, causing a SEGV)
o RooAddPdf
- Add protected against zero total expected events
when operating as a sum of extended likelihood pdfs
o RooRealIntegral
- Remove obsolete AClean mode handling clause in evaluate()
that causes RooCutNorm to fail when operating on objects
cached by the RooFitContext optimizer.
o RooCutNorm
- Print warning message is any component involved in
the calculation of the expected number of events
turns up zero.
o RooTruthModel
- Update inline documentation
Revision
2995 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 8 05:20:24 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23397 byte(s)
Diff to
previous 2959
Documentation update
--------------------
o Most classes
- Update inline documentation
o RooHtml
- Add MakeIndexNew() method that can create sub-index files
by topic. Similar to THtml::MakeIndex(), but topic is taken
from tag in file instead of subdirectory name
- Add MakeIndexOfTopics() method that creates master
index of index files by topic.
o All classes
- Provisionally assign one of the following topic tags to each class
PDF - Probability Density functions
REAL - Real valued functions
CAT - Discrete valued functions
PLOT - Plotting and tabulating
CONT - Container classes
MISC - Miscellaneous
USER - Other user classes
AUX - Auxiliary classes for internal use
o makedocs
- Modify to make new sub-index files and index of topics file.
(Description of topic tags is defined here)
Revision
2959 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 3 16:16:32 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 23390 byte(s)
Diff to
previous 2928
o RooAbsArg
- Minor modification in verbose dirty state messaging
o RooAbsCategory
- Recognize integer branches in non-RooDataSet trees
and attach to those in a special mode (similar to how
single precision flaots are treated in RooAbsReal)
- Modify copyCache() to recognize when copying from a
special mode RooAbsCategory. In such cases the index
is copied from the source and the label is then restored
from the destinations state list
o RooAbsCollection,RooSetProxy,RooListProxy
- Add option to remove() to match arg(s) to be removed
only by name and not by pointer in addition
o RooAbsPdf
- Modify syncNormalization() so that it accepts LValue branch
nodes in the normalization set specification.
o RooAbsReal
- Modify createProjection() to properly construct projections
with LValue dependents
- Modify plotOn() to allow plotting of LValues
o RooArgProxy,RooRealProxy,RooCategoryProxy
- Add option in ctor for proxy to take ownership of proxied object
o RooCurve
- Modify ctor to allow plotting of LValues
o RooLinearVar
- Set initial value of plot range and bins from
those of the dependent
o RooRealIntegral
- Some adjustments to LValue substitution algorithm in ctor
o RooTreeData
- Modify all ctors to use new createTree() member function
to instantiate the TTree. createTree() will cd to memory
directory during TTree ctor so that RooDataSet tree will
be memory resident regardless of the current directory
- Warn user when loading invalid values from non-RDS TTrees
Revision
2927 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 1 22:04:21 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 24227 byte(s)
Diff to
previous 2870
o RooRealIntegral
- Introduce LValue detection in tree structure analysis.
An iterative algorithm determines if there is a non-empty
set of LValue branch nodes suitable for analytical integration
and a set of leaf nodes to be integrated, that exclusively
relate to each other (i.e. set of leafs serves only exactly one
element of the set of LV branches; LV branches only depend on
that set of leafs). If such sets can be found, the LV branches
are substituted for the leafs in the list of dependents to be
integrated.
Actual use of these LV branches in analytical integration
still depends on capability of integrated function. If not,
numerical integration will be performed on LValue.
Caveats: currently the algorithm does not optimize scenarios
like 'server a -> LVnodes (A,B), server b ->LVnodes(A,B), i.e.
multi-dimensional coordinate rotations. Although the
iterative algorithm could easily identify the potential replacement
(a,b) -> (A,B), such substitutions would have to be reviewed
after interaction with the integrated functions' getAnalyticalIntl().
If it turns out the function can only analytically integrate A or B
but not both, the entire substitution would have to be backed out
as an integral over (A,a,b) or (B,a,b) has a redundant dimension.
o RooArgSet,RooArgList
- Add ctor from TCollection. RooArgSet ctor will skips and warns about
eventual duplicate entries by name.
o RooAbsPdf
- Remove obsolete fitTo(TH1*,...) dummy entry point.
o RooLinearVar
- Remove debug print statement
Revision
2870 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 26 18:29:33 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 18782 byte(s)
Diff to
previous 2840
Various memory corruption fixes identified with Insure++
o RooAICRegistry
- replace new Int_t(...) with new Int_t[...] (fortran confusion)
o RooAbsArg
- copy_ctor: explicitly assume attributes are TObjString objects
o RooAbsPdf
- Modification in verbose printing. Instead of 'RooAbsPdf::getVal()/syncNorm'
messages will now be prefixed with name of implementation subclass (IsA()->GetName())
o RooAddPdf
- Add missing iterator dtors
- Implement correct integral for extended form: extra division by sum(coef)
o RooNameSet
- Change delete to delete[] for char[] _nameList in dtor
o RooRealIntegral
- Delete factorization iterator in evaluate()
Revision
2840 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 25 01:15:59 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 18474 byte(s)
Diff to
previous 2838
o RooAbsReal,RooAddModel,RooAddPdf,RooConvolutedPdf,RooProdPdf,
RooFormulaVar,RooProdPdf,RooRealAnalytic,RooSimultaneous
- Change name of
getAnalyticalIntegral(...,const RooArgSet* normSet)
analyticalIntegral(...,const RooArgSet* normSet),
to
getAnalyticalIntegralWN(...,const RooArgSet* normSet)
analyticalIntegralWN(...,const RooArgSet* normSet),
to prevent partial function overloading problems
o RooImproperIntegrator1D
- Fix 'statement unreachable' message (OSF)
o RooProdPdf,RooSimultaneous
- Take out debug messages
Revision
2838 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 23:06:01 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 18465 byte(s)
Diff to
previous 2829
Major cleanup in integration of normalization functions
Miscellaneous small improvements and fixes
o Roo1DTable
- Add get(),getFrac() methods to retrieve contents
o RooAbsCollection
- Add selectCommon() method to create new collection
containing args common to two sets
o RooAbsData
- Minor const-correctness changes
o RooAbsReal
- Rearrangement of getAnalyticalIntegral/analyticalIntegral entry points.
Both functions now exist with and without a 'const RooArgSet* normSet'
The functions with normSet are used by RooRealIntegral, and its default
implementation handle the pass-through scenario (code 0 = getVal(normSet))
and defers other codes to the non-normSet variant.
Simple PDFs should implement the non-normSet variants, as they used
to do sofar, except they no longer should (or are able to) process
the passthrough scenario.
Advanced PDFs such as RooAdd,ProdPdf, RooConvolutedPdf that implement
complex integration schemes that depend on the exact normSet configuration
reimplement the getAI,aI functions with normSet.
o RooResolutionModel, RooAddModel
- Implement (or forward in case of RooAddModel) new getNormSpecial method.
This function is identical in functionality to RooAbsPdf::getNorm()
except that it caches a separate copy of the normalization integral.
This member is introduced for the benefit of RooConvolutedPdf::analyticalIntegral
which, in case of a normalized integration, alternatingly calls two different
normalizations. In the original single cache code, this would lead to
100% caching failure and 300% slowdown of the code. getNormSpecial is
protected for access by RooConvolutedPdf only.
o RooAddPdf,RooProdPdf,RooSimultaneous,RooConvolutedPdf
- Re-implement distributed analytic integration bookkeeping using
the auxiliary RooAICRegistry class, which keeps track of multiple
analytical integration codes (hence AIC)
o RooAICRegistry
- New auxiliary class to faciliate the management of distributed analytic
integration.
o RooArgSet
- Minor printing fix
o RooConvolutedPdf
- Complete rewrite of handling of analytical integrations. For RCP objects
analytical integrations are not all necesarily analytic, but include
integrations deferred to convolution objcts. Analytical integrations
are split off for coefficient terms. Complete double bookkeeping introduced
for 'integration' part of analytic integration and 'normalization' part
of integration, each of which can have a different argSet to defer
to the convolution objects and a different coefficient analytical integration
code. Current implementation is believed to be complete.
o RooFormulaVar
- Follow signature change of getAnalyticalIntegral/analyticalIntegral
o RooMath
- Implement file cacheing scheme for complex error function lookup table.
To invoke persistent caching, call RooMath::cacheCERF(kTRUE) prior to
use
o RooRealAnalytic
- Store and forward normalization set to analyticalIntegral call of
bound RooAbsReal
o RooSimultanous
- Implement new plotOn() method, taking a dataSet which can correctly
project a RooSimultaneous. The code is mostly copied from RooAbsReal::
plotOn, except that the plotted pdf is constructed as a RooAddPdf
of the RooSimultaneous components, weighted by the fractions found
in the passed dataset
o RooTreeData
- Small const-correctness fixes
Revision
2829 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Sep 22 00:30:59 2001 UTC (13 years, 4 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 17974 byte(s)
Diff to
previous 2820
RooAbsReal:
- change names in 1D createHistogram() methods to make meaning of
parameters clearer.
- modify signatures of 2D createHistogram() methods for consistency
with 1D methods.
- add new createProjection() and fillHistogram() methods.
RooAbsPdf:
- comment out plot() methods
RooRealIntegral:
- make normVars ctor parameter const
- fix bug in printToStream (was always verbose for AbsReal sub-object)
- add info message before starting an MC integration (>1 dim)
RooAbsCollection:
- add newline to OneLine printToStream() (this might break some other
printout but is the expected behavior...)
RooMCIntegrator:
- print out periodic progress message for long integrals
Revision
2820 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 20 01:40:11 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 17838 byte(s)
Diff to
previous 2799
Clarify difference between integrable (RooAbsReal) and normalized
(RooAbsPdf) and work on integration of normalized functions
Implement smart integrals for RooAddPdf (fanout of common analytical
integral) and RooProdPdf (drop PDF components fully integrated)
Some small fixed and improvements
o RooAbsCollection
- Implement one-line print in "(a,b,c)" style
o RooAbsPdf,RooAbsReal
- Move matchArgs() functions from RooAbsPdf to RooAbsReal
as they relate to integrability, which is common to all
real valued objects
- Move selfNormalized() from RooAbsReal to RooAbsPdf, which
applies only to normalized functions
- Extend getAnalyticalIntegral() to take an options
normalization set pointer, as the analytic normalization
capabilities of RooAdd/ProdPdf depend on the choice of
normalization
o All core PDFs
- Follow signature change of getAnalyticalIntegral()
o RooAddPdf
- Implement distributed analytical integration of component
PDFs. RooAddPdf forces RooRealIntegral to pass all integrated
dependents to getAnalyticalIntegral (by reimplementing
forceAnalyticalInt).
RooAddPdf::getAnalyticalIntegral will forward the call
to all component PDFs and find the set of dependents
that all components can integrate analytically.
If such a set exists, the components integration codes
are stored in an array and associated with a master integration code
RooAddPdf::analyticalIntegral is copied mostly from evaluate()
replacing each getVal() with getAnalyticalIntegral, passing
the appropriate integration code to each component
o RooProdPdf
- Implement factorizing analytical integration of component PDFs.
Because each PDF is normalized, the integral of a product of
PDFs can often be simplified, e.g. Int(y) A(x)B(y) = A(x)
as Int(y)B(y) is 1 by definition.
RooProdPdf forces RooRealIntegral to pass all integrated
dependents to getAnalyticalIntegral (by reimplementing
forceAnalyticalInt).
getAnalyticalIntegral() will determined which PDFs can be
dropped for a given choice of dependents to be integrated
and a given choice of normalization and constructs a integration
code encoding the pattern of dropped/kept PDFs as a bit pattern.
analyticalIntegral() is mostly copied from evaluate(), skipping
the terms indicated as dropped by the integration code bit pattern.
o RooPdfCustomizer
- Trivial bug fix in build()
o RooRealIntegral
- No longer consider the integrated functions' selfNormalized()
property in the integration logic.
- Fix a bug in the forced_analytical vs numeric integration
determination, which occasionally lead of dependents being
integrated twice, once analytic and once numeric.
Revision
2799 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 18 02:03:45 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 17702 byte(s)
Diff to
previous 2798
Fix for Remedy 05557 and a similar but unreported problem in generating
o RooAbsReal
- Modify bindVars to take optional normalization set
o RooCurve
- Use new normalized bindings. Modify scale factor algorithm
to work with normalized functions (explicit correction no
longer needed)
o RooGenContext
- Use modified RooRealIntegral ctor with function normalization set
o RooRealBinding
- Extend ctor to take optional function normalization set in ctor
and pass this argset to the bound functions' getVal()
o RooRealIntegral
- Extend ctor to take optional function normalization set in ctor
that is passed to integrated function in passthrough and full
numeric mode
Revision
2798 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 17 18:48:17 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 17356 byte(s)
Diff to
previous 2795
Generalize RooArgSet to RooAbsCollection and introduce RooArgList
and corresponding proxy. Introduce RooArgList where appropriate
as replacement of a TList of proxies, eliminate all use of TList
inherited functions in RooArgSet/List.
Some optimizations implemented following profiling studies
Various fixes for compilation with Solaris CC 5.0
o RooAbsArg
- Change signature of server management function to use RooAbsCollection
instead of RooArgSet
- Add proxy management support for new RooListProxy class
o RooAbsPdf
- Disable use of RooNameSets as optimization attempt. It appears
to cost more time than it saves
o RooAbsProxy, RooArgProxy, RooAbsReal, RooAcceptReject,
RooDataHist, RooFormula, RooFormulaVar, RooGenCategory,
RooGenContext, RooGenericPdf, RooPlot, RooRealIntegral,
RooResolutionModel, RooSetProxy, RooSuperCategory, RooTreeData
- Follow RooAbsArg member function signature changes
o RooAddPdf, RooConvolutedPdf, RooFitContext, RooSimFitContext,
RooFitResult, RooPdfCustomizer, RooProdPdf,
- Change implementation from using TList to using RooArgList
o RooAbsCollection
- New abstract base class for collections of RooAbsArgs. This
class contains mostly code from the former RooArgSet implementation
o RooArgSet
- Re-implement as derived class of RooAbsCollection. A RooArgSet
cannot contain duplicates (as before), but also doesn't give
random access (by index) to its member elements
o RooArgList
- New implementation of RooAbsCollection that allows duplicates
in the list, allows sorting and lookup by index.
o RooListProxy
- Proxy version of RooArgList, similar to RooSetProxy. To be used
as data member of RooAbsArg implementation to hold external
RooAbsArg references.
Revision
2795 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Sep 15 00:26:04 2001 UTC (13 years, 4 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 17326 byte(s)
Diff to
previous 2785
Finish the optimization of RooRealIntegral's numerical engine usage,
so that whenever possible, an existing engine is reused instead of
creating a new engine (which has a high memory allocation overhead).
RooIntegrator1D:
- add setLimits() method to allow integration range to be changed
after construction and independently of the integrand's range
RooImproperIntegrator1D:
- clean up handling of different integration strategies by
introducing LimitsCase enum and limitsCase() method
- implement logic to re-use existing RooIntegrator1D objects whenever
possible in checkLimits()
RooMCIntegrator:
- implement logic to re-use ourself as long as all limits are still
finite in checkLimits()
RooIntegratorTest:
- use GenericPdf instead of FormulaVar since a FormulaVar is no
longer numerically integrable (by construction)
Revision
2785 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Sep 8 01:49:41 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 17280 byte(s)
Diff to
previous 2747
o RooDataSet
- Export TTree::Scan()
o RooFitContext
- Save a separate argset containing the normalization dependents
in the constructor. In the dataset optimization, certain
PDF dependents might disappear from the data set (e.g. when
exclusively used by cached nodes) causing an incorrect normalization
later on in the fit
o RooRealIntegral
- Make hybrid integration work correctly for composite functions
with AClean branch nodes when the top level function is not
AClean itself.
o RooIntegrator1D
- Extend convergence failure erro message
Revision
2747 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 24 23:55:15 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 16258 byte(s)
Diff to
previous 2745
RooRealIntegral:
- add logic to reuse an existing numerical integration engine when possible
RooArgSet:
- replace Delete() with _list.Delete()
- create addOwned() member fn that allows objects to be added to a list
with ownership transfered to the list (like addClone())
RooFitResult:
- change _globalCorr and the elements of _corrMatrix to use "copied"
ArgSet's and let the ArgSet dtor handle the cleanup (ie, remove Delete()'s
from RooFitResult)
Revision
2735 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 23:43:43 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 15898 byte(s)
Diff to
previous 2724
The following changes enforce set semantics in the public use of
RooArgSet's by removing the public TList interface.
RooArgSet:
- change base class from TList to TObject
- add protected data member THashList _list
- add inline createIterator() to export _list.MakeIterator()
- add inline getSize() to export _list.GetSize()
RooAbsArg,RooAbsData,RooAbsPdf,RooAcceptReject,RooConvolutedPdf,
RooCurve,RooFitContext,RooFitResult,RooFormula,RooFormulaVar,
RooGenContext,RooGenericPdf,RooLinearVar,RooMultiCatIter,
RooNameSet,RooPdfCustomizer,RooRealBinding,RooRealIntegral,
RooSetProxy,RooSuperCategory,RooDataSet:
- replace RooArgSet::MakeIterator() with createIterator(), etc.
RooAbsArg,RooArgProxy,RooSetProxy:
- move a block of duplicated code in RooAbsArg::redirectServers()
RooSetProxy::changePointer() and RooArgProxy::changePointer() into
a new RooAbsArg::findNewServer() member fn.
*** Outstanding problems now resolved by temporary cheater member
*** functions added to RooArgSet:
- RooConvolutedPdf uses RooSetProxy::At() and ::IndexOf()
- RooFitContext uses RooArgSet::At() and ::Sort()
- RooFitResult uses RooArgSet::IndexOf() and ::At()
- RooMultiCatIter uses RooArgSet::getCollection()
- RooPdfCustomizer uses RooArgSet::Sort()
- RooRealBinding uses At()
- RooSimFitContext uses RooArgSet::At() and IndexOf()
Revision
2724 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 01:21:48 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 15877 byte(s)
Diff to
previous 2703
o All RooAbsReal derived classes
- Changes signature of evaluate(const RooArgSet*) to evaluate()
o RooGenericPdf,RooSimultaneous
- Adapt to use _lastDataSet instead of argset passed via evaluate
o RooFormulaVar
- PDF dependents will be used unnormalized (following evaluate
signature change)
o RooAbsLValue
- New abstract lvalue class defining interface for setPlotBin()
needed for binned datasets
o RooAbsReal,RooAbsCategory,RooAbsString
- Implement setPlotBin() method
o RooAbsReal
- Change copyCache and attachToTree to be aware of 'Float_t'
branches in data sets
o RooDataSet
- Add constructor from TTree with RooFormulaVar cut specification
o RooAbs*
Inline documentation improved
Revision
2655 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 9 01:02:15 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 15962 byte(s)
Diff to
previous 2654
o Many classes
- Simplify use of TString as this is suspected to cause spurious
TString memory errors
o Many classes
- Fix about a dozen of memory leaks reported by GC (mostly iterators)
o RooArgProxy,RooSetProxy
- Change order of multiple inheritance to put TObject (or derived)
first. This fixes vtable/vptr mishap on Solaris
o RooAbsArg
- Introduce dynamic_cast<> in changeNormSet() to cast the TObject
from the proxy list into a RooAbsProxy (needed in conjuction
with above change)
o Several classes
- Make destructor virtual, fix Clone() function signature to match
that of TObject
Revision
2654 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 8 23:11:25 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 15848 byte(s)
Diff to
previous 2630
RooAbsIntegrator:
- no longer inherits from TObject
- uses RooAbsFunc interface instead of RooAbsReal
- remove (AbsReal,mode) binding functionality (now performed by
class RooRealAnalytic)
- add counter for number of integrand evaluations
RooIntegrator1D:
- use RooAbsFunc interface instead of RooAbsIntegrator::eval()
- fix array size bug (already fixed in RFT after this routine was copied)
- add a constructor option to select the summation and refinement rule
to use and change the maxSteps, eps defaults to zero (defaults depend on
the rule being used and are now applied in the initialize() method)
- implement a new addMidpoint() summation rule that can be used to
estimate certain improper integrals
- add check for finite integration limits
RooRealIntegrator:
- add isValid() member fn to flag ctor problems
- add check that all integration vars are lvalues
- use new RooIntegrator1D interface
- use new RooRealBinding,RooRealAnalytic classes
- remove maxSteps, eps ctor parameters (they were not being used)
- use new RooInvTransform and RooImproperIntegrator classes for 1-dim
numerical integrals with one or both limits infinite
- change logic for calling initNumIntegrator() so that it correctly
propagates shape/value changes
- make initNumIntegrator() const so it can be called from evaluate()
and make the data members it modifies mutable
- support 1D numerical integration with either limit infinite via
RooImproperIntegrator1D
RooAbsArg,RooAbsRealLValue,RooAbsCategoryLValue:
- add isLValue() member fns
RooInvTransform:
- new RooAbsFunc implementation that performs the change-of-vars
transformation x -> 1/x on an input RooAbsFunc.
RooImproperIntegrator1D:
- new RooAbsIntegrator implementation that performs an integration
where one or both limits are infinite by splitting up the range
into up to 3 subranges that can each be handled by RooIntegrator1D.
RooNumber:
- new class to encapsulate platform-specific numerics (eg, infinity)
RooAbsRealLValue,RooIntegrator1D,RooImproperIntegrator1D,RooLinearVar,
RooRealIntegrator,RooRealVar:
- use RooNumber statics instead of (non-portable) preprocessor INFINITY
and remove unecessary include dependencies on RooAbsRealLValue.hh
RooIntegratorTest.cc:
- test macro that is not compiled into the library
Revision
2629 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 23:54:24 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 14664 byte(s)
Diff to
previous 2626
RooRealIntegral:
- rename Unity to PassThrough
- change function arg type from RooAbsPdf to RooAbsReal
- change (RooAbsReal&) to const_cast (why does the RooRealProxy ctor
need a non-const ref?)
RooAbsIntegrator,RooIntegrator1D:
- change signatures from AbsPdf to AbsReal
Revision
2626 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 14638 byte(s)
Diff to
previous 2619
o RooTrace
- New memory tracing utility (singleton class)
o RooAbsArg,RooDataSet,RooArgSet
- Install hooks for RooTrace in ctors and dtors
o RooThreshEntry
- Fix bug in copy ctor
o RooAbsReal,RooAbsPdf
- Move analytical integration support
(getAnalyticalIntegral,analyticalIntegral,
forceAnalyticalInt,selfNormalized) from RooAbsPdf to RooAbsReal
so that every RooAbsReal can be integrated
o All RooAbsReal derived classes
- Change signature of evaluate(),getVal(),traceEval(),checkDependents()
from X(const RooDataSet* dset) X(const RooArgSet* nset)
o RooAbsPdf
- Manage normalization caching with a RooArgSet listing the dependents
instead of a RooDataSet containing this list
- Remove obsolete nLogLikelihood function (now in RooFitContext)
o RooAbsArg
- rename setProxyDataSet to setProxyNormSet
- add getParameters(),dependentOverlaps() that
take a 'const RooArgSet*'
o Roo*Proxy
- rename changeDataSet() to changeNormSet()
o RooConvolutedPdf
- Replace dummy data set for convolution normalization by an RooArgSet
o RooDataSet
- Remove inheritance from TTree, make it contain a TTree instead.
Forward all relevant TTree member functions. Add correct Clone()
function (now possible due to inheritance change)
o Various classes
- Fix const handling to eliminate Linux2 compiler warnings
Revision
2619 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 1 01:24:08 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 14636 byte(s)
Diff to
previous 2618
o RooAbsPdf
- Hold in addition to _lastDataSet a RooNameSet with the names
of the members of that dataset. If (_lastDataSet != dset) in
syncNormalization, first check if contents of _lastDataSet
is different from dset before redoing the normalization.
If >1 RooConvolutedPdf share a RooResolutionModel, the resolution
model will receive syncNormalization calls for the dummy data
sets contained in all RooConvolutedPdf. All these sets contain
most likely the same set of variables and a recalculation is
thus not necessary.
We cannot use _lastDataSet->get() to get the name list of the
previously used data set because that dataset might no longer
exist
o RooAddModel,RooAddPdf,RooProdPdf,RooSimultaneous
- Change signature of selfNormalized(const RooArgSet* depList)
to selfNormalized(). Partial self-normalization is an ill-defined
concept at this level. The original reason for introducing this
(RooConvolutedPdf objects insisting on handling integrals delegated
to their convolution integrals) has meanwhile been replace with the
forcedAnalyticalInt() method
Revision
2618 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 20:54:07 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 14643 byte(s)
Diff to
previous 2612
- cleanup RooRealIntegral::printToStream() (Standard mode does not
work yet because writeToStream() is not implemented)
- temporarily change "retVal= 1" to "retVal= _function" in
RooRealIntegral.cc for Unity mode (*** need to review this ***)
- fix RooRealIntegral memory leak by initializing _numIntEngine
to zero in all ctors
- remove include of RooFastList.hh from RooAddModel.hh
- improvements to toy MC generator
Revision
2612 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 05:54:23 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 16007 byte(s)
Diff to
previous 2487
o All RooAbsArg derived classes
- Change clone() to clone(const char* newname=0) to facilitate cloning with alternate names.
o RooAbsArg
- Add another layer to link management: operMode. If operMode=auto, all behaves
as before. If operMode=AClean, the arg assumes the cache is always clean and
getValueDirty() will always return false. If operMode=ADirty, the arg assumes
the cache is always dirty and isValueDirty will always return true.
The ADirty and AClean modes are used by the optimizer in the fit context
to shut down link management (and save time) for cases where the arg is
always dirty after a dirty state propagation from one of the dependents.
The AClean mode is used similarly for args that are cached in the dataset
The setOperMode() member is protected as care should be taken in switching modes.
It is the callers responsability to ensure that the claimed state (especially
in case of AClean) is indeed correct.
- Split setValueDirty(Bool_t flag) in setValueDirty() and clearValueDirty().
The latter is trivial and can be inlined to save time.
- redirectServers() now has an optional nameChange flag that allows to reconnect
to servers with different names. If the option is enabled, a link will be reconnected
to the server with a 'ORIGNAME:<servername>' attribute instead of a server with <servername>
This feature is used by RooPdfCustomizer.
- Added recursive printDirty() member that listed dirty state of arg and all its servers.
- Add sorting capability by implementing IsSortable() and CompareTo() members.
Sorting will result in alphabetical ordering by object name.
o RooAbsCategory
- Change tree attachement: store both label and index fields in tree instead of
just the index field. Looking up the corresponding label turns out to be rather
expensive, especially if many state are defined.
- The postTreeLoadHook() mechanism that formerly implemented the index lookup
has been abandoned completely (save 1 virtual function call per data set load).
o RooAbsPdf
- Change function call structure of eval tracing a bit to reduce the number
of calls per trace from virtual calls to 1 concrete call.
- In syncNormalization, if the data sets are different, first check if they
also have a different contents before processing the change. (Save multiple
identical normalization calculations for cases were a resolution model is
shared by >1 RooConvolutedPdf. (WVE Caveat: this has some problems: code will
die if cached data set is deleted before pdf. Will fix this soon)
Install pre- and postSyncNormalizationHook functions that can be used to customize
the call. Used by RooConvolutedPdf to create/update dummy data sets used to
push down partial integrations to the convolution integrals.
- Move nLogLikelihood to RooFitContext
o RooAbsReal
- in attachToTree(), mangle name of object in tree to exclude math symbols that
are interpreted by root in certain circumstances
o RooAddModel
- Store coef and proxy iterators in class instead of creating them on the fly each
time in evaluate()
- Release ownership of proxied resolution models in the copy constructor. If the
AddModel is copied, the proxied components will be owned by the list created
by RooArgSet::snapshot().
- Include name of AddModel owner in component resolution model to avoid multiple
identically named object in certain PDF configurations
- Export 'master list' of combined normalization leaf node servers of all components.
The convolutedPdf needs this for it's own dependency calculation
o RooArgSet
- Add silent option to remove()
o RooCatType
- Store name in char[] instead of in TNamed::fName (a TString) so that
the name can be attached to a Tree. (A TString is not a TObject)
o RooConvolutedPdf
- Push integration of all dependents that do not overlap with the coefficients
to the convolution integrals, instead of just the convolution variable
o RooDataSet
- Add new constructor that allows to specify the cut as a RooFormulaVar object
instead of a string. This allows to cut on function arguments that are not
part of the data set
- Allow to switch off dirty state propagation after a row-load operation
(can be used in certain optimization scenarios)
o RooFitContext
- Add option to not clone either dataset or pdf on construction
- Remove non-RooRealVar parameters from master parameter list to prevent that
MINUIT chokes on them
- Sort minuit parameter list alphabetically
- Add cache optimization option, which shuts down all link management for the
all pdf value components (not normalization). This can save a significant amount
of time, especially for very complex PDFs as the number dirty propagations scales
with the square of the number of nodes. Use newly introduces AClean and ADirty
modes to ensure proper evaluation of PDF nodes
- Add option to execute migrad with 'strategy 0', which skips the evaluation of
the error matrix. (Saves time if you do that later with HESSE anyway)
- Move nLoglikelihood() function from RooAbsPdf to here.
- Improve readability of messages in fitting in log-mode: print on screen only value
and name of parameters that change instead of dumping all their values all the time.
The old format has been retained in the log file, to allow automated processing of such files.
o RooFormulaVar
- Also update _origList on a serverRedirect
- Export ok() function of RooFormula (indicates if expression compiled ok)
o RooMath
- Add fast, interpolated, complex error function. Upon first use separate lookup tables
are filled for the im and re part of the complex error function. New functions will
do a 2nd or 3rd order 2D interpolation (depending on z) of the lookup table for either
the re part, the im part or both. Precision is better that 1e-6 in ~99% of covered
phase space. Imprecise regions are in problematic part of cErf where giant fluctuations
occur. Typical likelihood calculated with interpolated cErf agrees in the first 10
significant digits. Interpolation function is ~3.5 times faster than original CWERF
implementation, when only 1 component (im/re) of cErf is needed (most cases).
Interpolation function taken from Numerical Recipes and further optimized for
fixed grid assumption
o RooMappedCategory
- Clone also MapCatEntries in RooMappedCategory copy ctor
o RooProdPdf
- Store coef and proxy iterators in class, instead of instantiating them on the fly
in evaluate()
- Add optional cutoff parameter. If running PDF product goes below cutoff, product
calculation is terminated (default value=0, very small values like 1e-15 can be
benificial in case of wide window calculations a Gaussian + something flattish)
o RooRealIntegral
- Allow and perform integration over variables that input function doesn't depend
on (multiply integral by product of ranges of such variables)
o RooResolutionModel
- In convolution(): append name of owner to convolution, to avoid non-identical
convolutions with the same name in certain PDF configurations
- Forward redirectServers to basis function
o RooSimultaneous
- Overload fitTo() to create a RooSimFitContext instead of a RooFitContext
which allows certain additional optimizations specific to RooSimultaneous
- Normalize by the number of registered PDFs instead of the number of types
defined by the index category (allows to to partial fits)
o RooStreamParser
- Take '}' and ';' out of the default punctuation list so that RooSuperCategory
state names do not get broken up into multiple tokens
o RooThresholdCategory
- New category class that applies a series of thresholds on a RooRealVar to
define its state.
o RooThreshEntry
- Support class for RooThresholdCategory
o RooPdfCustomizer
- Utility class that serves a factory to build multiple PDFs from a single prototype
that have slightly different leaf nodes.
The class takes a proto type and a master index category in the constructor.
A series of splitting rules determines how given leaf nodes are to be 'split'
over the master index category or a subset of the master index (in case the master
index is a RooSuperCategory)
The instiated 'split' leaf nodes are put in an argset referenced in the constructor.
and the owner of the argset is responsible for deleting them (or passing them on
to another RooPdfCustomizer). The instantiated branch nodes are owned by the customizer.
o RooSimFitContext
- Specialized fit context, derived from RooFitContext, that optimizes the likelihood
calculation in case the top level pdf is a RooSimultaneous. The original data
set is broken into pieces, corresponding to a single state of the RooSimultaneous
index category and those data subsets are combined with the corresponding PDF branches
of the RooSimultaneous to form an array of regular RooFitContexts. The total likelihood
is calculated as the sum of the likelihoods from the array of fit contexts.
The NLL output from each subcontext is cached and only recalculated if a parameter
that the PDF of that subcontexts depends on, is changed.
This form of calculation is very efficient for fits where the correlation matrix has
a block diagonal form. The CPU time in RooSimFitContext scales (approximately) with
the number of elements in the block diagonal elements instead of with the total number
of elements.
o Nearly all classes
- A large number of minor bugs has been fixed and many functions
that are called very frequently have been inlined, made non-virtual or
have been eliminated, following the result of repeated profiler studies.
Revision
2443 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 23 01:20:34 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 13892 byte(s)
Diff to
previous 2397
o RooAbsArg
- Add unregister methods for proxies
o RooAbsPdf
- Add forceAnalyticalInt() method to allow more complex negotiation
between RooRealIntegral and RooAbsPdf implementation
(needed by RooConvolutedPdf)
o RooArgProxy
- Store owner in data member, and unregister self in destructor
o RooSetProxy
- Unregister self in destructor
o RooConvolutedPdf
- Introduce getCoefAnalyticalIntegral()/coefAnalyticalIntegral()
methods, similar to non-coef methods in RooAbsPdf to support
analytical integration of coefficient terms
- Rewrite normalization framework. Entire normalization is now
done in analyticalIntegral, which forces RooRealIntegral via
the new forceAnalyticalIntegral() method to delegate integration
over convolution variables to us
o RooRealIntegral
- Implement handling of RooAbsPdf::forceAnalyticalInt() declarations
o RooResolutionModel
- Reduce verbosity
- Overload RooAbsPdf::traceEvalHook to explicitly allow negative values
o RooTruthModel
- Reduce verbosity
o RooComplex
- Imported from RooFitTools
o RooMath
- Imported from RooFitTools
- Functions related to histogram error calculated stripped
o RooAddModel
- RooResolutionModel derived class that can add various ResolutionModels
with relative fractions. Similar to RooAdPdf for PDFs
Revision
2397 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 8 05:51:06 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 12208 byte(s)
Diff to
previous 2381
o RooAbsReal and all concrete derived classes
- Change evaluate() to evaluate(const RooDataSet*)
o RooAbsArg
- Add ctor/dtor trace code to track memory leaks
o RooAbsPdf
- Add getNorm(const RooDataSet*) method
- Add selfNormalized(const RooAbsArg* dep) method
which allows finer granularity in determining
what part of the PDF is self-normalized
- Change selfNormalized(const RooArgSet* depList) method
to call selfNormalized(const RooAbsArg* dep) for all
members of depList
o RooArgProxy
- propagate changeDataSet to proxied argument, so that
a dataset cache change becomes recursive
o RooRealIntegral
- use RooAbsPdf::selfNormalized(const RooAbsArg*) to skip
integration of designated dependents
o RooSetProxy
- Fix bug in copy constructor
o RooResolutionModel
- New base class for convolution kernel PDFs
o RooConvolutedPdf
- New base class for PDFs consisting of a
convolution with a RooResolutionModel
o RooTruthModel
- Implementation of truth resolution model (delta function)
Revision
2381 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 6 00:06:39 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 12097 byte(s)
Diff to
previous 2345
o Overhaul new RooSetProxy
- RooSetProxy is a derived class of RooArgSet, so it can be
treated as an ArgSet by the user
Contents is automatically updated on redirectServers
and contents can be automatically declared as value/shape
server. The default server link behaviour is controlled
in the SetProxy constructor, and can be overridden, if necessary
with a special ::add() member function.
o RooRealIntegral, RooSuperCategory
- Adapt to use new RooSetProxy for their list management
Revision
2345 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 31 21:21:37 2001 UTC (13 years, 7 months ago) by
david
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 12390 byte(s)
Diff to
previous 2222
RooAbsPdf:
- add interface for querying built-in generator capabilities, similar
to the analytic integral interface: getGenerator() & generateEvent()
- rename tryIntegral() methods to matchArgs()/matchArgsByName() and fix
problem with >1 proxy name in TList version (now matchArgsByName())
- move attatchDataSet() method into RooAbsArg and change RooDataSet* arg to RooDataSet&
- make RooAcceptReject a friend so it can use recursiveRedirectServers()
RooArgSet:
- add a method remove(const RooArgSet&) that calls remove(const RooAbsArg&)
- add removeAll() method
- add replace(const RooArgSet&) method
RooAcceptReject:
- implementation of general-purpose accept-reject generator, used by RooGenContext
RooAbsRealLValue,RooAbsCategoryLValue:
- add non-virtual randomize() method for toy MC
RooAbsArg:
- add printout of our memory address in verbose printToStream() for x-referencing
with client/server addresses of other AbsArgs.
RooRealIntegral:
- augment verbose printToStream() output
RooAbsCategory:
- add protected getOrdinal() method
RooAbsCategoryLValue:
- add protected setOrdinal() method
Revision
2215 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 16 07:41:08 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 10410 byte(s)
Diff to
previous 2200
o RooAbsReal/RooAbsPdf
- Move analytical integration support from AbsReal to AbsPdf
(getAnalyticalIntegral/analyticalIntegral/tryIntegral)
- Add more tryIntegral functions that take 2,3,4 RooArgProxies
o RooAbsRealLValue
- Rename isSafeForIntegration() to isJacobianOK()
- Add jacobian() member that return actual jacobian value
o RooRealIntegral
- Change analytical/numerical integration logic to handle
RooAbsRealLValue objects with a non-unit but constant
jacobian correctly
o RooLinearVar
- Implements most general case of RooAbsRealLValue with
constant but non-unit jacobian: X*slope + offset.
X must be a RooRealVar and slope and offset (RooAbsReal)
must not depend on X
isJacobianOK() only returns true for a given dependent
list of slope (the jacobian) has no dependents, except
for RooAbsCategoryLValues
o Some miscellaneous small bug fixes
Revision
2191 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon May 14 05:22:55 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 7684 byte(s)
Diff to
previous 2184
Reorganize analytical/numerical integration structure
o RooAbsArg
- Back out 'integration dependents' option in getDependents()
(logic moved to RooRealIntegral)
- checkDependents is by default always OK
o RooAbsRealLValue
- Add isSafeForIntegation(const RooArgSet& depList) method
in which an LValue can indicate if it is OK to use the
object as LValue in integration fo the present
parameter/dependent configuration is
o RooRealIntegral
- Move all logic to decide what to integrate numerically/analytically
and where to use LValue and depth-expanded RValue into RRI ctor.
Summary of logic:
For every server of function that is to be integrated
if (RealLValue && isSafeForIntegration && noOverlapWithOtherServers)
Integrate of LValue
else if (CategoryLValue && noOverlapWithOtherServers)
Sum over LValue
else
Integrate/Sum over leafNode dependents of server
Now, all details of integration technique are completely contained
in RooRealIntegral, which can _always_ be performed (if N-dimensional
numerical integration is implemented)
Other changes
o RooFormulaVar
Allow new variable names in formula expression (@0, @1, ... @n)
that reference the nth object in the given RooArgSet.
(e.g. "@0 + @1 * @2")
Revision
2184 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri May 11 23:37:41 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 6171 byte(s)
Diff to
previous 2167
o RooAbsArg
- Extend xxxNodeServerList and getDependents with an option
to truncate tree searches at an LValue type object
o RooAbsPdf
- Add static flag to enable verbose evaluation (useful in optimization
checking). Switch using RooAbsPdf::verboseEval(1,0) ;
- Use new 'Lvalue' type dependents list for integration
o RooMultiCatIter
- Require RooAbsCategoryLValue as input type instead of RooCategory
o RooRealIntegral
- Fix an overlooked update to new list copy behaviour
(caused integration to change value of dependents)
o RooSuperCategory
- Also copy current value in copy ctor
o RooGenericPdf
- New, very similar too RooFormulaVar, except that it is normalized
o (Many classes)
- Disable low-level debug print statements
Revision
2167 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri May 11 06:30:01 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 6091 byte(s)
Diff to
previous 2165
o RooAbsArg
- In destructor, only print out warnings about live clients
that get cut off in verboseDirty() mode.
For automatically declared RooAbsArg this error condition
never occurs, but for client/server links in lists, the
order of deletion doesn't take these link directions into account.
o RooCategory
- Disallow defineType("") with a semicolon in the name.
This would confuse the reverse mapping of
RooSuperCategory::setIndex()/setLabel()
o RooArgSet
- Make default clone/copy ctor not copy the contents of the
list (Some core classes changed that used this feature)
- Extend snapshot function to ::snapshot(Bool_t deepCopy)
which allows to make both shallow (only list contents copied)
and deep snapshots (also all dependents of list contents
copied and added to list)
- Modify replace() to use AddBefore();Remove() instead
of Remove();Add() so that a replace call doesn't interfere
with an iterator over the RooArgSet
o RooRealIntegral
- Change dependent type checking from RooRealVar/RooCategory
to RooAbsRealLValue/RooAbsCategoryLValue
o RooSuperCategory
- Add MakeIterator() function which returns a RooMultiCatIter
on the super categories servers.
- Implement setIndex/setLabel(), which decodes the composite super
label into labels of the input categories
- Make use of new RooSetProxy which proxies the RooArgSet list
of input categories
- Enhance verbose printing
o RooGenCategory
- Port/rewrite from RooFitTools. User method scanned for all states
and translated into a
'SuperCategory type-index -> GenCategory type-index'
map (int-to-int via a simple array), making the class substantially
faster. The mapping is revised upon a shapeDirty() which is
propagated from all the input categories
o RooAbsCategory
- New abstract common base for RooArgProxy and RooSetProxy
o RooSetProxuy
- Proxies a RooArgSet. Essential service provided: upon a
redirectServers the list contents is replaced with the
new pointers from the redirection list.
Revision
2164 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 10 18:58:48 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 6051 byte(s)
Diff to
previous 2158
*** Changes to allow a dataset to cache of derived objects ***
o RooAbsReal, RooAbsCategory and RooAbsString
Now each implements a protected method attachToTree, which allows to
connect the cache of any RooAbsArg to a TTree column
All other implementations (RooRealVar etc) removed
o Most classes
Type-blind assignment RooAbsArg* <...>::operator(const RooAbsArg*)
has been replaced by RooAbsArg::copyCache(RooAbsArg *), which is
needed for data set copy operations.
A new method RooAbsArg::syncCache(RooDataSet *)
can be used force to update the cache before a copyCache call.
o RooDataSet
- Holds a list of _cacheVars in addition to _vars, which are not
owned by the data set, but are updated nevertheless.
The cache list is not copied in a Clone() or copy operation.
- New methods cacheArg(RooAbsArg&) and cacheArgs(RooArgSet&)
register derived objects for caching in the dataset.
The values for these derived objects for each row of the tree
will be calculated and stored as a new column in the tree.
The cache of the derived object is attached to that tree column.
On a RooDataSet:get() row-load call, a setDirty(kTRUE) is called
for each cached (and uncached) object to propagate a value change
to the cached objects clients. Then immediately a setDirty(kFALSE)
is performed on the cached objects, to impose that the tree-loaded
value of the cache is correct and doesn't need to be recalculated.
o RooFitContext
- Optimizer not uses cacheArgs instead of addColumn, which
is integration-safe and can now be used on any derived object
with constant parameters
o RooAbsPdf
- Another iteration in the structure of getVal.
To make data set attachement work, the normalized value is
now stored in the cache instead of the raw value.
*** Cleanup of assignment operator ***
o RooAbsRealLValue/RooAbsCategoryLValue
- Implements assignment to Double_t/(Int_t,const char*)
o RooRealVar/RooCategory
- Implemements assignment to RooRealVar/RooCategory
o All other assignment operators deprecated
- No more assignment of derived types to each other
(conceptually unclear)
Revision
2158 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 10 00:16:09 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 6461 byte(s)
Diff to
previous 2114
o RooAbsArg
- Small change in 'Standard' printing logic
- isXXXDirty() will always return kFALSE if isDerived is kFALSE
o RooAbsCategory
- Absorb caching/evaluation code of RooDerivedCategory
- Add defineType(const char*) (without index code)
- Add clearTypes() ;
o RooDerivedCategory
- Retired
o RooAbsCategoryLValue
- New abstract base class for LValue categories
(e.g. RooCategory, RooSuperCategory)
o RooCategory:
- Add methods that publicize the defineType/clearType
members of RooAbsCategory
- Implement getIndex()/Label() that bypasses caching mechanism
o RooMappedCategory
- Complete rewrite using wildcard regular expression mapping
of labels. Hard-coded number mapping deprecated
o RooMapCatEntry
- New auxiliary class for RooMappedCategory
o RooSuperCategory
- New, functionality similar to version in RooFitTools,
but rewritten from scratch
o RooAbsReal
- Absorb caching/evaluation code of RooDerivedReal
- Absorb analytical integration support code of RooDerivedReal
- Absorb range checking code from RooRealVar
o RooAbsRealLValue
- New abstract base class for LValue reals
(.e.g RooRealVar, RooUnblind*)
o RooDerivedReal
- Retired
o RooRealVar
- Implement concrete getVal() that bypasses caching mechanism
o RooProdPdf
- New, functionality similar to version in RooFitTools,
but rewritten from scratch
Revision
2114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 3 02:15:56 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 6481 byte(s)
Diff to
previous 2033
o (Most classes)
Merge X(const x&) and X(const char*, const X&) copy constructors
into a single X(const& X, const char*=0)
o RooAbsArg
- Add 'depth-aware' client-server management functions
recursiveRedirectServers(...)
treeNodeServerList(...)
leafNodeServerList(...)
branchNodeServerList(...)
overlaps(...)
dependsOn(...) (now recursive)
- Add/move parameter/dependent interpretation to RooAbsArg
getParameters(...)
getDependents(...)
dependentOverlaps(...)
checkDependents(...)
- Change Clone() to Clone(const char*) and make it call
a pure virtual clone().
o RooAbsPdf
- First implementation
- Actual fitting implemented in RooFitContext
- Incorporates normalization technology from
RooNormFunction (now retired)
- Separate getValNorm() dropped in favour of
getVal(const RooDataSet* =0)
- getVal(...) provides all owned proxies with
the correct data set (which they need for their
value cast operators that don't take an RDS)
o RooFitContext
- First implementation
- Owns a clone of a dataset and a PDF and ties them
together with a redirectServers
- Caches indexed parameter list for fast Minuit lookup
- global Optimizer function seeks out PDF components
that only have constant parameters and add these
as precalculated columns to the data set clone
(redirectServers edits PDF tree to point to cache)
o RooDataSet
- Implement addColumn(RooAbsReal) that adds a column
of precalculated values given function for each
row of the data set
o RooAbsReal
- Change getVal() to getVal(const RooDataSet* set=0)
to allow dynamic normalization for PDFs.
o RooArgProxy and dependents
- Cache last data set used, for use in getVal(...) call in
value cast operator.
o RooRealProxy
- add min()/max() functions that get out the integration limits
if the underlying real is a RooRealVar. (Needed by RooAbsPdf
analytical integration implementations)
o (Most classes)
- A large number of minor fixes have been applied to make
the Solaris 5.7 compiler happy
Revision
2004 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 19 01:42:27 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 7152 byte(s)
Diff to
previous 2002
o RooDerivedReal:
- Extend analytical integral interface so that function can,
given a list of reals and categories, indicate which subset it
can analytically integrate / efficiency sum.
o RooRealIntegral
- Can now perform combined analytical/numerical integration.
The RooDerivedReal is asked for the largest part it can
analytically integrate/sum, the rest is taken care of numerically.
The actual numerical integration algorithm is migrated into
a dedicated class.
RRI now also handles higher dimensional numerical integrals,
provided there is a integrator class available for that
o RooAbsIntegrator (new)
Abstract base class for numerical integrators
o RooIntegrator1D (new)
Implementation of 1-dimensional numerical integrator that
used to be implemented in RooRealIntegral
Revision
2002 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 18 20:38:03 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 8759 byte(s)
Diff to
previous 1910
o Add RooMultiCatIter, which iterators over all permutations
of states of a list of RooCategories
o Implement summing part of RooRealIntegral, using RooMultiCatIter
o Add RooNormFunction, an autonormalizing function, which defines,
in addition to the inherited getVal(), getNorm() and getValNorm().
o Miscellaneous fixes to make shape/value dirty propagation work
correctly for integrals and normalized functions.
Revision
1910 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Sun Apr 8 00:06:49 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooRealIntegral.cxx
File length: 8463 byte(s)
o Another major round of const-correctness improvements
o Add RooDerivedReal as an intermediates class between
RooAbsReal and RooRealFormula,RooRealIntegral,RooUnblind*
the getVal() -> cache check -> traceEval() -> evaluate()
chain has been moved into this class.
Derived Classes of RooDerivedReal only need to implement
evaluate() for contents definition. The getVal() of RooAbsReal
return the straight contents of _value.
o Added RooRealIntegral class, which represents the integal and/or sum
over various RooRealVar/RooCategory dependents of a generic RooDerivedReal
Integral value is cached and updated when the value of one of the
non-integrated dependents of the integrated functions changes
(detected via valueDirty bit propagation), or if the integration ranges
of one of the integrated dependents change (detected via shapeDirty
bit propagation).
If the RooDerivedReal supports analytical integration (implemented
via the getAnalyticalIntegral/analyticalIntegral functions) it's
analytical integrator is used. Otherwise a numerical integration algorithm
is used (currently limited to 1-dimensional integrations)
Summation of an arbitrary number of category dependents is supported
but not implemented yet, pending the port of RooSuperCategory, which
will support a trivial implementation.
Analytical integation interface: Each RooDerivedReal has 2 functions
implemented
- getAnalyticalIntegral(RooArgSet& integrandList),
which determines if analytical integration is supported
for the given list of integrands. If not, it returns
code 0. If yes, it returns a positive code, which RooRealIntegral
will pass to analyticalIntegral().
- analyticalIntegral(Int_t code) Performs or dispatches the
analytical integral represented by the code assigned by
getAnalyticalIntegral()
In theory, the above scheme could be implemented with just one
function, returning a pointer to a member function, but
pointer-to-members are not supported by ROOT due to portability
problems. The current scheme is inspired on the TFormula implementation
of referencing external parameters.
A default implementation in RooDerivedReal handles the default
(no analytical integration available) case.
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.
