Log of /trunk/roofit/roofitcore/inc/RooRealProxy.h
Parent Directory
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: 2801 byte(s)
Diff to
previous 36848
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
36848 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 22 16:21:09 2010 UTC (4 years, 2 months ago) by
wouter
File length: 2793 byte(s)
Diff to
previous 28259
o RooRealVar
- Improve auto-assignment of initial value of only range
is given: check explicitly if range is open ended on either
side: if [-inf,inf] xinit=0, if open-ended on one side only,
assign the other (finite) boundary as initial value, if closed
assign midpoint as usual
o RooRealProxy
- Make method hasMin() and hasMax() of contents visible
o RooPoisson
- Add explicit handling of open-ended range of type [x,inf]
for normalization integral over observable
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: 2414 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/inc/RooRealProxy.h
File length: 2410 byte(s)
Diff to
previous 20879
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
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/inc/RooRealProxy.h
File length: 2747 byte(s)
Diff to
previous 19329
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
19329 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jul 12 20:30:29 2007 UTC (7 years, 6 months ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 2749 byte(s)
Diff to
previous 18735
o Module.mk, Linkdef3.h
- Add new classes
o RooAbsArg
- Mark proxy, client and server lists as persistable
- Introduce dependsOnValue() function
- Implement univeral printing method based on named proxies
- Move debug tracing of function evaluation to new RooMsgService interface
o RooAbsPdf
- Make persistable: add dummy ctor, set class version to 1
- Prevent persistence of normalization cache data members
o RooAbsProxy
- Add virtual print() method to support universal p.d.f. printing
- Set class version number to 1
- Prevent persistence of normalization set pointer
o RooAbsReal
- Move plotOn() print messages to new RooMsgService interface
o RooAddPdf
- Add default constructor
- Prevent persistence of cache and cache management data members
- Fix bug in evaluate()
- Move debug tracing of function evaluation to RooMsgService interface
o RooArgProxy
- Implement print() method
- Increment version number to 1
o RooGenContext
- Add extensive informational and debug message in ctor through RooMsgService interface
o RooGlobalFunc
- Add new helper functions for RooMsgService class
o RooListProxy
- Implement print() method
o RooMinuit
- Improve verbosity control
o RooMsgService
- New singleton class that handles RooFit output in flexible way. All messages are
classified with a level (debug,info,warning,error,fatal), a topic (can be any string,
for now have defined "generation" and "plotting") and by object properties (name,
class name, base class name, or presence of specific attribute tag). Output is
filtered and processed by one or more reporting stream that can each apply different
filtering criteria and or send output to an alternate ostream or output file.
o RooProdPdf
- Add new ctor with only named argument to allow definition of
product with exclusively conditional p.d.f.s
- Add default ctor
- Increment class version number to 1
- Prevent persistence of cache and cache management data members
o RooProdGenContext
- Add extensive informational and debug message in ctor through RooMsgService interface
- Fix bug in parsing stage that did not properly handle cases like f(x|y)g(y|x)
o RooProjectedPdf
- New class of p.d.f. that represents projection (integral) of another p.d.f.
Integrals and normalizations of constructed on the fly from the original and
multiple sequential projections steps are automatically consolidated into a single
step (i.e. creating a projection of a RooProjectedPdf will result in the same
integrator configuration as creating the same projection immediately from
the original p.d.f.). Intelligent handling/forwarding of internal generator
techniques is not implemented yet.
o RooRealProxy
- Increment class version number to 1
o RooSetProxy
- Implement print() method
o RooTreeData
- Fix in createTree() routine to avoid ROOT error messages on buffer writing
o RooWorkSpace
- Initial version of new concept class that is essential starting point for the RooStats project.
A workspace is a container class that owns all components of an analysis,
i.e. p.d.f.s. functions variables and datasets. Objects imported in the
workspace are automatically cloned and internally connected to provide a
consistent working environment. Workspace also serve to persist complete
analysis projects
Revision
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/inc/RooRealProxy.h
File length: 2788 byte(s)
Diff to
previous 11619
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
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/inc/RooRealProxy.h
File length: 2783 byte(s)
Diff to
previous 10638
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
2959 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 3 16:16:32 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 2116 byte(s)
Diff to
previous 2929
o RooAbsArg
- Minor modification in verbose dirty state messaging
o RooAbsCategory
- Recognize integer branches in non-RooDataSet trees
and attach to those in a special mode (similar to how
single precision flaots are treated in RooAbsReal)
- Modify copyCache() to recognize when copying from a
special mode RooAbsCategory. In such cases the index
is copied from the source and the label is then restored
from the destinations state list
o RooAbsCollection,RooSetProxy,RooListProxy
- Add option to remove() to match arg(s) to be removed
only by name and not by pointer in addition
o RooAbsPdf
- Modify syncNormalization() so that it accepts LValue branch
nodes in the normalization set specification.
o RooAbsReal
- Modify createProjection() to properly construct projections
with LValue dependents
- Modify plotOn() to allow plotting of LValues
o RooArgProxy,RooRealProxy,RooCategoryProxy
- Add option in ctor for proxy to take ownership of proxied object
o RooCurve
- Modify ctor to allow plotting of LValues
o RooLinearVar
- Set initial value of plot range and bins from
those of the dependent
o RooRealIntegral
- Some adjustments to LValue substitution algorithm in ctor
o RooTreeData
- Modify all ctors to use new createTree() member function
to instantiate the TTree. createTree() will cd to memory
directory during TTree ctor so that RooDataSet tree will
be memory resident regardless of the current directory
- Warn user when loading invalid values from non-RDS TTrees
Revision
2798 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 17 18:48:17 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1514 byte(s)
Diff to
previous 2655
Generalize RooArgSet to RooAbsCollection and introduce RooArgList
and corresponding proxy. Introduce RooArgList where appropriate
as replacement of a TList of proxies, eliminate all use of TList
inherited functions in RooArgSet/List.
Some optimizations implemented following profiling studies
Various fixes for compilation with Solaris CC 5.0
o RooAbsArg
- Change signature of server management function to use RooAbsCollection
instead of RooArgSet
- Add proxy management support for new RooListProxy class
o RooAbsPdf
- Disable use of RooNameSets as optimization attempt. It appears
to cost more time than it saves
o RooAbsProxy, RooArgProxy, RooAbsReal, RooAcceptReject,
RooDataHist, RooFormula, RooFormulaVar, RooGenCategory,
RooGenContext, RooGenericPdf, RooPlot, RooRealIntegral,
RooResolutionModel, RooSetProxy, RooSuperCategory, RooTreeData
- Follow RooAbsArg member function signature changes
o RooAddPdf, RooConvolutedPdf, RooFitContext, RooSimFitContext,
RooFitResult, RooPdfCustomizer, RooProdPdf,
- Change implementation from using TList to using RooArgList
o RooAbsCollection
- New abstract base class for collections of RooAbsArgs. This
class contains mostly code from the former RooArgSet implementation
o RooArgSet
- Re-implement as derived class of RooAbsCollection. A RooArgSet
cannot contain duplicates (as before), but also doesn't give
random access (by index) to its member elements
o RooArgList
- New implementation of RooAbsCollection that allows duplicates
in the list, allows sorting and lookup by index.
o RooListProxy
- Proxy version of RooArgList, similar to RooSetProxy. To be used
as data member of RooAbsArg implementation to hold external
RooAbsArg references.
Revision
2655 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 9 01:02:15 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1478 byte(s)
Diff to
previous 2626
o Many classes
- Simplify use of TString as this is suspected to cause spurious
TString memory errors
o Many classes
- Fix about a dozen of memory leaks reported by GC (mostly iterators)
o RooArgProxy,RooSetProxy
- Change order of multiple inheritance to put TObject (or derived)
first. This fixes vtable/vptr mishap on Solaris
o RooAbsArg
- Introduce dynamic_cast<> in changeNormSet() to cast the TObject
from the proxy list into a RooAbsProxy (needed in conjuction
with above change)
o Several classes
- Make destructor virtual, fix Clone() function signature to match
that of TObject
Revision
2626 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1468 byte(s)
Diff to
previous 2612
o RooTrace
- New memory tracing utility (singleton class)
o RooAbsArg,RooDataSet,RooArgSet
- Install hooks for RooTrace in ctors and dtors
o RooThreshEntry
- Fix bug in copy ctor
o RooAbsReal,RooAbsPdf
- Move analytical integration support
(getAnalyticalIntegral,analyticalIntegral,
forceAnalyticalInt,selfNormalized) from RooAbsPdf to RooAbsReal
so that every RooAbsReal can be integrated
o All RooAbsReal derived classes
- Change signature of evaluate(),getVal(),traceEval(),checkDependents()
from X(const RooDataSet* dset) X(const RooArgSet* nset)
o RooAbsPdf
- Manage normalization caching with a RooArgSet listing the dependents
instead of a RooDataSet containing this list
- Remove obsolete nLogLikelihood function (now in RooFitContext)
o RooAbsArg
- rename setProxyDataSet to setProxyNormSet
- add getParameters(),dependentOverlaps() that
take a 'const RooArgSet*'
o Roo*Proxy
- rename changeDataSet() to changeNormSet()
o RooConvolutedPdf
- Replace dummy data set for convolution normalization by an RooArgSet
o RooDataSet
- Remove inheritance from TTree, make it contain a TTree instead.
Forward all relevant TTree member functions. Add correct Clone()
function (now possible due to inheritance change)
o Various classes
- Fix const handling to eliminate Linux2 compiler warnings
Revision
2612 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 05:54:23 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1468 byte(s)
Diff to
previous 2200
o All RooAbsArg derived classes
- Change clone() to clone(const char* newname=0) to facilitate cloning with alternate names.
o RooAbsArg
- Add another layer to link management: operMode. If operMode=auto, all behaves
as before. If operMode=AClean, the arg assumes the cache is always clean and
getValueDirty() will always return false. If operMode=ADirty, the arg assumes
the cache is always dirty and isValueDirty will always return true.
The ADirty and AClean modes are used by the optimizer in the fit context
to shut down link management (and save time) for cases where the arg is
always dirty after a dirty state propagation from one of the dependents.
The AClean mode is used similarly for args that are cached in the dataset
The setOperMode() member is protected as care should be taken in switching modes.
It is the callers responsability to ensure that the claimed state (especially
in case of AClean) is indeed correct.
- Split setValueDirty(Bool_t flag) in setValueDirty() and clearValueDirty().
The latter is trivial and can be inlined to save time.
- redirectServers() now has an optional nameChange flag that allows to reconnect
to servers with different names. If the option is enabled, a link will be reconnected
to the server with a 'ORIGNAME:<servername>' attribute instead of a server with <servername>
This feature is used by RooPdfCustomizer.
- Added recursive printDirty() member that listed dirty state of arg and all its servers.
- Add sorting capability by implementing IsSortable() and CompareTo() members.
Sorting will result in alphabetical ordering by object name.
o RooAbsCategory
- Change tree attachement: store both label and index fields in tree instead of
just the index field. Looking up the corresponding label turns out to be rather
expensive, especially if many state are defined.
- The postTreeLoadHook() mechanism that formerly implemented the index lookup
has been abandoned completely (save 1 virtual function call per data set load).
o RooAbsPdf
- Change function call structure of eval tracing a bit to reduce the number
of calls per trace from virtual calls to 1 concrete call.
- In syncNormalization, if the data sets are different, first check if they
also have a different contents before processing the change. (Save multiple
identical normalization calculations for cases were a resolution model is
shared by >1 RooConvolutedPdf. (WVE Caveat: this has some problems: code will
die if cached data set is deleted before pdf. Will fix this soon)
Install pre- and postSyncNormalizationHook functions that can be used to customize
the call. Used by RooConvolutedPdf to create/update dummy data sets used to
push down partial integrations to the convolution integrals.
- Move nLogLikelihood to RooFitContext
o RooAbsReal
- in attachToTree(), mangle name of object in tree to exclude math symbols that
are interpreted by root in certain circumstances
o RooAddModel
- Store coef and proxy iterators in class instead of creating them on the fly each
time in evaluate()
- Release ownership of proxied resolution models in the copy constructor. If the
AddModel is copied, the proxied components will be owned by the list created
by RooArgSet::snapshot().
- Include name of AddModel owner in component resolution model to avoid multiple
identically named object in certain PDF configurations
- Export 'master list' of combined normalization leaf node servers of all components.
The convolutedPdf needs this for it's own dependency calculation
o RooArgSet
- Add silent option to remove()
o RooCatType
- Store name in char[] instead of in TNamed::fName (a TString) so that
the name can be attached to a Tree. (A TString is not a TObject)
o RooConvolutedPdf
- Push integration of all dependents that do not overlap with the coefficients
to the convolution integrals, instead of just the convolution variable
o RooDataSet
- Add new constructor that allows to specify the cut as a RooFormulaVar object
instead of a string. This allows to cut on function arguments that are not
part of the data set
- Allow to switch off dirty state propagation after a row-load operation
(can be used in certain optimization scenarios)
o RooFitContext
- Add option to not clone either dataset or pdf on construction
- Remove non-RooRealVar parameters from master parameter list to prevent that
MINUIT chokes on them
- Sort minuit parameter list alphabetically
- Add cache optimization option, which shuts down all link management for the
all pdf value components (not normalization). This can save a significant amount
of time, especially for very complex PDFs as the number dirty propagations scales
with the square of the number of nodes. Use newly introduces AClean and ADirty
modes to ensure proper evaluation of PDF nodes
- Add option to execute migrad with 'strategy 0', which skips the evaluation of
the error matrix. (Saves time if you do that later with HESSE anyway)
- Move nLoglikelihood() function from RooAbsPdf to here.
- Improve readability of messages in fitting in log-mode: print on screen only value
and name of parameters that change instead of dumping all their values all the time.
The old format has been retained in the log file, to allow automated processing of such files.
o RooFormulaVar
- Also update _origList on a serverRedirect
- Export ok() function of RooFormula (indicates if expression compiled ok)
o RooMath
- Add fast, interpolated, complex error function. Upon first use separate lookup tables
are filled for the im and re part of the complex error function. New functions will
do a 2nd or 3rd order 2D interpolation (depending on z) of the lookup table for either
the re part, the im part or both. Precision is better that 1e-6 in ~99% of covered
phase space. Imprecise regions are in problematic part of cErf where giant fluctuations
occur. Typical likelihood calculated with interpolated cErf agrees in the first 10
significant digits. Interpolation function is ~3.5 times faster than original CWERF
implementation, when only 1 component (im/re) of cErf is needed (most cases).
Interpolation function taken from Numerical Recipes and further optimized for
fixed grid assumption
o RooMappedCategory
- Clone also MapCatEntries in RooMappedCategory copy ctor
o RooProdPdf
- Store coef and proxy iterators in class, instead of instantiating them on the fly
in evaluate()
- Add optional cutoff parameter. If running PDF product goes below cutoff, product
calculation is terminated (default value=0, very small values like 1e-15 can be
benificial in case of wide window calculations a Gaussian + something flattish)
o RooRealIntegral
- Allow and perform integration over variables that input function doesn't depend
on (multiply integral by product of ranges of such variables)
o RooResolutionModel
- In convolution(): append name of owner to convolution, to avoid non-identical
convolutions with the same name in certain PDF configurations
- Forward redirectServers to basis function
o RooSimultaneous
- Overload fitTo() to create a RooSimFitContext instead of a RooFitContext
which allows certain additional optimizations specific to RooSimultaneous
- Normalize by the number of registered PDFs instead of the number of types
defined by the index category (allows to to partial fits)
o RooStreamParser
- Take '}' and ';' out of the default punctuation list so that RooSuperCategory
state names do not get broken up into multiple tokens
o RooThresholdCategory
- New category class that applies a series of thresholds on a RooRealVar to
define its state.
o RooThreshEntry
- Support class for RooThresholdCategory
o RooPdfCustomizer
- Utility class that serves a factory to build multiple PDFs from a single prototype
that have slightly different leaf nodes.
The class takes a proto type and a master index category in the constructor.
A series of splitting rules determines how given leaf nodes are to be 'split'
over the master index category or a subset of the master index (in case the master
index is a RooSuperCategory)
The instiated 'split' leaf nodes are put in an argset referenced in the constructor.
and the owner of the argset is responsible for deleting them (or passing them on
to another RooPdfCustomizer). The instantiated branch nodes are owned by the customizer.
o RooSimFitContext
- Specialized fit context, derived from RooFitContext, that optimizes the likelihood
calculation in case the top level pdf is a RooSimultaneous. The original data
set is broken into pieces, corresponding to a single state of the RooSimultaneous
index category and those data subsets are combined with the corresponding PDF branches
of the RooSimultaneous to form an array of regular RooFitContexts. The total likelihood
is calculated as the sum of the likelihoods from the array of fit contexts.
The NLL output from each subcontext is cached and only recalculated if a parameter
that the PDF of that subcontexts depends on, is changed.
This form of calculation is very efficient for fits where the correlation matrix has
a block diagonal form. The CPU time in RooSimFitContext scales (approximately) with
the number of elements in the block diagonal elements instead of with the total number
of elements.
o Nearly all classes
- A large number of minor bugs has been fixed and many functions
that are called very frequently have been inlined, made non-virtual or
have been eliminated, following the result of repeated profiler studies.
Revision
2167 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri May 11 06:30:01 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1440 byte(s)
Diff to
previous 2164
o RooAbsArg
- In destructor, only print out warnings about live clients
that get cut off in verboseDirty() mode.
For automatically declared RooAbsArg this error condition
never occurs, but for client/server links in lists, the
order of deletion doesn't take these link directions into account.
o RooCategory
- Disallow defineType("") with a semicolon in the name.
This would confuse the reverse mapping of
RooSuperCategory::setIndex()/setLabel()
o RooArgSet
- Make default clone/copy ctor not copy the contents of the
list (Some core classes changed that used this feature)
- Extend snapshot function to ::snapshot(Bool_t deepCopy)
which allows to make both shallow (only list contents copied)
and deep snapshots (also all dependents of list contents
copied and added to list)
- Modify replace() to use AddBefore();Remove() instead
of Remove();Add() so that a replace call doesn't interfere
with an iterator over the RooArgSet
o RooRealIntegral
- Change dependent type checking from RooRealVar/RooCategory
to RooAbsRealLValue/RooAbsCategoryLValue
o RooSuperCategory
- Add MakeIterator() function which returns a RooMultiCatIter
on the super categories servers.
- Implement setIndex/setLabel(), which decodes the composite super
label into labels of the input categories
- Make use of new RooSetProxy which proxies the RooArgSet list
of input categories
- Enhance verbose printing
o RooGenCategory
- Port/rewrite from RooFitTools. User method scanned for all states
and translated into a
'SuperCategory type-index -> GenCategory type-index'
map (int-to-int via a simple array), making the class substantially
faster. The mapping is revised upon a shapeDirty() which is
propagated from all the input categories
o RooAbsCategory
- New abstract common base for RooArgProxy and RooSetProxy
o RooSetProxuy
- Proxies a RooArgSet. Essential service provided: upon a
redirectServers the list contents is replaced with the
new pointers from the redirection list.
Revision
2164 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 10 18:58:48 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1436 byte(s)
Diff to
previous 2114
*** Changes to allow a dataset to cache of derived objects ***
o RooAbsReal, RooAbsCategory and RooAbsString
Now each implements a protected method attachToTree, which allows to
connect the cache of any RooAbsArg to a TTree column
All other implementations (RooRealVar etc) removed
o Most classes
Type-blind assignment RooAbsArg* <...>::operator(const RooAbsArg*)
has been replaced by RooAbsArg::copyCache(RooAbsArg *), which is
needed for data set copy operations.
A new method RooAbsArg::syncCache(RooDataSet *)
can be used force to update the cache before a copyCache call.
o RooDataSet
- Holds a list of _cacheVars in addition to _vars, which are not
owned by the data set, but are updated nevertheless.
The cache list is not copied in a Clone() or copy operation.
- New methods cacheArg(RooAbsArg&) and cacheArgs(RooArgSet&)
register derived objects for caching in the dataset.
The values for these derived objects for each row of the tree
will be calculated and stored as a new column in the tree.
The cache of the derived object is attached to that tree column.
On a RooDataSet:get() row-load call, a setDirty(kTRUE) is called
for each cached (and uncached) object to propagate a value change
to the cached objects clients. Then immediately a setDirty(kFALSE)
is performed on the cached objects, to impose that the tree-loaded
value of the cache is correct and doesn't need to be recalculated.
o RooFitContext
- Optimizer not uses cacheArgs instead of addColumn, which
is integration-safe and can now be used on any derived object
with constant parameters
o RooAbsPdf
- Another iteration in the structure of getVal.
To make data set attachement work, the normalized value is
now stored in the cache instead of the raw value.
*** Cleanup of assignment operator ***
o RooAbsRealLValue/RooAbsCategoryLValue
- Implements assignment to Double_t/(Int_t,const char*)
o RooRealVar/RooCategory
- Implemements assignment to RooRealVar/RooCategory
o All other assignment operators deprecated
- No more assignment of derived types to each other
(conceptually unclear)
Revision
2114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 3 02:15:56 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1379 byte(s)
Diff to
previous 2015
o (Most classes)
Merge X(const x&) and X(const char*, const X&) copy constructors
into a single X(const& X, const char*=0)
o RooAbsArg
- Add 'depth-aware' client-server management functions
recursiveRedirectServers(...)
treeNodeServerList(...)
leafNodeServerList(...)
branchNodeServerList(...)
overlaps(...)
dependsOn(...) (now recursive)
- Add/move parameter/dependent interpretation to RooAbsArg
getParameters(...)
getDependents(...)
dependentOverlaps(...)
checkDependents(...)
- Change Clone() to Clone(const char*) and make it call
a pure virtual clone().
o RooAbsPdf
- First implementation
- Actual fitting implemented in RooFitContext
- Incorporates normalization technology from
RooNormFunction (now retired)
- Separate getValNorm() dropped in favour of
getVal(const RooDataSet* =0)
- getVal(...) provides all owned proxies with
the correct data set (which they need for their
value cast operators that don't take an RDS)
o RooFitContext
- First implementation
- Owns a clone of a dataset and a PDF and ties them
together with a redirectServers
- Caches indexed parameter list for fast Minuit lookup
- global Optimizer function seeks out PDF components
that only have constant parameters and add these
as precalculated columns to the data set clone
(redirectServers edits PDF tree to point to cache)
o RooDataSet
- Implement addColumn(RooAbsReal) that adds a column
of precalculated values given function for each
row of the data set
o RooAbsReal
- Change getVal() to getVal(const RooDataSet* set=0)
to allow dynamic normalization for PDFs.
o RooArgProxy and dependents
- Cache last data set used, for use in getVal(...) call in
value cast operator.
o RooRealProxy
- add min()/max() functions that get out the integration limits
if the underlying real is a RooRealVar. (Needed by RooAbsPdf
analytical integration implementations)
o (Most classes)
- A large number of minor fixes have been applied to make
the Solaris 5.7 compiler happy
Revision
2015 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 20 01:51:39 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 1263 byte(s)
Diff to
previous 1852
o Work out proxy concept
RooReal/CategoryProxy now inherit from common base RooArgProxy (->TNamed)
Proxy ctor takes pointer to RooAbsArg that owns the proxy
registers itself and declares proxied object as server.
Modified redirectServers in RooAbsArg will automatically updated
registered proxies in addition to client/server links
o Change RooUnblindCPAsym/DeltaTVar to use new proxy mechanism
o Extend functionality of RooArgSet
- add(RooArgSet) to add a list of arguments
- replace(a,b) to replace an arg in the list
- setAttribAll(attrib,value) to set/clear given attribute
in all list members
- selectByAttrib(attrib,value) to create a sublist containing only
args with given attrib set or cleared
Revision
1852 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Tue Mar 27 01:20:20 2001 UTC (13 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooRealProxy.h
File length: 986 byte(s)
o Add RooProxy classes for use in PDFs
o Enhance RooStreamParser
- Configurable definition of punctuation
- new atEOL() member can tell if there is an EOL
between the last read token and the next token to be read
- Read quoted string always as a single token
- readString() will strip quotes if present (readToken() doesn't)
o Add RooAbsString, RooStringVar classes,
analogous too RooAbsReal/RooRealVar
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.
