Log of /trunk/roofit/roofitcore/src/RooAddPdf.cxx
Parent Directory
Revision
47038 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 5 15:36:18 2012 UTC (2 years, 2 months ago) by
wouter
File length: 43765 byte(s)
Diff to
previous 44507
Import last set changes from 534 patch branch
-----------------------------------------
*** r47035 ***
o RooCachedReal
- Bug fix: attach parameters of function clone to those of tracker
to retain connection with original parameters
o RooNameSet
- Implement operator<() and operator()= to allow use as key in stl::map
o RooAbsCachedReal
- Expose source clone in CacheElem as contents to facilitate correct link
redirection on cache content
- Set cached source clone and cached datahist to ADirty mode to speed up
scanning of cache when recalculating
o RooAbsAnaConv, RooTruthModel, RooResolutionModel
- Add interface to allow resolution model to return GenContext, needed
for special pdfs with custom efficiency handling
o RooAddGenContext
- Make coefficient interpretation used in GenContext not forcibly override
any existing custom choices to allow user to override default choice
with his own
*** r46916 ***
o RooWorkspace
- Increment all string buffers from 1024 to 10k
*** r46696 ***
o RooVectorDataStore
- Fix stress test failure (check _wgtVar before using it in loadValues()
*** r46691 ***
Support changes of weight variable (was no longer possible with last fix)
o RooGlobalFunc
- Add optional argument to WeightVar() that when true signifies that
given column should be reinterpreted as weight when used in combination
with the Import() of an already weighted datasets
o RooDataSet, RooVectorDataStore
- Implement support of new Import() option
*** r46666 ***
o RooDataHist
- Set importDensity to false for all constructor forms that import TH1s
(to be consistent with Import() setting)
*** r46611 ***
o RooAddPdf
- Increase size of _coefCache to 100 elements in default ctor
*** r46603 ***
o RooVectorDataStore
- In loadValues() add special handling for cases where weight name
in source and target dataset are not identical
o RooRealSumPdf
- Add flag to optionally truncate negative values to zero
o RooMinuit, RooMinimizer
- Add option to generate error status when FCN exceeds 1e30
*** r46575 ***
* RooFit Fixes from LHCb
*** r46573 ***
o RooBanner
- Increment version tag to 3.55
*** r46571 ***
o RooFitResult
- Disable default filling of legacy correlation matrix to save memory and CPU.
It wil still be filled on-demand when it is accessed
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: 43765 byte(s)
Diff to
previous 42963
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
42963 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Feb 10 16:20:26 2012 UTC (2 years, 11 months ago) by
wouter
File length: 43743 byte(s)
Diff to
previous 42536
Assorted bug fixes
o RooGaussModel
- Fix 2 minus signs in cosh convolution term for flip-side decays
(fixes Savannah #90845)
o RooSpHarmonic
- Fix in expression of partial integral (from G. Raven)
o RooProdPdf, RooAbsAnaConvPdf, RooAddPdf
- Adapt to auto-sizing AIC caches
o RooCachedReal
- Eliminate progress indicator for cache filling
o RooHistFunc
- Advertise maximum of RooHistFunc through dedicated interface
to speed up generation of pdfs that use a RooHistFunc as efficiency
o RooAbsCachedReal
- Move cache operation message from INFO to DEBUG level
o RooAbsCollection
- Inline method fwdIterator() for increased speed
o RooAICRegistry
- Use stl vector instead of static array for contents to avoid
overflow when using complex pdfs [ R. Aaij ]
o RooAbsTestStatistic
- Fix memory leak (reported on Forum)
o RooEffGenContext
- More efficient implementation using kwown maximum value of efficiency
function (if advertised) [ from G.Raven/R.Aaij ]
Revision
42536 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Dec 19 13:28:58 2011 UTC (3 years, 1 month ago) by
wouter
File length: 43787 byte(s)
Diff to
previous 42279
o RooAddPdf
- Bug fix: pdfs defined with recursive pdfs are _not_ extended. Explicit
catch and handle this scenario with new data member _recursive
- Bug fix: in expectedEvents() also handle cases where fraction need to
be transformed with range integral ratios and yields are defined by
coefficients.
Revision
42279 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 28 15:07:56 2011 UTC (3 years, 1 month ago) by
wouter
File length: 43242 byte(s)
Diff to
previous 42233
o RooRealSumPdf,RooAddition,RooAddPdf
- Fix memory leak in binBoundaries()
o RooAbsOpttestStatistic,
- In optimizeConst pass _funcObsSet rather than _dataClone->get()
to constOptimizeTerms()
o RooObjCacheManager
- Implement simplified strategy in constOptimize()
that is now possible with new data/pdf attach
scheme (can now assume that observables are always
the same objects - even after the dataset is changed)
o RooNameSet
- Reduce default array allocation from 1024 to 256 to reduce memory footprint
of complex pdfs
Increase version tag to 3.50
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: 43224 byte(s)
Diff to
previous 42171
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
41976 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 14 20:01:45 2011 UTC (3 years, 2 months ago) by
wouter
File length: 41338 byte(s)
Diff to
previous 41934
o RooAddPdf
- Fix shadowing warning
o RooAbsData
- Add non-inline accessor to static defaultStorage type to fix Windows linkage issues
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: 41332 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: 41030 byte(s)
Diff to
previous 41536
*** 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
41536 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 21 20:30:29 2011 UTC (3 years, 3 months ago) by
wouter
File length: 40953 byte(s)
Diff to
previous 39377
*** Deployment of vector datastore & miscellaneous speed improvements ***
o RooProduct,RooProdPdf,RooRealSumPdf,RooConstraintSum,RooAddition
- Deploy minimal iterator
o RooDataHist
- Add sumEntries()
o RooDataSet
- In ctor, allow choice of vector and tree data store.
- Change calls to attachToTree() to attachToStore()
- Add sumEntries() forwarding call to stre
o RooVectorDataStore
- New RooAbsDataStore implementation, based on STL vectors
rather than TTrees
o RooAbsReal
- Adjust getVal() so that clean-cache elements are processed more efficiently
- Add attachToVStore()
o RooAbsCollection,RooLinkedList
- Add minimalIterator() returning by valye a minimistic iterator (forward step only)
with a non-virtual step function
o RooAddPdf
- Deploy minimal iterator
- Skip evaluation of supplemental normalization factors if the're all one
o RooAbsData
- Add static member encoding default storage type (vector vs tree)
- Add method convertToVectorStore() to convert datasets with a tree-based store
to a vector-based store
o RooCompositeDataStore
- Implement dummy loadValues() method
o RooRealVar
- Implement attachToVStore()
o RooAbsPdf
- Deploy minimal iterators
- In getVal() also check for negative integrals as problematic value
o RooAbsArg
- Implement default version of isDerived() that always returns kTRUE
- Add pure virtual method attachToVStore()
- Deploy minimal iterators
- Implement attachToStore() which forwards to attachToTree() or attachToVStore()
depending on the storage type
o RooTreeDataStore
- Use setOperMode() with recursion where needed instead of looping manually
over branches
- Implement sumEntries()
o RooNameReg
- Add special fast handling of null pointers for conversions both ways
o RooAbsCategory
- Implement attachToVstore()
o RooRealVar
- Implement isDerived() method that was orignally in RooAbsArg
- Implement attachToVStore() that optionally attaches error buffers too
o LinkDef3, Module.mk
- Add class RooVectorDataStore
o RooAbsString
- Implement dummy attachToStore()
o RooConstVar, RooCategory
- Implement isDerived() that always returns kFALSE
o RooAbsDataStore
- Add pure virtual method sumEntries()
- Add pure virtual method loadValues()
o RooLinkedListIter
- Add class RooMinimalLinkedListIterator for forward-only
iteration without virtual function calls
- Add typedef to RMLLI
- Add non-virtual NextNV() to RooLinkedListIter
Revision
39377 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 25 16:56:49 2011 UTC (3 years, 8 months ago) by
wouter
File length: 40591 byte(s)
Diff to
previous 36230
o RooProdPdf
- Add redirectServersHook() that implements back-end of node removal
functionality (remove terms inserted by customizer labeled as REMOVAL_DUMMY)
o RooCustomizer
- Implement node removal functionality when a special REMOVAL_DUMMY target
is specified as subtitution target (high level interface provided through factory)
o RooFactoryWSTool
- Add support for "EDIT(model,node=$REMOVE)" and "EDIT(model,node=$REMOVE(nodelist)"
to remove "node" from either all occurring RooProdPdf terms in mode, or only the
ones listed in nodelist
o RooAbsArg
- Support node removal operation in redirectServers() method
o RooRealConstant
- Extend factory to also be able to create range removal dummy nodes
o RooAbsCollection
- Add 'claim counter' that can be incremented or decremented. If claim count is
non-zero, the destructor will not delete its contents, even if marked as
owning (used by new RooAbsOptTestStatistic::setData() functionality)
o RooAddPdf
- When inserting integral ratios to correct for range mismatches into coefficient projection factors
first check if ranges with different names actually represent the same range. In this case
omit the ratio factor (can result in a significant speedup)
o RooAbsData
- Add lightweight tracker of live instances to support more robust operation of RooAbsOptTestStatistic::setData()
o RooStudyManager
- Import fixes from Sven (do not automatically close PROOF session at end of runProof())
o RooWorkspace
- Add methods renameSet() and removeSet() to rename/remove named sets in the workspace
o RooAbsOptTestStatistic
- Make operation of setData() more robust: make method function properly even if currently attached
dataset is deleted _before_ new dataset is attached [ to support speedup of RooStats code ]
Revision
34138 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 25 21:03:15 2010 UTC (4 years, 7 months ago) by
wouter
File length: 39786 byte(s)
Diff to
previous 34064
o RooProdPdf
- Fix a handful of small memory leaks
o RooDataHist
- When importing data from TH1s with non-uniform binning, import by default the density
and not the absolute value.
- Add option to Import() to import absolute value instead of density (useful for histograms
with ratio-based contents such as efficiencies)
o RooAddPdf
- Bug fix in analystical coefficient integration
o RooAbsTestStatistic
- Introduce clearer error message when dataset for simultaneous fit
cannot be split due to absence of index categgory
o RooMCStudy
- Improve info messages
o RooSimWSTool
- Add handling for splits in non-lvalue category functions such as RooMappedCategory
o RooMinuit,RooMinimizer
- Change contour() code so that it restores function parameters at original values at end of call
o RooGlobalFunc
- Add optional boolean argument to Import() to support change in RooDataHist
o RooRandomizeParamMCSModule
- Fix smal memory leak
o RooHistPdf
- Fix bug in (partial) analytical integrals for cases where underlying histogram has non-uniform binning
o LinkDef3
- Add dictionary for RooCacheManager<vector<double> >
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: 39788 byte(s)
Diff to
previous 28259
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
25758 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Oct 9 16:10:42 2008 UTC (6 years, 3 months ago) by
wouter
File length: 34594 byte(s)
Diff to
previous 25351
o RooArgSet
- Fix slow memory growth reported in Savannah #41775
o RooAddPdf
- Fix crash observed by Chris West (BaBar) -- Only apply range ratio
correction if ranges are defined.
Revision
25351 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 3 09:56:04 2008 UTC (6 years, 4 months ago) by
wouter
File length: 34552 byte(s)
Diff to
previous 25209
o RooAbsReal
- In plotOn() handle specifications of multiple plot ranges: parse ranges and
translate into multiple calls of plotOn() for each individual range
- Fix bug in posterior fraction correction calculation in range plotting when
using components: fraction should be calculated based on full p.d.f. not just
of the selected components
o RooAddPdf
- Shorten informational message printed when fraction transformation are applied
- Change return value of expectedEvents() when range transformations are active so
that the expected number of events is sum(Ncomp) * frac_range.
o RooAbsPdf
- Add support for NormRange() named argument in plotOn() that allows to control range
to be used for normalization w.r.t. data separately from range that is plotted
- In plotOn() construct default plot range from fit range, even when fit ranges was a composite
range
- Add correct handling of normalization when multiple normalization and/or plot ranges
are specified
o RooGlobalFunc
- Add NormRange() method
o RooArgProxy
- Fix missing initialization in default ctor
o RooAbsOptTestStatistic
- Store fit range with unique identifier for each range component. Add chosen identifier
to list of ranges associated to string attribute "fitrange" of fitted p.d.f.
o RooCmdArg
- Add modifier methods for contents
Revision
25209 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 22 13:08:40 2008 UTC (6 years, 5 months ago) by
wouter
File length: 34342 byte(s)
Diff to
previous 25184
o RooAbsReal
- Add interface to specify hint for plot sampling binning. This is useful
for p.d.f.s shapes such as un-interpolated histogram p.d.f.s that may
not correctly converge on a good projection curve using the default
recursive division strategy without an initial hint on where to sample.
o RooHistPdf,RooHistFunc
- Implement plotSamplingHints() method that suggests to same just before
and just after each bin boundary
o RooProdPdf
- Forward plotSamplingHint() from relevant component p.d.f.s
o RooAddPdf
- Implement plotSamplingHints() that forwards hints of component p.d.f.s
and merges them if necessary
o RooRealIntegral
- Forward plotSamplingHint() from integrand
o RooAbsFunc
- Define plotSamplingHints() interface
o RooRealBinding
- Implement plotSamplingHints() method that forwards hints from bound RooAbsReal
o RooScaledFunc
- Implement plotSamplingHints() method that forwards hints from bound RooAbsFunc
o RooCurve
- Use plot sampling hints define by input function to perform initial sampling
if provided, otherwise fall back to default strategy of frame binning sampling.
o RooBanner
- Upgrade version tag to 2.90
o RooCintUtils
- Adjustment in CINT include file location
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: 33312 byte(s)
Diff to
previous 24261
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
24261 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 13 10:18:57 2008 UTC (6 years, 7 months ago) by
wouter
File length: 32389 byte(s)
Diff to
previous 23538
o RooCachedPdf RooCachedReal RooChi2Var RooAddModelRooChangeTracker RooCategory RooAddPdf
RooAdaptiveGaussKronrodIntegrator1D RooCacheManager RooArgList RooCatType RooBanner RooBrentRootFinder
RooArgProxy RooCategorySharedProperties RooAddGenContext RooCategoryProxy RooBinning RooAddition RooAcceptReject RooArgSet
- Upgrade inline documention: make sure that every member function has some descriptive comments, every
data member has a descriptive comment, make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
o RooAddPdf
- Add DIV0 protection in updateCoefficients() when running in extended ML mode
Revision
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: 27915 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
21379 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 14 15:12:29 2007 UTC (7 years, 1 month ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 26983 byte(s)
Diff to
previous 21064
o (Large number of classes)
- Systematically use Riosfwd.h in header files instead
of <iostream> or Riostream.h
- Include "Riostream.h" in implementations where necessary
- Convert remaining <iostream> to "Riostream" in implementations
- Outline all inline functions using cout or endl to facilitate
use of fwd declaration of iostreams in all classes
- Elimination of some duplicate headers
- Match use of 'using namespace std' in implementation files
to classes that actually use STL classes
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/RooAddPdf.cxx
File length: 26897 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/RooAddPdf.cxx
File length: 26719 byte(s)
Diff to
previous 20321
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
20321 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 12 15:36:38 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 26368 byte(s)
Diff to
previous 20220
o RooExtendedTerm
- New p.d.f. class that has no shape but just introduces
an extended likelihood term
o RooCmdConfig
- Add production to null pointer in decodeStringOnTheFly()
o RooAbsReal
- Fix attachment to of TTree branches that are not of type Double_t.
o RooAddPdf
- Remove forgotten debug print statements
o RooObjCacheManager
- In optimizeCacheMode() remove old snapshot of cacheObservables
only after new snapshot has been created to resolve cyclical
dependency problems where new snapshot is modeled on old snapshot.
o RooAbsPdf
- Add redirectServersHook() that clears _norm pointer
- Add checkfor null _norm object in getVal() and retrieve
new normalization object in such cases from syncNormalization()
- Migrate messages in generate() to RooMsgService
o RooMultiCatIter
- Remove requirement that input categories are lvalues as this
is not required.
o RooSimPdfBuilder
- Add check in build code that verifies that auxiliary splitting categories
used in composite splits do not depend on any other category of that
composite split, i.e. you cannot split in f(x),x, only in f(y),x
o RooMinuit
- Add protection in contour function agains Minuit failures which cause
a null TGraph pointer to be returned
o LinkDef3.h,Module.mk
- Add class RooExtendedTerm
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/RooAddPdf.cxx
File length: 26511 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
19356 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jul 16 21:04:28 2007 UTC (7 years, 6 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 29266 byte(s)
Diff to
previous 19340
o RooAbsAnaConvPdf
- Fixes for persistency
o RooAbsArg
- Change implementation of boolean attribute list to set<string>
- Add string attribute list via map<string,string>
- Add support for attachement to tree branch that has different name
then object itself through string attribute BranchName (needed
to make RooAbsData::changeObservableName work)
o RooAbsData
- Add interface for changeObservableName()
o RooAbsPdf
- Add support for Name() argument in generate()
o RooAddPdf
- Fixes for persistency (solution to Savannah #28014)
o RooExtendPdf
- Fixes for persistency
o RooGlobalFunc
- Add named argument to support RooWorkspace::import
o RooProdPdf
- Fix in default ctor
o RooTreeData
- Implement changeObservableName()
o RooWorkspace
- Add support for RenameConflictNodes, RenameAllNodes and RenameVariable
named arguments in import(RooAbsPdf&). Implement underlying support for
renaming (conflicting) branches and variables upon insertion
- Add support for RenameDataset and RenameVariable named arguments
in import(RooAbsData&)
Revision
19329 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jul 12 20:30:29 2007 UTC (7 years, 6 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 29159 byte(s)
Diff to
previous 18781
o Module.mk, Linkdef3.h
- Add new classes
o RooAbsArg
- Mark proxy, client and server lists as persistable
- Introduce dependsOnValue() function
- Implement univeral printing method based on named proxies
- Move debug tracing of function evaluation to new RooMsgService interface
o RooAbsPdf
- Make persistable: add dummy ctor, set class version to 1
- Prevent persistence of normalization cache data members
o RooAbsProxy
- Add virtual print() method to support universal p.d.f. printing
- Set class version number to 1
- Prevent persistence of normalization set pointer
o RooAbsReal
- Move plotOn() print messages to new RooMsgService interface
o RooAddPdf
- Add default constructor
- Prevent persistence of cache and cache management data members
- Fix bug in evaluate()
- Move debug tracing of function evaluation to RooMsgService interface
o RooArgProxy
- Implement print() method
- Increment version number to 1
o RooGenContext
- Add extensive informational and debug message in ctor through RooMsgService interface
o RooGlobalFunc
- Add new helper functions for RooMsgService class
o RooListProxy
- Implement print() method
o RooMinuit
- Improve verbosity control
o RooMsgService
- New singleton class that handles RooFit output in flexible way. All messages are
classified with a level (debug,info,warning,error,fatal), a topic (can be any string,
for now have defined "generation" and "plotting") and by object properties (name,
class name, base class name, or presence of specific attribute tag). Output is
filtered and processed by one or more reporting stream that can each apply different
filtering criteria and or send output to an alternate ostream or output file.
o RooProdPdf
- Add new ctor with only named argument to allow definition of
product with exclusively conditional p.d.f.s
- Add default ctor
- Increment class version number to 1
- Prevent persistence of cache and cache management data members
o RooProdGenContext
- Add extensive informational and debug message in ctor through RooMsgService interface
- Fix bug in parsing stage that did not properly handle cases like f(x|y)g(y|x)
o RooProjectedPdf
- New class of p.d.f. that represents projection (integral) of another p.d.f.
Integrals and normalizations of constructed on the fly from the original and
multiple sequential projections steps are automatically consolidated into a single
step (i.e. creating a projection of a RooProjectedPdf will result in the same
integrator configuration as creating the same projection immediately from
the original p.d.f.). Intelligent handling/forwarding of internal generator
techniques is not implemented yet.
o RooRealProxy
- Increment class version number to 1
o RooSetProxy
- Implement print() method
o RooTreeData
- Fix in createTree() routine to avoid ROOT error messages on buffer writing
o RooWorkSpace
- Initial version of new concept class that is essential starting point for the RooStats project.
A workspace is a container class that owns all components of an analysis,
i.e. p.d.f.s. functions variables and datasets. Objects imported in the
workspace are automatically cloned and internally connected to provide a
consistent working environment. Workspace also serve to persist complete
analysis projects
Revision
15668 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jul 3 15:37:11 2006 UTC (8 years, 6 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 29225 byte(s)
Diff to
previous 13432
o RooAbsCollection
- Fix bug in printLatex() : mangle both upper and lowercase options for sibling lists instead
of just uppercase options
o RooAbsGoodnessOfFit
- Forgot to put certain print statements in if (_verbose) conditionals (C.Roat)
- Order of arguments in calls to create() sometimes wrong (verbose/ncpu swapped) (C.Roat)
o RooAbsOptGoodnessOfFit
- Fix more mistakes with if (_verbose) conditionals (C.Roat)
o RooAbsRealLValue
- Remove forgotten debug print statement
o RooAdaptiveGaussKronrodIntegrator1D,RooGaussKronrodIntegator1D,RooIntegrator1D,RooIntegrator2D,
RooSegmentedIntegrator1D,RooSegmentedIntegrator2D,RooImproperIntegrator1D,RooMCIntegator
- Change initialization process of RooNumIntFactory from dynamic process on loading to
static process in RooNumIntFactor ctor as current model has problems
o RooAddPdf
- Add forgotton initializer for _refCoefRangeName in one of the constructors
o RooArgSet
- Declare writToFile() and writeToStream() as 'const'
o RooBanner
- Increment version tag to v2.08
o RooChi2Var
- Fix copy/paste error in print statements in ctor
o RooFitResult
- Put ROOT version dependent #ifdef around TMatrix forward declaration
to make it work with both ROOT4 and ROOT5
o RooHist,RooPlot
- New implementation of pullHist/residualHist from G.Raven
o RooNumIntConfig
- Add forgotten initializers of RooCategory datamembers to ctor (fixes crashes
observed by J. Rademackers)
o RooNumIntFactory
- Perform static initialization of all numeric integrator engines in the factory constructor
(fixes oberved crashes of all numeric integration and configuration business)
o RooRealVar
- Back out change that setting asymmetric error clear symmetric error and vice versa.
It causes just too much confusion...
o RooSharedPropertiesList
- Explicitly check for and handle input null pointers
Revision
13432 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 1 16:10:20 2005 UTC (9 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 29131 byte(s)
Diff to
previous 12147
o RooAbsAnaConvPdf
- Throw away cache of convCoef objects in serverRedirect (solves generator
problem reported by Gerhard)
- Follow interface change of getNormObj()
o RooAbsArg
- Add option pattern string argument to printCompactTree() that causes only
the components with names that match the pattern to be printed
- Add getCloningAncestors() utility function that returns list of pointers
to ancestors in the objects cloning history
o RooAbsGenContext
- Add auxiliary prototype variables to the _theEvent (solves generator problem
reported by Gerhard)
o RooAbsPdf
- Change getNormObj() to take both nset and iset argument so that it can
also cache fractional integrals. This is needed to support the use of
RooAddPdf objects in RooExtendPdf as fractional range intergrals of
RooAddPdfs cannot be represented as a ratio of two integrals in
a the restricted and full range divided by each other
o RooAbsReal
- Change const declaration in one of the createIntegral() declarations
o RooAddGenContext
- Follow interface change in RooAddPdf::updateCoefCache()
o RooAddPdf
- Pass both supplemental and regular normalization set to updateCoefCache() to
be able to deal with situations arising from using RooExtendPdf where the
former is a null pointer.
o RooConvGenContext
- Add auxiliary prototype variables in constructor to list of variables of model
and pdf.
- In initGenerator() resync observable lists _pdfVars and _modelVars to those
in the event that is passed to initGenerator(). Fixes generator problem reported
by Gerhard.
o RooExtendPdf
- Change way fractional integral factor is calculated in expectedEvents(): use
1-step createIntegral() procedure available through new getNormObj() interface.
This fixes a problem calculating the number of expected events in a range
of a RooAddPdf.
o RooGenContext
- Use createIntegral() interface to construct AcceptReject input function rather
than direct call of RooRealIntegral constructor.
o RooProdGenContext
- Small fix in handling of imported dependents in product parsing phase of generator context
o RooProdPdf
- Add forgotten handling of extended PDF term in selected constructors
o RooProduct
- Extend functionality so that product input terms can include RooAbsCategories as well
o RooRealVar
- Introduce concept of 'shared properties' among clones of RooRealVars. This simplifies
user handling of certain RooRealVar properties that are synchronous among all clones
of a RooRealVar. A simple demonstration:
RooRealVar x("x","x",-10,10) ;
RooRealVar* x2 = x->Clone() ;
x.setRange("signal",-1,1) ;
x2->getMin("signal") // returns -1 ;
x2->setMax("signal",5) ;
x.getmax("signal") // returns 5 ;
The sharing is explicitly through cloning and not by name, so two independently
created objects with identical names will not share properties. The sharing
of properties is retained throughout persistence and unpersistence of objects.
For now the definition of the named ranges has been moved into the
shared properties part of RooRealVar and simplifies certain common uses cases such as
RooRealVar x("x","x",-10,10) ;
RooRealVar y("y","y",-10,10) ;
// lots of code
RooAbsPdf* F ; // constructed somewhere
// more code
RooDataSet* D ; // constructed somewhere
y.setRange("signal",-1,1) ;
RooPlot* xframe = x.frame() ;
D->plotOn(xframe,CutRange("signal")) ; // RRV 'y' inside 'D' knows about "signal" through sharing
F->plotOn(xframe,ProjectionRange("signal")) ;
- Increment of RooRealVar schema version number from 2 to 4
- Explicit streamer of RooRealVar has been extended to be able to stream RooRealVar v3 objects
properly and automatically eliminate/reconnect multiple instances of identical shared property
objects that may have been created in ROOT persistence. The streamer is also capable of
reading in v1 and v2 RooRealVars for backward compatibility
o RooSimultaneous
- Modify behaviour of expectedEvents(): if index category is included in normalization set,
return sum of expectedEvents() of all components, otherwise return value of expectedEvents()
of currently selected p.d.f. (the 'old' behavior)
o RooSharedProperties
- Base class for implementation of shared property objects such as RooRealVarSharedProperty
used in RooRealVar. This class embeds a UUID that allows reconnection of multiple RooAbsArgs
to a single instance of a shared property in the unpersistance phase.
o RooSharedProperiesList
- Container class for RooSharedProperties objects that serves as repository for shared properties.
Concrete implementations of RooAbsArg that implement the shared properties concept, such as
RooRealVar, have a an instance of RooSharedPropertiesList as a static data member. This container
class owns all shared properties objects and performs their memory management through reference
counting and automatically eliminates duplicate copies of unique shared properties that many
occur on unpersisting objects
Revision
12147 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 23 11:44:37 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 28664 byte(s)
Diff to
previous 12082
o RooAbsReal
- Always fix normalization set of RooAddPdfs in plotOn() rather
than only doing it in the present of projection datasets as
there are other situations where this information is needed
o RooAddPdf
- In updateCoefCache() pass the reference normalization set
to expectedEvents() instead of the default normalization set
if the reference normalization set is filled.
o RooBanner, make_roofit_installkit
- Increment version to v2.03
o RooMath
- Add virtual dtor to eliminator warning message of g++ v4.0 compiler
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/RooAddPdf.cxx
File length: 28621 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/RooAddPdf.cxx
File length: 28655 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/RooAddPdf.cxx
File length: 28566 byte(s)
Diff to
previous 11136
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
11136 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 16 21:51:48 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 28555 byte(s)
Diff to
previous 11114
o RooAbsData
- Introduce reduce() version with named arguments.
- Supports reduced in number of variables with SelectVars()
- Supports selection of events through cut expression or RooFormulaVar with Cut()
- Supports selection of events through pre-defined cut ranges with CutRange() [NEW]
- Support selection of range of events by sequential number with EventRange() [NEW]
o RooAbsGoodnessOfFit
- Add support for fitting subsets of data/pdf combinations selected through predefined cut ranges
o RooAbsOptGoodnessofFit
- Implement fitting of data/PDF in a subrange as indicated by named ranges in RooRealVar.
Automatically select only those data points that are in the indicated range and adjust
the normalization range of the PDF variables to the selected range for the duration of
the fit. Automatically adjust RooAddPdf fraction parameters so that RooAddPdf shapes
are invariant under the normalization range change
o RooAbsPdf
- Add Named argument version of fitTo() supporting named arguments FitOpts,Verbose,Range,
Optimize,Save,Timer,Blind,Strategy,InitialHesse,Hesse,Minos,Extended,NumCPU and
ProjectedObservables.
- Add fixCoefRangeName() function to fix the interpretation of RooAddPdf coefficients
to a given fixed range for all RooAddPdf (sub) components of this PDF. Analoguous
to fixCoefNormalization()
o RooAbsReal
- Automatically plot only the fitted range of a PDF if the PDF has been fit to a subrange
of the default range and no other plot range was specified
- Eliminate RangeWithVLines named argument and introduce separate VLines named argument.
By default 'wings' are added to each RooCurve unless a Range() command is found
or a fit range is found. In that case RooCurves are not decorated. User can optionally
add vertical lines at begin and end of range by adding VLines() named argument in
combination with Range() argument.
- Implement dummy selectNormalizationRange().
o RooAddPdf
- Implement selectNormalizationRange() to propagate a fixed range for the interpretation
of RooAddPdf coefficients. Analoguous to selectNormalization()
o RooSimultaneous
- Implement selectNormalizationRange() to store fixed range in case RooSimultaneous is later
converted to a RooAddPdf for plotting purposes. Analoguous to selectNormalization()
o RooChi2Var,RooNLLVar
- Add support for fitting Chi2/NLL of subset of data/pdf as indicated by pre-defined range.
o RooCmdConfig
- Make return value of getObject() non-const
o RooDataHist, RooDataSet, RooTreeData
- Add support for reducing a RooDataHist/RooDataHist by pre-defined named ranges and sequential event ranges
o RooAbsRealLValue
- Define new pure virtual function hasBinning()
o RooErrorVar, RooLinearVar,RooRealVar
- Implement new virtual function hasBinning()
o RooGlobalFunc
- Add various new global functions for the support of newly introduced named arguments in
RooAbsPdf::fitTo(), RooAbsData::reduce(), RooAbsReal::plotOn()
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/RooAddPdf.cxx
File length: 28425 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/RooAddPdf.cxx
File length: 24546 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
8534 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 5 21:38:48 2004 UTC (10 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 24512 byte(s)
Diff to
previous 8435
o GNUmakefile
- Remove obsolete bin and binscripts targets
o RooAbsPdf
- Make resetErrorCounters() virtual
o RooAddPdf
- Add counter for coefficient >1 warning messages
and stop printing them when counter reaches zero
- Overload resetErrorCounters() to also reset
coeffient warning counter
Revision
8435 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 19 06:09:47 2004 UTC (10 years, 10 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 23994 byte(s)
Diff to
previous 6614
Preparation for V1.04 -- RooProdPdf maintance and upgrade
---------------------------------------------------------
o LICENSE, RooBanner
- Update to year 2004
o RooAbsArg
- Add DeleteWatch debug feature: verbal notification
if an object with this flag is beign deleted
o RooAbsGenContext, RooGenContext, RooAddGenContext,
RooConvGenContext, RooSimGenContext, RooMCStudy
- Introduce concept of auxiliary proto variables, which are
generated by other PDF components rather than an external dataset
o RooAbsPdf,RooConvolutedPdf,RooSimultaneous,RooAddPdf
- Modify genContext() to allow optional specification of auxiliary
proto variables
o RooCmdArg
- Add RooProdPdf as friend
o RooGenProdProj
- Modify so that it will work without a denominator term as well
- Fix in memory management that created hidden links between deep
cloned trees that involved RooProdPdf nodes with cached information
o RooProdGenContext
- Enhance functionality so that it can correctly and optimally
generate events for 'correlated product' PDFS. Now, irriducible
PDF terms are generated in a dependency order: 'imported
dependents', i.e. dependents over which a PDF doesn't normalize
are always guaranteed to have been generated by another term
before the importing term is generated. Left over terms wich are
cross importing cannot be disentangled with a linear dependency
scheme and are generated as a monolithic PDF. The ProdGen
context uses the new auxiliary proto variables to correctly
generate the correlation between imported and normalizing
observables.
o RooProdPdf
- Fix some outstanding link management problems
- Add new ctor with named arguments that allows to specify
correlated products
- Adjust product factorization to understand concept of 'imported'
dependents, which allows to split composite terms that would
otherwise be irriducible
- Add term grouping algorithm that groups together irriducible terms that
share dependents in mixed roles (normalizing vs imported) over which is
integrated. Such integrals can only be calculated properly if the
entire product of such terms is integrated rather than the terms
individually.
- Reorganize code a bit: break factorization, term grouping and
prefabrication of partial integral lists into several functions.
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/RooAddPdf.cxx
File length: 23952 byte(s)
Diff to
previous 6503
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
6503 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 28 20:42:41 2003 UTC (11 years, 8 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 23900 byte(s)
Diff to
previous 6447
Generalization of RooProdPdf
----------------------------
Requirement that observables of component PDFs do not overlap is eliminated.
Non-factorizing terms in normalization and projection are calculated
explicitly. The event generator is modified similarly
o RooAbsArg
- Add RooGenProdProj as friend
o RooAbsPdf
- In isDirectGenSafe() add check that observable is direct
server of pdf.
o RooGenContext
- Delegate check that internally generable observable is direct
dependent of pdf to RooAbsPdf::isDirectGenSafe()
o RooNormListManager
- Bug fix in copy ctor: When owning list is copied, also copy
contents
o RooProdGenContxt
- Modify generator context so that it can handle non-factorizing
PDF terms. These terms are now represented as sub products
that are delegated to a RooProdPdf instance that used the
generic generator context
o RooProdPdf
- Modify class so that it can handle non-factorizing PDF groups.
In calculation, irreducible non-factorizing terms are isolated
and calculated by in instance of the RooGenProdProj auxiliary class.
- Add internal generator interface for the benefit of RooProdGenContext.
Advertise direct generator capability of component PDFs for observables
that appear in only one of component PDFs.
o RooGenProdProj
- New auxiliary class for RooProdPdf to calculate normalization and
normalized projections for non-factorizing product terms.
For these groups the numerator and the denominator of the
projection are integrated before division, instead of the
other way around. Analytical integrals are used whereever possible.
o RooProduct
- New class representing the product of RooAbsReal objects,
analogyous to RooProdPdf. This version doesn't do any handling
of (partial) analytical integrals
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/RooAddPdf.cxx
File length: 23867 byte(s)
Diff to
previous 5360
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
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/RooAddPdf.cxx
File length: 23792 byte(s)
Diff to
previous 5244
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
5244 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 9 21:43:34 2002 UTC (12 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 22415 byte(s)
Diff to
previous 5212
o RooAddModel
- Add comment in code
o RooAddPdf
- Explicit handling of coefficient projection transformation
with null normalization set -> no transformation applied
o RooGraphEdge,RooGraphNode,RooGraphSpring
- Change Draw(),Print(),Read(),Paint() to draw(),print(),read(),paint()
to avoid hiding of TObject virtual methods
o RooProdPdf
- Rewrite of RooProdPdf: product is now evuated as
prod(PDF_raw) / prod(Int(pdf)) instead of prod(PDF_normalized)
to be able to numerically integrate category dependents
that are shared between product terms
--> It is now explicitly OK to share discrete dependents
o RooProdGenContext
- Handle generation of shared category dependents explicitly
o RooRefCountList
- Fix some virtual function hiding problems
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/RooAddPdf.cxx
File length: 21400 byte(s)
Diff to
previous 4982
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
4982 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jul 18 20:42:57 2002 UTC (12 years, 6 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 22165 byte(s)
Diff to
previous 4870
o RooProdPdf
- Propagate dirty state operating mode changes to
auxiliary projection integrals
o RooAddGenContext
- Recalculate PDF fractions for each event
(needed in cases where fraction changes on per-event
basis due to prototype data)
o makedocs
- Correct accidentally committed code
Revision
4808 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 2 23:36:12 2002 UTC (12 years, 6 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 22109 byte(s)
Diff to
previous 4762
o RooAddPdf
- Only use optimized RooAddGenContext in generator if RooAddPdf
doesn't depend on any prototype variables
o RooGenContext
- If a prototype dataset is used, call fixAddCoefNormalization
on generator pdf with generateVars+protoVars as normalization
choice
Revision
4762 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 19 22:37:09 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 21897 byte(s)
Diff to
previous 4761
o RooNormSetCache
- New utility class to keep track of normalization/integration
RooArgSet pointers that correspond to equivalent normalization
(Extension of simple pointer caching method)
o RooAddPdf
- Deploy RooNormSetCache in syncCoefProjList()
Revision
4761 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 19 20:59:39 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 22148 byte(s)
Diff to
previous 4698
o RooAbsPdf
- Add global switch globalSelectComp() to temporarily disable
component selection (needed to properly calculate coefficient
transformations in plotCompOn for RooAddPdfs)
o RooAddPdf
- Use globalSelectComp() to temporarily inhibit component
selection when calculating coefficient projections
- Speed up caching algorithm in syncCoefProjList()
Revision
4698 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 12 23:53:26 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 21923 byte(s)
Diff to
previous 4653
o RooAICRegistry
- Make snapshot instead of Clone of stored RooArgSets
o RooAbsPdf
- Add projected dependents option to plotNLLOn
- Add 'force' switch to selectNormalization to distinguish
user-propagated vs automatic calls
o RooAbsReal
- Change in selectNormalization
o RooAddPdf
- Use 2-tier process to check if coefficient projection
is current: 1st use pointer of nset,iset, 2nd compare
names with stored RooNameSet. Eliminates unnecessary
recreation of projection integrals if PDF is called
from more than one place
o RooBanner
- Thwart Chris Roats cash flow scheme
o RooCurve
- Change procedure to update y-range limits to properly
work with zero-shifted curves
o RooNLLBinding
- Add projected dependents options
o RooSimultaneous
- Change in selectNormalization
Revision
4653 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 3 22:15:53 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 21353 byte(s)
Diff to
previous 4542
o RooSetProxy
- Fix bug in link management in removeAll() for owning sets
o RooAddPdf
- Fix bug in syncCoefProj() - Only use actual dependents of
current normalization
o RooProdPdf
- Hide projection integrals from client/server management
Revision
4455 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri May 3 21:49:56 2002 UTC (12 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 21051 byte(s)
Diff to
previous 4372
o RooAbsArg
- Change getParameters()/getDependents() such that only
LValue leaf nodes are returned
o RooAddPdf
- Bug fix for component plotting
o LinkDef
- Add global RooConst function to dictionary
o RooRealConstant
- Change to use RooConstVar instead of RooRealVar
- Add global function RooConst() which calls
RooRealConstant::value() (shorthand notation for interactive use)
o RooProdPdf
- Avoid copying partial integral objects in cctor. Objects
will be recreated from scratch when needed
o RooConstVar
- New non-mutable constant value object (i.e. not an LValue)
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/RooAddPdf.cxx
File length: 20998 byte(s)
Diff to
previous 4300
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/RooAddPdf.cxx
File length: 20986 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/RooAddPdf.cxx
File length: 20829 byte(s)
Diff to
previous 3907
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
3406 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 6 07:06:37 2001 UTC (13 years, 1 month ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 19300 byte(s)
Diff to
previous 3344
o RooAbsRealLValue
- Adjust criterium to print out-of-range messages
o RooAddPdf
- Calculate correct supplemental normalizations (for
sums of components with different sets of dependents)
in projection integrals
o RooProdPdf
- Change constructor signature (RooArgSet&) -> (const RooArgSet&)
o RooSimultaneous
- Forgot to forward projection data in plotOn() to RooAddPdf
plot variable
Revision
3342 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Dec 1 08:12:48 2001 UTC (13 years, 1 month ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 18292 byte(s)
Diff to
previous 3322
o RooAbsCollection
- Add selectByName() member that accepts a comma separated list
of wildcard patterns to create a subset filled with the matching
elements
o RooAbsData
- Fix typo in print message
o RooAbsPdf
- Add new plotCompOn/plotCompSliceOn methods that take
a string wildcard expression or argset of components
to plot. Selected component may occur at any level in
the PDF tree
- Add component selector flag bit to support new component
plotting scheme
o RooAddPdf
- Change evaluate() to only include PDFs that have their
selection bit raised
- Remove old plotCompOn methods()
o RooFitContext
- Store asymmetic errors in parameter RooRealVars, if they
are available
o RooMCStudy
- Adapt to changes in RooRealVar. Ensure persistence of
symmetric and asymmetric errors of RRVs in parameter dataset
o RooRealVar
- Add asymmetric errors and accessor/modifier functions.
Asym. errors are stored and managed independently from
the existing symmetric error
- Introduce hasError(), hasAsymError() functions indicating
if an error has been set to the object.
- Adapt writeToStream/readFromStream to process asymmetric
errors. Split 'L(lo-hi:bins)' token in 'L(lo-hi) B(bins)'
tokens so that bin specification becomes optional. Change
logic for error printing: instead of requiring
(!constant || error>0) simply require hasError()
- By default no longer persist error(s) along with value
when attached to a dataset. To request persistence of
symmetric error, set "StoreError" attribute. To request
persistence of asym. error, set "StoreAsymError" attribute.
o RooSimultaneous
- Deprecate specialized plotCompOn/plotCompSliceOn functions
- Modify regular plotOn to plot a temporary RooAddPdf, with the
coefficients determined from the fractions of the index
state occurring the in the prototype dataset
Revision
3217 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 15 08:46:31 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 20254 byte(s)
Diff to
previous 3212
o RooAbsReal
- in plotOn(), print one line comment about
projections performed with data
o RooAddPdf
- Take care of normalization descrepancies when adding PDFs
with a different number of dependents.
o RooFitContext
- Fix spurious optimizer problem when both PDF branch caching
and dataset trimming are enabled
o RooHistPdf
- Add dummy return value for getPoissonInterval() to make Solaris
CC5 happy
Revision
3212 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 14 18:42:38 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 17616 byte(s)
Diff to
previous 3181
o RooAICRegistry
- Tighten conditions for reuse of slots (loose conditions
caused problems for certain projections)
o RooAbsCollection
- Add equals() method to check if two collections have similar
contents
o RooAbsPdf
- Add isDirectGenSafe() method. This code is transplanted from
RooGenContext and determines if a PDF depends via more than
one path on a given dependent. It is put here so that certain
classes (RooAddModel) can override the default implementation
o RooAbsReal
- Add getVal(const RooArgSet&) that forwards to getVal(const RooArgSet*)
o RooAddModel
- Add getGenerator(),initGenerator(),generateEvent() implementing
distributed direct generation if all components support
direct generation of the given set of dependents.
- Overload isDirectGenSafe() as forwarder function to its components
- Fix memory leak in syncNormalization when used as regular PDF
o RooConvolutedPdf
- Minor modifications to verbose messaging
o RooDataHist
- add get(const RooArgSet& coord) to retrieve the bin center
coordinates of the bin enclosing the supplied coordinates
o RooGenContext
- Use RooAbsPdf::isDirectGenSafe() to determine which dependents
are safe for direct generation
o RooSimGenContext
- Fix generation with derived index category from prototype
o RooSimultaneous
- In genContext(), fix algorithm to detect when specialized
RooSimGenContext is appropriate
o RooTruthModel
- Fix analytical integrals with tau=0
Revision
3124 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 27 22:28:23 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 17384 byte(s)
Diff to
previous 3078
A large number of small fixes and improvements
o Roo1DTable
- Modify Print() behaviour. Standard print will
only show non-empty fields, verbose shows all fields
o RooAbsArg
- Change getParameters so that it can accept 0 as
dataset pointer (implies no dependents)
o RooAbsPdf
- Follow plotOn() changes in RooAbsReal
o RooAbsReal
- Add optional const RooArgSet* projData argument to
plotOn(). Projected dependents that appears in this
dataset, if specified, will be projection via summation
over data instead of integration.
- Add clipInvalid option to bindVars() and propagate to
RooRealBinding
- Modify cleanBranchName() to truncate 'clean names'
(which are used for the TTree branch) to 63 chars
as cannot handle such cases (SEGV). In case name
is longer than 63 chars, truncate name at 46 chars
and suffix with _crc followed by hex representation
of CRC32 checksum of the full name.
- Add crc32() method to calculate the checksum of a string
o RooAddModel,RooAddPdf
- Do not evaluate PDF components multiplied by a zero coefficient
o RooAddPdf
- Fix DIV0 in analyticalIntegral if number of expected events
for all PDFs combined totals zero
o RooArgSet
- Add ability to readFromStream and readFromFile to optionally
flag read arguments with a user specified attribute
(Mostly useful to determine which elements have _not_ been read)
o RooConvolutedPdf
- Change declareBasis() signature from a RooArgSet& to a RooArgList&
to correctly handle cases where the names of parameters are identical
(e.g. tau=zero and dm=zero for prompt background models)
- Expand logic in RooGenContext. Add additional requirement for
use of optimized generator context: both the physics pdf and
the resolution model must support direct generation of the
convolution variable.
(Still have to fix RooAddModel/Pdf for cases where all components
can do direct generation)
o RooCurve
- Deploy RooRealBinding::clipInvalid feature to zero plotted functions
outside the validity range of their dependents
- Add extra points at (xlo,0) and (xhi,0) to obtain correct filling
pattern when using the 'F' draw option.
o RooCustomizer
- Add warnings for multiple split or replace rules on the same leaf
o RooDataSet
- Make read() take a const RooArgList& instead of a RooArgList&
and immediately make temporary copy for internal use.
- All constructors with string based cut: add default empty cut.
o RooFitContext
- Ctor: Compare limits on dependents in PDF and dataset if limits
of PDF are smaller and fully contained in those of the dataset,
adjust the dataset ranges in the internal copy and reject events
outside the PDF limits. If PDF ranges are not identical or fully
contained in dataset limits, give error message and abort.
- In fit() fix handling of parameters handed to TMinuit: set pmin/pmax
to the parameter value for constant parameters. For floating parameters
with open limits and without error, use 1/10 of the plot range
instead of 1/10 of the fit range.
o RooFormula,RooFormulaVar
- Change RooArgSet to RooArgList to pass formula parameters.
This allows construction of formulas with ordinal references
for list of parameters with multiple occurrences of the same
variable.
o RooRealBinding
- Add clipInvalid option, specified in ctor. If set, loadValues()
will first check if the values to be loaded are in the limits
of the bound objects dependents. If not the values are not loaded
and an invalid flag is set. If the invalid flag is set operator()
will return 0.
o RooRealVar
- Add various 'named parameter' functions on a trial basis
o RooSimFitContext
- Gracefully handle RooSimultaneous PDFs with missing PDFs.
o RooSimGenContext
- Forgot to set index state in theEvent RooArgSet when generating
the index category
- Remove forced normalization of index state in evaluate()
- Remove dummy plotOn() method and specialized plotOn() with data
method as projection over the index state can now be handled
the regular plotOn method. Overload RooAbsPdf::plotOn to
force caller to specify projection dataset for the index category
if projection over the index category is requested
o RooTable
- Remove print(), add default Print(Option_t *), and reimplement
printing via inheritance from RooPrintable
o RooTreeData
- In loadValues(RooTreeData*) explicitly check isValid() of
each element of _vars after copying. If any is invalid,
reject the event.
- In table() change simple clone of tableVar to deep clone.
Implement use of optional cut string (accidentally omitted sofar)
o RooTruthModel
- Add highly trivial direct generator for the convolution variable
o RooDataProjBinding
- New lightweight binding between an RooAbsReal and a dataset
that returns the projection of the real over the dataset
via summation. If the dataset only contains category variables
an supercategory of all the datasets categories is created
and the data is summed (with appropriate weights) over the
supercategory states instead of over every event.
Revision
3078 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 22 07:12:14 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 17047 byte(s)
Diff to
previous 3077
Complete checkDependents method
-------------------------------
o RooAbsArg
- Implement recursiveCheckDependents() which calls
checkDependents for every tree node and returns
the summary error status
o RooAbsGenContext, RooFitContext
- Use new recursiveCheckDependents before starting
fit/generstor
o RooProPdf
- Implement checkDependents that verifies that no
PDF pair has overlapping dependents
o RooAddPdf
- Remove call forwarding, now handled by recursiveCheckDependents()
o RooFormulaVar,RooGenericPdf
- Remove obsolete checkDependents() functions
Complete PDF extended mode interface
------------------------------------
o RooAbsPdf
- Add new virtual extendMode() function that can
return CanBeExtended, CanNotBeExtended or MustBeExtended
- Add inline wrapper functions canBeExtended() and mustBeExtended()
o RooAddPdf
- Changed to implement new extendMode(). State is either
CannotBeExtended (n-1 coefs) or MustBeExtended (n coefs
or no coefs)
o RooProdPDf
- Changed to implement new extendMode(). Forward extendMode()
of single extendable PDF, or return CannotBeExtended if
there is no extentable PDF
o RooSimultaneous
- Changed to implement new extendMode(). Return CanBeExtended
if all PDFs can be extended. Return MustBeExtended if any
of the PDFs must be extended. Return CanNotBeExtended otherwise
o RooFitContext, RooAbsGenContext
- Use new extendMode() to abort fit/generator if PDF mode
is incompatible with request
Miscellaneous
-------------
o RooListProxy,RooSetProxy
- Invert error status in case of empty list/set (gave always an
error instead of always suppressing it)
Revision
3015 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 12 01:48:47 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 17123 byte(s)
Diff to
previous 3002
New optimized generator contexts for RooAdd/Prod/SimPdf
-------------------------------------------------------
o RooAbsPdf,RooProdPdf,RooAddPdf,RooSimultaneous
- Introduce protected virtual function genContext()
which returns the appropriate generator context
for that PDF:
RooAbsPdf --> RooGenContext
RooProdPdf --> RooProdGenContext
RooAddPdf --> RooAddGenContext
RooSimultaneous --> RooSimGenContext
o RooAbsGenContext
- New abstract generator context
o RooGenContext
- Make inherit from RooAbsContext
o RooAddGenContext
- New optimized generator context for RooAddPdf
that generates the components separately
o RooSimGenContext
- New optimized generator context for RooSimultaneous
that generates the components separately
o RooProdGenContext
- New optimized generator context for RooProdPdf
that generates the dependents of each components
separately and then merges them
Dataset enhancements
-------------------
o RooDataHist
- Add constructor from TH1,TH2,TH3
- Add interpolation order to weight(RooArgSet& coord,...)
function that optionally performs nth order
interpolation of the weight distribution in the
real dimensions of the dataset.
(Currently supports up to 2 real dimensions)
o RooHistPdf
- Add option to ctor to optionally interpolate
histogram contents in real dimensions
o RooDataSet
- Introduce merge() methods that adds the columns
of one or more datasets (of equal length)
Miscellaneous (fixes Remedy #5603)
-------------
o RooRealVar
- Fix output format in writeToStream(). One ')' too many
- Read '+/-' as 3 tokens due to change in parsing rules
o RooArgSet
- Change punctuation rules of parser in readFromStream
so that it doesn't break up variable names with
funny characters
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/RooAddPdf.cxx
File length: 16897 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/RooAddPdf.cxx
File length: 16736 byte(s)
Diff to
previous 2990
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
2990 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 6 06:19:53 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 16496 byte(s)
Diff to
previous 2981
o RooAbsArg
- Modify getDependents() so that it can handle a null normalization
set pointer. (will return empty set)
- Announce server redirects in verboseDirty mode
- Add nameChange flag to recursiveRedirectServers()
o RooAbsPdf
- Remove obsolete dummy functions Scan(),Parameters(),ContourPlot()
- Fix printing of PDFs in 'Standard' mode
- Add plotNLLOn(RooPlot*,...) method implementing RFTs Scan() functionality
- Add paramOn(RooPlot*,...) method implementing RFTs Parameters() functionality
- Add contourPlot() plotNLLContours method, implementing RFTs PlotContour()
functionality. Implementation is deferred to RooFitContext.
o RooAbsReal
- Add checks in frame() method that plot range is neither infinite nor zero
o RooAddModel
- Replace all existing constructors (except copy ctor) with a single
list based constructor (as done in RooAddPdf).
- addModel(), addLastModel() methods removed.
- Implement analytical integration technique performed in RooAddPdf
when model is used as an unconvoluted PDF. Implementation introduces
getAnalyticalIntegralWN(),analyticalIntegralWN(),forceAnalyticalInt(),
removes dummy getAnalyticalIntegral(),analyticalIntegral().
o RooAddPdf
- Add new constructor with PDF list only. Builds an extended sum PDF
from a list of extendable components. Coefficients of the PDFs
are calculated from each PDFs contribution to the total number
of expected events.
o RooFitContext
- Add plotNLLCountours method. Because of MINUIT initialization complications
in TMinuit::Contour, a fast minimization (Migrad only, strategy 0) is
performed on the PDF before the contour plots are made.
o RooNLLBinding
- Lightweight binding objects combines a PDF and a data set and returns
the resulting negative log likelihood as function of one or more
of the PDFs parameters
o RooNorm
- Port of RFT RooNorm class
o RooCutNorm
- Port of and extension of RFT RooCutNorm class. RFC implementation
supports cuts in an arbitrary number of dimensions.
o RooProdPdf
- Introduce support for extended likelihood fits. If exactly one
of the component PDFs can be extended, that the product can be
too (returning the extendable components expected number of events)
o RooSimultaneous
- Introduce support for extended likelihood fits. If all of the
component PDFs can be extended, than the simultaneous PDF can be too
(returning the number of expected events of the active PDF)
Revision
2981 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 5 07:01:50 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 14240 byte(s)
Diff to
previous 2887
Documentation update
--------------------
o RooAbsData,RooAbsPdf,RooAddPdf,RooProdPdf,
RooConvolutedPdf,RooResolutionModel
- Update inline documentation
Misc fixes
----------
o RooHtml
- Remove default arguments in member function implementation
(Causes solaris compiler error)
Revision
2887 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Sep 28 21:59:29 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 12979 byte(s)
Diff to
previous 2882
Overhaul of plotting (part 2)
-----------------------------
o RooAbsData
- Add new virtual function plotAsymOn(frame,asymCat,...)
for asymmetry plotting
o RooAbsPdf
- Implement plotOn() with normalization support (Raw,Relative,NumEvent)
o RooAbsReal
- Implement new plotting functions:
plotOn(frame,....) - Regular projected plotting
(overloaded in RooAbsPdf)
plotSliceOn(frame,sliceset,...) - Partially projected plotting
plotAsymOn(frame,asymCat,...) - Asymmetry plotting
(for any 'sign-type' cat. variable)
- Projection logic moved from RooCurve::ctor to plotOn(),
rearranged to use createProjection()
- Introduce some protected helper functions for plotting
plotSanityChecks(), makeProjectionSet()
o RooAddPdf
- Implement partial plotting function
plotCompOn(frame,compSet,....)
to plot any arbitrary subset of components
- Fix normalization in evaluate(), revert to default
extendedTerm()
o RooCurve
- Remove projection logic from ctor (moved to RooAbsReal::plotOn)
o RooSimultaneous
- Overload inherited plotOn() with dummy function and message for
user
- Implement plotOn(frame,RooAbsData*) which constructs a RooAddPdf
plot function, with the relative weights determined from
the supplied dataset
- Implement plotCompOn(frame,RooAbsData*,compSet,...) and
plotCompOn(frame,RooAbsData*,indexLabelList,...) to plot only
selected parts of the pdf (supplied as argSet of component
pdfs, or a string with comma separated labels of the index
category)
o RooTreeData
- Introduce dummy plotAsymOn(frame,asymCat,...)
Misc. small fixes / improvements
--------------------------------
o RooAbsCategory
- Add helper function isSignType() to determine if
given category has 2 or 3 states with values -1,0,1
o RooConvolutedPdf
- Fix potential null ptr evaluation in getAnalyticalIntegralWN()
o RooGenContext
- Comment out some unreachable code to suppress OSF compiler warning
o RooPdfCustomizer
- Generalized to work with any RooAbsArg tree.
Need to change name at some point...
o RooStreamParser
- Insert forgotten & in readInteger so that function now
actually modifies integer reference to be read
(Found by OSF compiler)
Revision
2882 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 27 18:22:31 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 11376 byte(s)
Diff to
previous 2870
Binned data reorganization
--------------------------
o RooAbsArg,RooAbsCategory,RooAbsReal,RooAbsRealLValue,RooAbsCategoryLValue,RooAbsLValue,RooRealVar
- Introduce the concept of 'fit bins' for the purpose of binned fits
So far we have been abusing the plot bins for this purpose but this
will ultimately lead to confusion
RooAbsLValue now defines 5 abstract methods to access the fit bin interface
setFitBin(), getFitBin(), numFitBins(), getFitBinWidth(), createFitBinIterator()
which are implemented in RooAbsCategoryLValue and RooAbsRealLValue
RooRealVar holds the fitBins data member.
o RooDataHist
- Change to use fit bins and range instead of plot bins and range for
binning a dataset
- Add new sum() methods implementing full and partial summation of
of the dataset contents, optionally accounting for bin volume correction
o RooHistPdf
- New PDF constructed from a RooDataHist implements n-dimensional
PDFs constructed from an equivalent histogram. All dimensions can
be either real of discrete
- All partial and full integrations are implemented using the new
RooDataHist::sum() methods.
Plotting reorganization (part 1)
--------------------------------
o RooPlot,RooHist,RooCurve,RooPlotable
- Store the two components of the normalization #events and binWidth
seperately
- Replace getFitRangeNorm() method with getFitRangeNEvt() and getFitRangeBinW()
methods
- Adapt updateFitRangeNorm() to store components of normalization separately
o RooAbsReal ( & RooSimultaneous)
- Add extra enum to plotOn() indicating interpretation of given scalefactor
Raw -> Apply scale factor without any other adjustments
Relative -> Apply scale factor after default normalization adjustment (old implementation)
NumEvent -> Interpret scale factor as number of events to normalize to
For RooAbsReals that are not a RooAbsPdf, the Raw procedure is always applied
Some more reorganization will follow in this area
o RooFormulaVar
- Take out dummy analytical integration definition now that plotOn will do the
right thing by default
Misc. fixes
-----------
o RooAbPdf
- Fix normalization bug in analytical integration by introducing overloaded
analyticalIntegralWN, which returns analyticalIntegral()/getNorm()
instead of just analyticalIntegral()
o RooAddPdf
- Eliminate now obsolete addPdf() and addLastPdf() member functions
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/RooAddPdf.cxx
File length: 11769 byte(s)
Diff to
previous 2853
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/RooAddPdf.cxx
File length: 10679 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/RooAddPdf.cxx
File length: 10661 byte(s)
Diff to
previous 2820
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
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/RooAddPdf.cxx
File length: 9546 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/RooAddPdf.cxx
File length: 5372 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/RooAddPdf.cxx
File length: 5370 byte(s)
Diff to
previous 2778
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
2778 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 4 01:37:42 2001 UTC (13 years, 4 months ago) by
david
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 5557 byte(s)
Diff to
previous 2724
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)
RooFormula:
- replace RooArgSet::Clear() with removeAll() in actualDependents()
- replace InheritsFrom() with dynamic_cast in DefinedValue()
RooFormulaVar:
- implement getAnalyticalIntegral() and analyticalIntegral() as no-ops
to avoid problems with formulas that integrate to zero over their fit range.
*** does selfNormalized() actually work with RooRealIntegral ??
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/RooAddPdf.cxx
File length: 5531 byte(s)
Diff to
previous 2626
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
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/RooAddPdf.cxx
File length: 5552 byte(s)
Diff to
previous 2397
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
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/RooAddPdf.cxx
File length: 5550 byte(s)
Diff to
previous 2222
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
2129 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Mon May 7 06:26:14 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAddPdf.cxx
File length: 4316 byte(s)
o RooAbsPdf: change logic in getVal()
- Results of getVal(0), i.e. without normalization, are no longer
cached as this caused interference between getNorm() and getVal().
o RooAbsReal::plot(): use deep clone and recursiveServerRedirect
instead of shallow clone
o RooPlot
- Fix dimension to 1. This is (surprisingly enough) not done
in TH1, but always in the TH1(F,C,...) implementation classes,
so RooPlot should do this as well. This fixes intermittent plotting
problems where 1D distributions were plotted in a >1 dimensional frame
- Assign unique name to TH1 object as assigning the same name ("frame")
will cause ROOT to re-use the existing object. This might lead to
unexpected results (I think...)
- Use deep cloning of plotVar in RooPlot(RooAbsReal) ctor
o RooAddPdf
- First implementation (functionality as in RooFitTools)
o RooBlindTool,RooUnblindCPAsymVar,RooUnblindCPDeltaTVar
- Moved to RooFitModels
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.
