Log of /trunk/roofit/roofitcore/src/RooAbsOptTestStatistic.cxx
Parent Directory
Revision
46156 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 25 08:40:08 2012 UTC (2 years, 3 months ago) by
wouter
File length: 32173 byte(s)
Diff to
previous 44507
*** Speedup of caching of parameterized integrals ***
o RooAbsCachedReal
- Add interface to activate option of RooAbsCachedReal to keep clone of source object in cache for faster operation
(the downside of this is that future structural changes of the source object will not be detected)
o RooCachedReal
- Implement source cloning and persistence (based on code originally in RooAbsReal::fillDataHist)
o RooAbsPdf
- in syncNormalization() activate source caching feature for parameterized normalization integrals
*** Improve robustness of level-2 likelihood optimization 'cache-and-track' ***
o RooVectorDataStore
- in cachArgs() detect cache-and-track object labeled with a CATCondSet or CATNormSet string label
and reconstitute the corresponding set of conditional observables / normalization observables
from the RooNameSet transcript in the label. Fill initial content of cache-and-track elements
with these labels with the appropriate normalization set and associate the set with the RealVector
element that is used for future cache updates.
- In recalculateCache() pick up custom normalization set for conditional product terms as specified
in cacheArgs
o RooAbsOptTestStatistic
- in optimizeConstantTerms() check for non-default normalization specifications of RooProdPdf components
and if found, transcribe the specification to the component object in a CATCondSet or CATNormSet label
so that the cache-and-track optimizer can evaluate these according to the RooProdPdf specs.
o RooProdPdf
- Make findPdfNSet() public so that RooAbsOptTestStatistic can use it.
o RooNameSet
- Add content() method as accessor to the payload.
*** Miscellaneous ***
o RooAbsGenContext
- Fix compiler warning
o RooDataSet
- In ctor import weight variable of imported dataset if no weight variable is specified
(fixes Savannah #95641)
Revision
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: 31466 byte(s)
Diff to
previous 43190
Remove
using namespace std;
from Riostream.h, which has huge consequences for all of ROOT.
Riostream.h is now a simple wrapper for fstream, iostream, iomanip for backward compatibility; Riosfwd.h simply wraps iosfwd.
Because of templates and their inline functions, Riostream.h needed to be included in headers, too (e.g. TParameter.h), which violated the assumption that Riostream.h is not exposing its using namespace std to headers.
ROOT now requires R__ANSISTREAM, R__SSTREAM, which does not change the set of supported compilers.
Without "using namespace std", several identifiers are now prefixed by std::; e.g. roofit/* source files now have a using namespace std to keep their coding style.
TFile::MakeProject() now generates "using namespace std" to convert the CINT-style class names into C++ ones.
Revision
43190 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 1 12:09:43 2012 UTC (2 years, 10 months ago) by
wouter
File length: 31444 byte(s)
Diff to
previous 42598
Import last set changes from 532 patch branch
-----------------------------------------
Fix 2 related bugs
- Handling of pdfs with conditional observables in the likelihood
- Make pdf integrals that are cached and interpolated also work
when one of the pdf observables is conditional
o RooCachedReal
- Propagate OperMode ADirty to function being cached
o RooAbsCachedReal
- Propagate OperMode ADirty to RooHistFunc that implements cache
o RooVectorDataStore
- NOCacheAndTrack will also disable caching of constant terms
o RooAbsAnaConv
- Declare original resolution model as NOCacheAndTrack to prevent
superfluous cache calculations
o RooAbsReal
- In createIntObj() set caching wrapper to ADirty if the original integral
is auto-determined to be so
o RooAbsTestStatistic
- Add debug option NCPU=-1, which amounts to NCPU=1, but run the the MP interface
o RooNormSetCache
- Fix bug in copy ctor
o RooRealIntegral
- Fix bug in autoSelectDirtyMode() - only consider value servers, not sterile servers
o RooAbsTestStatistic
- Mark conditional observables in pdf, rather than in dataset, as that is what the new
vector-data-store uses
--------
o RooVectorDataStore
- In recalculateCache() only remove projected observables if they are defined
(is more efficient when this feature is not used)
-------
o RooParamHistFunc/RooHistConstraint
- New classes representing a flexible histogram shape, and class representing a product of Poisson
constraints on each of these bins
Revision
42598 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 12 14:48:11 2012 UTC (3 years ago) by
wouter
File length: 31205 byte(s)
Diff to
previous 42279
o RooDataHist
- Add support for inverse bin volume corrected, needed for RooHistPdf
o RooHistPdf
- Use inverse bin volument correction in partial analytical integrals for correct calculation
(bug reported by G. Raven)
o RooDataSet
- In legacy tree-based constructors, also convert data store to vector-type if that
is set as the default storage type
o RooAbsOptTestStatistic
- Disable level-2 optimization (cache-and-track) if storage class of dataset is not RooVectorDataStore
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: 30592 byte(s)
Diff to
previous 42178
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
42178 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 22 22:01:30 2011 UTC (3 years, 2 months ago) by
wouter
File length: 30598 byte(s)
Diff to
previous 42171
o RooProdPdf, RooProduct,
- Fix windows compilation
o RooGenContext
- Use fast assign in generate()
o RooAbsReal
- Disable two rarely used debug options in traceEval() to increase speed
o RooAbsCollection
- In assignValueOnly() also pass the valueOnly flag to copyCache()
o RooAbsTestStatistic
- Fix memory leak in 'slow split' mode
o RooAbsData
- Modify copy ctor of dataset with owned components to also clone
owned components so that 'fast split' support is retained after clone
o RooCompositeDataStore
- In copy ctor, explicitly take ownership of cloned components
- Add accessor method indexCat() to facilitate new RooAbsData cctor
o RooAbsOptTestStatistic
- Add flag to keep track if test statistic is already in optimized mode.
If so, ignore subsequent reoptimization requests.
- Add flag in setDataSlave() to take ownership of incoming dataset
(needed for 'slow split' memory management)
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: 29879 byte(s)
Diff to
previous 41752
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
41730 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 2 16:54:15 2011 UTC (3 years, 2 months ago) by
wouter
File length: 27374 byte(s)
Diff to
previous 41710
o RooProdPdf
- Add method getConnectedParameters() that only reports
parameters that are connected to the pdf (and ignore
those occuring only in constraint terms)
o RooAbsOptTestStatistic
- For test statistics built from RooProdPdfs only list
'connected' parameters as TS parameters, to avoid needless
recalculation of likelihood components due to the present
of irrelevant constraint terms
Revision
41709 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 2 11:22:01 2011 UTC (3 years, 2 months ago) by
wouter
File length: 26794 byte(s)
Diff to
previous 41703
o RooTreeDataStore
- Introduce explicit alternate buffer handling in loadValues
making this function robust for copying datasets that
are attached inside test statistics
o RooAbsOptTestStatistic
- In copy ctor, use internal clones of pdf and data as input
rather than the original pdf and data pointers stored in
the source object
Revision
41703 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 1 22:47:22 2011 UTC (3 years, 2 months ago) by
wouter
File length: 26695 byte(s)
Diff to
previous 41676
o RooVectorDataStore
- Correct version this time (with proper support for persistent)
o RooAbsOptTestStatistics
- Initialize all pointer data members in all ctors
o RooCompositeDataStore
- Implement sumEntries() as forward to components
o RooAbsArg
- Another fix for windows static linking
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: 26384 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: 28682 byte(s)
Diff to
previous 39919
*** 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
39817 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 18 12:49:41 2011 UTC (3 years, 7 months ago) by
wouter
File length: 28571 byte(s)
Diff to
previous 39377
o RooDataSet
- Introduce pool-based memory allocation scheme
- In ctor for composite datasets with Link() ensure that
order of observables is preserved to allow use of assignFast()
o RooRealSumPdf
- Use getNorm() in expectedEvents() rather than createIntegral()
o RooAbsCollection
- Do no allocate hash tables by default
- Introduce contents claim counter to counter 'foreign' ownership
claims of contents (needed for RooAbsOptTestStatistic::setData()
support)
- If collection is owning, only delete contents if claim count is also zero
- In snapshot() raise hash table threshold from 100 to 1000
o RooRefCountedList
- Disable hash tables by default
o RooStudyPackage
- Make study package own clone of incoming workspace
- Implement copy ctor
o RooAbsTestStatistic
- Implement 'master' setData() method. Forward to setDataSlave()
of self for monolithic likelihoods or forward data components
to likelihood components in case node is SimMaster. If data
is not fast-splittable, execute slow split.
o RooAbsData
- Implement 'live check' to be able to conclude if a given dataset
pointer points to a live or dead object
- Claim contents of _vars through new claim mechanism. Release
in dtor, allow _vars to delete contents if claim count is zero
- Add concept of owned component datasets to support fast-splitting
of dataset
- Add method canSplitFast() that indicate if fast split is available
(only possible if dataset was created as composite)
- Add method getSimData() that retrieves pointer to component
RooDataSet representation for a given index state
o RooObjCacheManager
- Add static mechanism that allows to deleted cached observables lists used for
cache optimization triggers to be deleted on a sterilize() action. This
is useful on toy studies with setData() operation, that would otherwise
collect very large lists of observable clones during the toy cycle.
o RooAbsPdf
- Set contraint term to ADirty to avoid synchronization problems when using
setData() in the likelihood
o RooAbsArg
- In clone operations set hash table threshold at 1000 nodes
- In getObservables() use pass-by-value iterators rather than heap iterators
to making this faster. Also make getObservables() non-virtual, as it is in
fact not overloaded in any subclass (anymore). Also remove looping over
branch nodes to call getObservablesHook() as no class implements method
anymore.
o RooAddition
- Implement a setData() method that forwards to its components. Allows transparent
operation of setData() on likelihood objects with constraint terms
o RooLinkedList
- Add method that returns iterator by value (simply forwards to similar implementation
in RooLinkedList)
o RooSimGenContext
- Move calculation of fraction table from ctor to dedicated updateFraction() method
- Before each generation sequence call updateFractions() so that multi-generation
sequence are robust against parameter changes between calls
- In createDataSet() always make a composite dataset if the index is present, as this
allows faster use in toymc operations
o RooAbsOptTestStatistic
- Initialize all variables in default ctor
- In dtor and ctor handle ownership of dataset observables, on which we put a claim
(i.e. we need to delete contents if the test statistics survives the dataset)
- Reimplement existing setData() as setDataSlave(), and add claim management on
dataset observables. When attached new data to function, request that object caches
clear full content in sterilize() operation to avoid buildup of cache objects in
long toy runs.
- In setData() adjust event count of test statistics, for correct functioning of extended
terms after update
o RooArgSet
- In ctor for list and a single object, only add object if not already in list
(is already checked, but new procedure preserves order of list elements in case
object was already present)
o LinkDef
- Add list<RooAbsData*> and map<string,RooAbsData*> to support streaming of composite datasets
o RooAbsStudy
- Implement clone method to support polymorphic array cloning
o RooAbsReal
- Add interface method setData()
o RooProfileLL
- When storing coordinates of absolute minimum, store only those that are non-constant.
Otherwise option to restart each minimization from known absmin may alter constant
parameters
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: 28706 byte(s)
Diff to
previous 38909
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
38906 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 18 20:05:25 2011 UTC (3 years, 9 months ago) by
wouter
File length: 27242 byte(s)
Diff to
previous 37380
o RooSpHarmonic
- Fix bug in one of the constants
o RooProdPdf
- Fix memory leak
o RooFactoryWSTool
- Allow for custom postfix on automatically generated class names
o RooAbsPdf
- In getVal() clear _normSet explicitly to zero when called with nset=0
(Needed in conjuction with RooProdPdf fix)
o RooAddition
- In defaultErrorLevel() search for NLL and chi^2 like terms recursively
rather than only one level deep
o RooClassFactory
- Allow for custom postfix on automatically generated class names
o RooAbsOptTestStatistic
- Remove obsolete zero-propagation in combinedValue() that was causing
trouble in massive parallelization of simultaneously likelihoods
Revision
37380 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Dec 7 21:26:55 2010 UTC (4 years, 1 month ago) by
wouter
File length: 27217 byte(s)
Diff to
previous 36222
....Last changes for 5.28...
o RooLegendre, RooSpHarmonic
- Robustness improvements (from G. Raven)
o RooRealIntegral
- Fixes to default ctor for persistence
o RooObjCacheManager
- Fixes to default ctor for persistence
o RooAbsTestStatistic
- Fixes to default ctor for persistence
o RooAbsOptTestStatistics
- Allow sealing of test statistics
o RooWorkspace
- Handling of sealed test statistics
Revision
34064 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 22 15:05:19 2010 UTC (4 years, 7 months ago) by
wouter
File length: 25994 byte(s)
Diff to
previous 30333
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
28963 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 12 15:47:45 2009 UTC (5 years, 7 months ago) by
wouter
File length: 23172 byte(s)
Diff to
previous 28259
* roofit/roofit & roofit/roofitcore
- Update from dev/roostats branch
- Addition of RooMinimizer interface (from Alfio)
* roofit/roostats
- Minimal changes need to follow some code
changes in roofit/roofitcore
Revision
26851 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 11 22:18:27 2008 UTC (6 years, 1 month ago) by
wouter
File length: 20547 byte(s)
Diff to
previous 26333
o RooDataHist
- Add method cacheValidEntries() to calculate which bins are valid inside the
RooDataHist after the ranges of the observables have been adjusted
- Implement valid() method which return true if current bin is still inside
the defined range of the observables
- Modify sumEntries() so that only valid bins are included
o RooTreeData,RooAbsData
- Implement method valid() which returns true by default
o RooAbsOptTestStatistic
- Fix typo in print message
- Trigger calculation of valid bins in binned datasets after range
adjustments have been made
o RooNLLVar,RooChi2Var
- Only process valid bins of binned datasets
o RooFFTConvPdf
- Fix bug in cache construction: do not redirect servers of internal function
clones to global parameters that are also non-convolution observables
in the cache histogram
o RooAbsReal
- Print proper error message if a RooAbsReal is attached to a tree branch
that represents an array
Revision
26333 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 21 09:46:05 2008 UTC (6 years, 2 months ago) by
wouter
File length: 20127 byte(s)
Diff to
previous 26177
o RooAbsReal
- Add new method createProfile() to create a RooProfile object
acting on the function with a given set of parameters of interest
o RooProfileLL
- Overload createProfile() to create desired profile from original
input function rather than 'profiling a profile'
- Add accessor bestFitParams() to return parameter values
at best fit point.
- Move best fit calculation and updating from evaluate() to
separate function that can also be called from bestFitParams()
o RooMinuit
- In setWarnLevel() do not propagate to minuit if old and new warn level
are the same (doing so causes MINUIT suppressed message buffer to
be flushed even if old and new level are 'NO WARNINGS')
o RooAbsOptTestStatistic
- Remove debug data member _blah
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: 20244 byte(s)
Diff to
previous 25184
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
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: 19882 byte(s)
Diff to
previous 24247
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
24247 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 12 14:54:32 2008 UTC (6 years, 7 months ago) by
wouter
File length: 18325 byte(s)
Diff to
previous 24119
o RooAbsSelfCachedPdf RooAbsCacheElement RooAbsProxy RooAbsSelfCachedReal RooAbsRealLValue
RooAbsCachedReal RooAbsGenContext RooAbsCategoryLValue RooAbsAnaConvPdf RooAbsReal
RooAbsCollection RooAICRegistry RooAbsCachedPdf RooAbsTestStatistic RooAbsData RooAbsLValue
RooAbsFunc RooAbsPdf RooAbsArg RooAbsBinning Roo1DTable RooEffProd RooAbsRootFinder RooAbsHiddenReal
RooAbsString RooAbsIntegrator RooMinuit RooAbsCache RooAbsCategory RooAbsOptTestStatistic RooAbsMCStudyModule
- 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
- Remove a couple of obsolete member function
Revision
24119 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by
wouter
File length: 15011 byte(s)
Diff to
previous 23538
o RooAbsSelfCachedPdf
- Follow changes in RooAbsCachedPdf
o RooCachedPdf
- Add option to override default choice of cache observables
(the normalization observables) with a specific set of variables
to make it possible to also cache p.d.f values for all values
of given parameters as well.
- Forward analytical integration capabilities to actual cache p.d.f
- Forward calls on preferred observable order to cached p.d.f
o RooDataHist
- Add option to bin dataset in alternate binning configuration, as
specified by binning name in constructor.
- Add feature to weight() function to enforce special boundaries
when interpolating a histogram representing a cumulative distribution function.
If so, lower-side bounds are forced to zero and upper-side bounds are
forced to 1.0 instead of the default mirroring strategy
o RooMsgService
- Add new topic NumericIntegration
- Show PROGRESS level messages by default
o RooAbsSelfCachedReal
- New base class for self-caching RooAbsReal objects analoguous
to RooAbsSelfCachedPdf
o RooCachedReal
- New class to cache arbitrary RooAbsReal function objects,
analogous to RooAbsCachedPdf
o RooRealBinding
- Add feature to save and restore values of input variables,
used by RooRealIntegral to restore observable values after numeric
integration to original values.
o RooLinearMorph
- New operator p.d.f class implementing using the algorithm described
by Alex Read in NUM A 425 (1999) 357-369 'Linear interpolation of histograms'.
This class implements a generalization for continuous p.d.f
o RooAbsRealLValue
- Following changes in RooAbsLValue
o RooHistFunc
- Real-valued function modeled by external RooDataHist object, analoguous to RooHistPdf,
but without normalization support and allowing negative histogram values
o RooAbsCachedReal
- New abstract base class for caching functions, analoguous to RooAbsCachedPdf.
o RooFracRemainder
- New dedicated helper class to calculate the remainder fraction of a RooAddPdf, i.e. 1-sum(i)x_i
for a given RooArgSet x
o RooCustomizer
- Fix memory management issue for sterile use
o RooAbsCategoryLValue
- Follow changes in RooAbsLValue
o RooNumCdf
- Specialization of RooNumRunningInt to calculate running integrals of p.d.f.s:
the running integral is by construction normalized to one exactly, taking out
any possible imprecisions in the regular integral calculation and by imposing
special constraints on the RooHistFunc that models the output so that the boundaries
are constrained to exactly 0 and 1 when interpolation is used.
o RooFFTConv
- Fix bug in cache naming algorithm
- Follow changes in RooAbsCachedPdf
o RooChangeTracker
- New special purpose object that tracks changes in a given set of variables, used
to determine if cached p.d.fs in RooAbsCachedPdf and RooAbsCachedReal need to
be recalculated due to parameter changes. In addition to valueDirty tracking,
an explicit comparison can be made to stored reference values of variables,
to avoid recalculation of expensive quantities in case a valueDirty is propagated
even if the value did not change (this can e.g. happen when you step though
a RooDataHist where usually only one of the observables changes value, but
all observables propagate a valueDirty every time)
o RooHist
- Bug fix in makeResidual()
o RooAbsReal
- Fix small memory leak in createIntegral
- Expand functionality of fillDataHist: optional correction for binVolume
when filling, and optional progress indication.
- Modify logEvalError() so that when cumulative logging for Minuit is disabled
that messages are printed through the standard message logging service.
- Modify error logging so that name of objects are stored in addition to
pointers so that delayed logging of errors of (cache) objects that no
longer exists can be performed correctly.
- Add virtual function preferredObservableScanOrder() to indicate preferred
order in which multi-dimensional functions should be scanned into a
RooHistPdf, which may matter greatly for the performance of certain
p.d.f.s like RooFFTConvPdf and RooLinearMorph
- Add new function createRunningIntegral() which constructs for a given F(x,y)
a Int[xlo,x] F(x',y) dx. The default strategy is to construct the underlying
integral with createIntegral() and adapt it with a RooCustomizer and a RooParamBinning
to a running integral. In case it concerns a one-dimensional numeric running
integral, the running integral is represented by a dedicated class RooNumRunningInt
which scans the integrand and numerically integrates the scanned histogram
o RooAbsCollection
- Bug fix in nameFieldLength handling of print routine
o RooAbsCachedPdf
- Introduce explicitly the strategy that the cache contains the _normalized_ p.d.f. values,
so that no postior normalization integral is required. This has the added advantages that
the cache p.d.f can be instructed to consider itself normalized skipping an explicit
normalization step in the RooHistPdf.
- Add utility function getCachePdf() and getCacheHist() to retrieve cache p.d.f and histogram
for a given choice of normalization set
- Clean up structure of CacheElem nested class by making guts private and providing accessor
function for derived CacheElem classes. Virtualize cache creation with a new member function
createCache that will allow derived classes to create a derived CacheElem.
- Forward integration handling to cache pdf actually being used
o RooDataHistSliceIter
- Follow changes in RooDataHist for alternate binning
o RooRealMPFE
- Follow changes in eval error logging in RooAbsReal
o RooAbsPdf
- Add createCdf() function to create cumulative distribution functions from p.d.f.s. This is
quite similar to RooAbsReal::createRunningIntegral() but with some c.d.f specific features
related to constraints on normalization
o RooAbsArg
- Fix bug in optimizeCacheMode()
o RooBrentRootFinder
- Improve error messaging through RooMsgService interface.
o RooCmdArg
- Expand payload from 2 to 3 strings
o RooSimWSTool
- Complete rewrite of RooSimPdfBuilder integrated with RooWorkspace for object storage.
o RooNumRunningInt
- New dedicated class to calculate running integral of any function that does not have
an analytical integral implementation. This class scans such a function in a histogram
and then numerically integrates the histogram. The filling of the histogram is performed
adaptively using a recursion division strategy with a precision cutoff to save time
of the filling of smooth functions in finely binned histograms
o RooMultiCategory, RooSuperCategory
- Minor tweak in name of proxies
o RooAbsIntegrator
- Deploy save and restore functionality of RooAbsFunc/RooRealBinding to restore observable
values to prior values after an intergration step.
o RooMinuit
- Fix gcc 4.3 compiler warning
o RooWorkspace
- Add bulk import() function taking a const RooArgSet instead of a RooAbsArg
- Add RecycleConflictNodes() option to ignore conflicts and simply recycle internal
nodes when a different external node is encountered.
- Add new accessors catfunc() for category functions, arg() for generic RooAbsArgs,
and funcArg() for fundamental arguments of any type.
- Add separate section for category functions in Print()
o RooHistPdf
- Add option to declare contents unit normalized. When activated, the analytical
integral is hardwired to 1.
- Add option to propagate cdfBoundaries mode to the underlying RooDataHist.
o RooAbsOptTestStatistic
- Optimize handling of empty rangeName specification (from Alfio)
o RooSimultaneous
- Tune proxy names
- Make p.d.f return zero, in case index category is in state where no p.d.f is assigned,
rather that assert(0)
o LinkDef3.h, Module.mk
- Add new class definitions
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: 14990 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/RooAbsOptTestStatistic.cxx
File length: 14791 byte(s)
Diff to
previous 21272
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
21081 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 27 20:59:52 2007 UTC (7 years, 1 month ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAbsOptTestStatistic.cxx
File length: 14618 byte(s)
Copied from:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx revision 21064
Diff to
previous 21064
o RooErrorVar
- Fix compiler warning on linux/gcc
o RooFormulaVar, RooAbsAnaConvPdf
- Fix for persistence
o RooGraphSpring, RooGraphEdge, RooGraphNode
- Retired, since superceded by new vizGraphTree() functionality
o RooHtml
- Retired since no longer needed
o RooAbsOptGoodnessOfFit, RooAbsGoodnesOfFit
- Renamed to RooAbsOptTestStatistic, RooAbsTestStatistic to better
cover actual functionality
o RooChi2Var, RooNLLVar
- Follow base class name change
o RooRealMPFE, RooAbsData
- Follow friend class name change
o Module.mk, inc/LinkDef[12].h
- Remove references to deleted classes, follow name changes
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/RooAbsOptGoodnessOfFit.cxx
File length: 14558 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
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/RooAbsOptGoodnessOfFit.cxx
File length: 14255 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
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/RooAbsOptGoodnessOfFit.cxx
File length: 10481 byte(s)
Diff to
previous 12082
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
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/RooAbsOptGoodnessOfFit.cxx
File length: 10509 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/RooAbsOptGoodnessOfFit.cxx
File length: 10563 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
11179 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 24 22:36:07 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 10474 byte(s)
Diff to
previous 11172
o RooBanner
- Add version number 1.9 and update copyright year
o RooAbsCollection
- Improve inline documentation of printLatex()
o RooAbsData
- Improve inline documentation of reduce()
- Improve inline documentation of plotOn()
- Add createHistogram() method that calls RooAbsRealLValue::createHistogram()
and the RooAbsData::fillHistogram()
- Improve inline documentation of createHistogram()
o RooAbsGoodnessOfFit
- Add option to split range by index category for simultaneous fits. If the flag
is set, the range for each RooSim subset is range_{indexstate}
o RooAbsOptGoodnessOfFit
- Add option to split range by index category for simultaneous fits. If the flag
is set, the range for each RooSim subset is range_{indexstate}
- Do not store fit range with PDF if fit was simultaneous fit with split range,
since definition is ambigious in that case.
o RooAbsPdf
- Improve inline documentation of fitTo()
- Improve inline documentation of generate()
- Improve inline documentation of plotOn()
- Improve inline documentation of paramOn()
o RooAbsReal
- Improve inline documentation of createIntegral()
- Add createHistogram() method that calls RooAbsRealLValue::createHistogram()
and the RooAbsData::fillHistogram()
- Improve inline documentation of createHistogram()
- Improve inline documentation of plotOn()
o RooAbsRealLValue
- Improve inline documentation of frame()
- Improve inline documentation of createHistogram()
- Add createHistogram() version that takes RooLinkedList of arguments
to facilitate chain processing in RooAbsReal/Data::createHistogram()
o RooNLLVar, RooChi2Var
- Add argument to ctor to activate SplitRange() feature for simultaneous fits
o RooCmdConfig
- Make copy of command with sub-command before doing recursive processing
o RooCurve
- Set advertised normalization count to 1 instead of to 0. Fixes normalization
problems when plotting >1 curve on a frame w/o data.
o RooMCStudy
- Improve inline documentation of constructor
- Improve inline documentation of plotParam(),plotParamOn(),plotError(),plotPull() and plotNLL()
o RooNumIntFactory
- Suppress warning messages for attempted duplicate registration of numeric integrators
o RooPlot
- In addPlotable() update _normBinWidth only if objects bin width !=0
o RooProdPdf
- Improve inline documentation, most notably remove some documented restrictions that are long obsolete
o RooTreeData
- Improve inline documentation of plotOn()
- In fillHistogram() change THx filling method from AddBinContent() to Fill() as the former does not
update the total number of entries in the ROOT histogram, leaving some plotting methods broken.
- Improve inline documentation of statOn()
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/RooAbsOptGoodnessOfFit.cxx
File length: 10415 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/RooAbsOptGoodnessOfFit.cxx
File length: 10189 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/RooAbsOptGoodnessOfFit.cxx
File length: 8816 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/RooAbsOptGoodnessOfFit.cxx
File length: 8834 byte(s)
Diff to
previous 10638
o All Classs
- Remove '#include BaBar/BaBar.hh' that was erroneously
introduced by the BaBar IOstream migration utilities
o Several class
- Initializion order changes, removal of unused variables,
addition of missing return statements to make all code
compile cleanly with '-Wall -Wno-parentheses'
o RooAbsFunc
- Make resetNumCall() const
o RooAbsIntegrator
- Add calculate() method that wrape integral() between
profiling code the track the number of integrand
function calls
o RooIntegrator1D,RooImproperIntegrator1D,RooSegmentedIntegrator1D,
RooSegmentedIntegrator2D,RooMCIntegrator
- Change interface to take RooNumIntConfig class instead
of now deprecated RooIntegratorConfig class
- Add member function that advertise capability of the integrator:
canIntegrate1D,2D,ND,OpenEnded()
o RooAbsReal
- Change normalization integral management classes
(createIntegral(), (set)defaultIntegratorConfig(),
(set)specialIntegratorConfig()) to work with new
RooNumIntConfig class.
o RooArgSet
- Add new convenience functions get/setRealValue(),
get/setCatLabel/Index(), get/setStringValue() to
manage common content of RooArgSet.
o RooConvCoefVar, RooConvGenContext
- Support class name change RooConvolutedPdf -> RooAbsAnaConfPdf
o RooCustomizer
- Add function setCloneBrancSet() that allows to specify
an external set that takes ownership of the cloned branch
nodes so that customized objects can live beyond the lifetime
of the RooCustomizer instance
o RooImproperIntegrator1D
- Add code to handle limit scenario changes (closed to open ended
and vice versa) on the fly
o RooIntegrator1D
- Add fixSteps option to terminate integral calculation after
fixed number of steps w/o extrapolation. This is more robust
for certain types of integrals
o RooRealIntegral
- Change interface to take RooNumIntConfig class instead of
RooIntegratorConfig class
- Delegate instantiation of numeric integration engines to
new class RooNumIntFactory
o RooNumIntConfig
- New class to store configuration of numeric integator engines.
This class has a brief common section with common properties
like absolute and relative precision convergence criteria,
and a section with implementation specific details for each
engine in the form of a RooArgSet. The default settings for
each existing engine are automatically added to the defaultConfig()
instance during run-time initialization
o RooNumIntFactory
- Factory class for numeric integration engines. Each existing
integrator engine automatically registers with the factory
stating its capabilities (1D,2D,ND / Open-ended). The
createIntegrator() function instantiates an integrator
appropriate for a given problem. In case more than one
integration engine can solve the given problem the (user
changable) information in the RooNumIntConfig passed along
with the call is used.
o RooGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,43, and 87 point rules in succession
until the desired accuracy is reached. Open-ended integrals are
automatically handled through a x -> 1/x coordinate transformation
o RooAdaptiveGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,31,41,51 or 61 point rule and
recursively subdivides the integration domain until the desired accuracy
is reached. For integrands with integrable singulaties the Wynn epsilon
rule can be selected to speed up the converges of these integrals. Open
ended integrals are automatically handles through a x -> 1/x
coordinate transformation
o RooNumConvPdf
- New operator PDF class that implements numeric convolution of
any two PDFs. The calculation of the convolution integrand
is implemented in the auxiliary class RooConvIntegrandBinding,
which in turn can be integrated with any 1-D numeric integration
engine. The default integration method for convolution integrals
is the adaptive Gauss-Kronrod method, which appears to give the
most stable results. By default the integration is performed
from -inf to +inf, but can optionally be restricted to a sliding
window using the setConvolutionWindow class, useful for relatively
narrow resolution PDFs.
o RooAbsAnaConvPdf
- New name of RooConvolutedPdf to clearly distinguish its functionality
from RooNumConvPdf
Revision
9370 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jul 2 07:39:04 2004 UTC (10 years, 6 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 8780 byte(s)
Diff to
previous 8538
This round of updates achieves two major goals
- Large (O(10-100)) speedup in handling of very
complex PDFS (>10000 nodes) by pervasive use
of self-expanding hash tables
- Fix outstanding problems with RooProdPdf
through new strategy to deal with cached
objects in cloning/server redirect operations
There is also a handful of minor fixes
------------------------------------------------
o RooSetPair
- New auxiliary class to store pair of RooArgSet pointers
o Roo1DTable
- Don't fill entries with zero weight
o RooAbsArg
- Add optional 2nd arg to printCompactTree() to store
output to file
o RooAbsCollection
- Initialize RooLinkedLists with hashing size threshold of 43
o RooAbsGoodnessOfFit, RooAbsOptGoodnessOfFit, RooProdPdf
- Follow changes in printCompactTree() syntax
o RooAbsOptGoodnessOfFit
- Remove all methods that implement dirty state optimization
and constant term caching (migration to RooAbsReal)
o RooAbsReal
- Various fixes in plotAsymOn fix plotting of asymmetries
in conjunction with ProjWData() and Slice()
- Add methods that implement dirty state optimization
and constant term caching (migration from RooAbsOptGoodnessOfFit)
o RooDataProjBinding
- Remove some old debug code
o RooHashTable
- New constructor option allow to choose hashing by name,
pointer or objects Hash() value
- Switch to using TMath::Hash() fast hashing method
using 'especially selected random numbers' (!)
- Add kludgy support for storage of RooLinkedListElem
and RooSetPair objects, which do not inherit from TObject.
(A full redesign of RooLinkedList and RooHashTable is needed
at some point)
o RooHist
- Fix print statement
o RooHistError
- Lower (n,m) threshold for calculation of approximate binomial
error to avoid factorial overflow problems.
o RooLinkedList
- Introduce automatically activated hashing by name and pointer
to speed up handling of long lists beyond size threshold
given in ctor (zero threshold disables this features)
- Automatically rehash tables when #entries becomes greater
than hash table size
o RooNameSet
- Sort contents upon insertion. This fixes broken operator==
for certain set comparisons
o RooNormListManager
- Add support for 'sterile' operation. If contents is sterilized
via new sterilize() member function or use of sterile copy
ctor RooNormSetCache information is retained (and thus
ordering and slot indeces used by client classes) but
stored contents associated with given iset/nset pairs
is deleted. A 'setNormList()' call that maps to a
sterilized slot will recycle that slot. Optional new argument
in getNormList will tell client that requested information
has been sterilized rather than not being there.
o RooNormSetCache
- Store set pair information in hash table of RooSetPair objects
rather than two fixed size arrays of RooArgSet pointers.
This greatly improves lookup speed (indexed by set pointers)
and automatically expands the capacity of the set cache
as is needed for very complex fits.
o RooProdPdf
- Abandon strategy to forward redirectServer requests to
cached product configurations. This strategy has turned
out to be flawed as insufficient information is available
in the redirectServers context to do the right thing
under all circumstances. Invocation of redirectServerHook()
will now sterilize the cache, using new RooNormListManager
feature
- Modify getAnalyticalIntegralWN(), which looks up cached
product configurations by index to recognize sterilized
entries. If such an entry is encountered, it is reconstituted
on the fly.
o RooRealIntegral
- Store owned clones of factorizing observables instead of linking
to instances provided in ctor as ownership related of those
turns out not to be well defined.
o RooRefCountedList
- Set hashing threshold of underlying RooLinkedList at 17
o RooSimPdfBuilder
- Increase buffer sizes of RooStringVars in set returned by
createProtoBuildConfig() to accomodate requests for ever
more complex pdf configurations.
Revision
8524 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 31 01:37:39 2004 UTC (10 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 13063 byte(s)
Diff to
previous 6351
o RooDataHist
- Fix broken copyCache() function (broke plotting of RooNLLVar
constructed from binned datasets)
o RooAbsGoodnessOfFit, RooAbsOptGoodnesOfFit
- Add printCompactTreeHook() functions to display cached
pdf configuration in printCompactTree()
o RooRealIntegral
- Update header file (forgotten in last commit)
Revision
6351 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Apr 1 22:34:53 2003 UTC (11 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 12808 byte(s)
Diff to
previous 6185
o RooAbsGoodnessOfFit
- Add protected setEventCount() method to allow
RooAbsOptGoodnessOfFit to override event count
(needed for binned datasets)
o RooAbsOptGoodnessOfFit
- Override event count in ctor via setEventCount()
o RooDataHist
- Fix forgotten initialization of some data members in
some less frequently used ctors
o RooNLLVar
- Handle RooSimultaneous index normalization properly
for binned and unbinned weighted datasets
o RooMCStudy
- Add some error handling to pull calculation when
fitModel != generatorModel: we can only calculate
a pull if a parameter appears in both models.
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/RooAbsOptGoodnessOfFit.cxx
File length: 12709 byte(s)
Diff to
previous 5505
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
5505 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 25 23:49:14 2002 UTC (12 years, 3 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 12677 byte(s)
Diff to
previous 5481
o RooAbsGoodnessOfFit
- Fix copy ctor of object in non-initialized state
- In initialization, recognize that a server redirection
may have happened between creation and initialization
o RooAbsOptGoodnessOfFit
- Bug fix: server redirection forwarding should use
recursiveRedirectServers() instead of redirectServers()
- Remove forgotted commenting out of 'protected:' in class declaration
Revision
5228 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Sep 6 22:41:29 2002 UTC (12 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 12481 byte(s)
Diff to
previous 5212
o RooAbsArg
- Reimplent client/server link storage with reference counted
lists to correctly handle server changes on the fly
- Change getDependents() to only return value-server dependents
(so that Int(gauss(x,m,s))dx doesn't list x as a dependent)
o RooAbsOptGoodnessOfFit
- Instead of switching all nodes to ADirty opermode, only
switch those that depend on the observables. (This will
leave integrals over all observables in Auto mode)
o RooRefCountList
- New class derived from THashList that implements reference
counting instead of adding multiple copies of the same object
Revision
5174 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsOptGoodnessOfFit.cxx
File length: 11372 byte(s)
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
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.