Log of /trunk/roofit/roofitcore/inc/RooFormulaVar.h
Parent Directory
Revision
44507 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 4 12:30:41 2012 UTC (2 years, 7 months ago) by
axel
File length: 3504 byte(s)
Diff to
previous 41676
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
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: 3484 byte(s)
Diff to
previous 28259
*** 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
24278 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sun Jun 15 15:21:16 2008 UTC (6 years, 7 months ago) by
wouter
File length: 3501 byte(s)
Diff to
previous 23538
o RooMPSentinel WHERE RooGenContext RooLinearMorph RooHistFunc RooInvTransform RooFracRemainder
RooIntegrator2D RooGaussKronrodIntegrator1D RooFitResult RooFFTConvPdf RooHist RooFormula RooIntegrator1D
RooMCStudy RooGenericPdf RooIntegratorBinding RooMPSentinel RooImproperIntegrator1D RooExtendPdf RooInt
RooLinTransBinning RooLinkedList RooLinkedListElem RooGenCategory RooList RooGrid RooLinkedListIter
RooMCIntegrator RooHistPdf RooListProxy RooFormulaVar RooHistError RooLinearVar RooGenProdProj RooHashTable
- Upgrade inline documention: make sure that (almost) 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
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: 3568 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
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/inc/RooFormulaVar.h
File length: 3554 byte(s)
Diff to
previous 20879
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
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/RooFormulaVar.h
File length: 3553 byte(s)
Diff to
previous 19583
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
19583 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 9 19:55:47 2007 UTC (7 years, 5 months ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 3555 byte(s)
Diff to
previous 18735
o RooAbsCollection
- Add snapshot() function that fills output in existing collection to
aid copy ctors of classes that own deep-copies of trees such as RooWorkspace
o RooArgSet
- Add utilities that keep track of pointer recycling to aid proper functioning
of RooNormSetCache
o RooNormSetCache
- Explicitly handle cases in cache management where RooArgSet pointers are
reallocated on a previously used address.
o RooSetPair
- Add data members that store the allocation cycle
o RooMsgService
- Expand inline comments and documentation
o RooProfileLL
- Expland inline comments and documentation
o RooProjectedPdf
- Expland inline comments and documentation
- Adjust code so that normalization set of projection contains only
actual observables of integrand
o RooWorkspace
- Expland inline comments and documentation
- Implement copy ctor in terms of new snapshot function
- Fix dtor (forgot to delete owned datasets)
- When importing a dataset, also import its observables as variables
o RooFormulaVar
- Fix default ctor for persistence
- Fix passing of normalization set to RooFormula
o RooCategory
- Fix default ctor for persistence
o RooRealVar
- Fix default ctor for persistence
o RooBanner
- Increment version tag to v2.20
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/RooFormulaVar.h
File length: 3442 byte(s)
Diff to
previous 11181
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
6746 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 20 16:14:46 2003 UTC (11 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 3442 byte(s)
Diff to
previous 5909
o RooFormulaVar
- Implement defaultErrorLevel(). If RFV contains a RooNLLVar,
forward its error level. If RFV contains a RooChi2Var, forwards
its error level. If it contains neither or both, use the default
value of 1.0. In any case, print a warning message explaining
what is done.
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/inc/RooFormulaVar.h
File length: 3392 byte(s)
Diff to
previous 5212
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
4346 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 10 20:59:05 2002 UTC (12 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2760 byte(s)
Diff to
previous 3141
o RooAbsArg
- Add global inhibit switch to dirty state propagation
- Change attachDataSet algorithm from a recursive algorithm
to an unrolled mechanism
- Change client lists from linked lists to hash lists
o RooAddPdf
- Add tolerance margin to 'sum of coefficient >1' warnings
o RooConvolutedPdf
- Propagate current operMode() to basis functions
o RooFitContext
- Disable dirty-state propagation from projected dependents
Instead trace their use in intergral and switch those
to ADirty mode
o RooFormulaVar
- Defer creation of RooFormula until first evaluate call
- Use temporary RooFormula in ctor to determine actual dependents.
Store actualDependents in list proxy
o RooHashTable
- add avgCollisions function to inspect collision statistics
o RooListProxy
- Add iterator as datamember for internal use
o RooRealIntegral
- Add code to facilitate dirty mode tracking in fit context
o RooSetProxy
- Add iterator as datamember for internal use
o RooSimFitContext
- Add CPU information per NLL calculation if profile and verbose
options are set
Revision
3141 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 31 07:19:31 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2721 byte(s)
Diff to
previous 3124
o RooAbsArg
- In redirectServers, propagate nameChange flag to redirectServersHook()
o RooArgList
- Suppress warning about extra EOL characters in readFromStream()
in non-verbose mode
o RooFormula
- Add nameChange flag to changeDependents() and process accordingly
o RooFormulaVar,RooGenericPdf,RooResolutionModel
- Change redirectServersHook() function to accept nameChange flag
and process accordingly
o RooPlot
- change findObject(),getAttLine(),getAttFill(),
getAttMarker(),getAttText() to accept null ptr as
object name string. In such case the object/attribute
of the last added object will be returned.
o RooRealIntegral
- Remove obsolete redirectServersHook() function
o RooResolutionModel
- Overload printToStream() to print out basis function details
in verbose mode
o RooTreeData
- In table() set name of table to '<dataset_name>(<cut_spec>)'
instead of "dataset"
o RooTruthModel
- Adapt to implement new set
of 9 (exp/sin/cos) X (plus/minus/sum) basis functions
Revision
3124 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 27 22:28:23 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2709 byte(s)
Diff to
previous 3078
A large number of small fixes and improvements
o Roo1DTable
- Modify Print() behaviour. Standard print will
only show non-empty fields, verbose shows all fields
o RooAbsArg
- Change getParameters so that it can accept 0 as
dataset pointer (implies no dependents)
o RooAbsPdf
- Follow plotOn() changes in RooAbsReal
o RooAbsReal
- Add optional const RooArgSet* projData argument to
plotOn(). Projected dependents that appears in this
dataset, if specified, will be projection via summation
over data instead of integration.
- Add clipInvalid option to bindVars() and propagate to
RooRealBinding
- Modify cleanBranchName() to truncate 'clean names'
(which are used for the TTree branch) to 63 chars
as cannot handle such cases (SEGV). In case name
is longer than 63 chars, truncate name at 46 chars
and suffix with _crc followed by hex representation
of CRC32 checksum of the full name.
- Add crc32() method to calculate the checksum of a string
o RooAddModel,RooAddPdf
- Do not evaluate PDF components multiplied by a zero coefficient
o RooAddPdf
- Fix DIV0 in analyticalIntegral if number of expected events
for all PDFs combined totals zero
o RooArgSet
- Add ability to readFromStream and readFromFile to optionally
flag read arguments with a user specified attribute
(Mostly useful to determine which elements have _not_ been read)
o RooConvolutedPdf
- Change declareBasis() signature from a RooArgSet& to a RooArgList&
to correctly handle cases where the names of parameters are identical
(e.g. tau=zero and dm=zero for prompt background models)
- Expand logic in RooGenContext. Add additional requirement for
use of optimized generator context: both the physics pdf and
the resolution model must support direct generation of the
convolution variable.
(Still have to fix RooAddModel/Pdf for cases where all components
can do direct generation)
o RooCurve
- Deploy RooRealBinding::clipInvalid feature to zero plotted functions
outside the validity range of their dependents
- Add extra points at (xlo,0) and (xhi,0) to obtain correct filling
pattern when using the 'F' draw option.
o RooCustomizer
- Add warnings for multiple split or replace rules on the same leaf
o RooDataSet
- Make read() take a const RooArgList& instead of a RooArgList&
and immediately make temporary copy for internal use.
- All constructors with string based cut: add default empty cut.
o RooFitContext
- Ctor: Compare limits on dependents in PDF and dataset if limits
of PDF are smaller and fully contained in those of the dataset,
adjust the dataset ranges in the internal copy and reject events
outside the PDF limits. If PDF ranges are not identical or fully
contained in dataset limits, give error message and abort.
- In fit() fix handling of parameters handed to TMinuit: set pmin/pmax
to the parameter value for constant parameters. For floating parameters
with open limits and without error, use 1/10 of the plot range
instead of 1/10 of the fit range.
o RooFormula,RooFormulaVar
- Change RooArgSet to RooArgList to pass formula parameters.
This allows construction of formulas with ordinal references
for list of parameters with multiple occurrences of the same
variable.
o RooRealBinding
- Add clipInvalid option, specified in ctor. If set, loadValues()
will first check if the values to be loaded are in the limits
of the bound objects dependents. If not the values are not loaded
and an invalid flag is set. If the invalid flag is set operator()
will return 0.
o RooRealVar
- Add various 'named parameter' functions on a trial basis
o RooSimFitContext
- Gracefully handle RooSimultaneous PDFs with missing PDFs.
o RooSimGenContext
- Forgot to set index state in theEvent RooArgSet when generating
the index category
- Remove forced normalization of index state in evaluate()
- Remove dummy plotOn() method and specialized plotOn() with data
method as projection over the index state can now be handled
the regular plotOn method. Overload RooAbsPdf::plotOn to
force caller to specify projection dataset for the index category
if projection over the index category is requested
o RooTable
- Remove print(), add default Print(Option_t *), and reimplement
printing via inheritance from RooPrintable
o RooTreeData
- In loadValues(RooTreeData*) explicitly check isValid() of
each element of _vars after copying. If any is invalid,
reject the event.
- In table() change simple clone of tableVar to deep clone.
Implement use of optional cut string (accidentally omitted sofar)
o RooTruthModel
- Add highly trivial direct generator for the convolution variable
o RooDataProjBinding
- New lightweight binding between an RooAbsReal and a dataset
that returns the projection of the real over the dataset
via summation. If the dataset only contains category variables
an supercategory of all the datasets categories is created
and the data is summed (with appropriate weights) over the
supercategory states instead of over every event.
Revision
3078 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 22 07:12:14 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2671 byte(s)
Diff to
previous 2882
Complete checkDependents method
-------------------------------
o RooAbsArg
- Implement recursiveCheckDependents() which calls
checkDependents for every tree node and returns
the summary error status
o RooAbsGenContext, RooFitContext
- Use new recursiveCheckDependents before starting
fit/generstor
o RooProPdf
- Implement checkDependents that verifies that no
PDF pair has overlapping dependents
o RooAddPdf
- Remove call forwarding, now handled by recursiveCheckDependents()
o RooFormulaVar,RooGenericPdf
- Remove obsolete checkDependents() functions
Complete PDF extended mode interface
------------------------------------
o RooAbsPdf
- Add new virtual extendMode() function that can
return CanBeExtended, CanNotBeExtended or MustBeExtended
- Add inline wrapper functions canBeExtended() and mustBeExtended()
o RooAddPdf
- Changed to implement new extendMode(). State is either
CannotBeExtended (n-1 coefs) or MustBeExtended (n coefs
or no coefs)
o RooProdPDf
- Changed to implement new extendMode(). Forward extendMode()
of single extendable PDF, or return CannotBeExtended if
there is no extentable PDF
o RooSimultaneous
- Changed to implement new extendMode(). Return CanBeExtended
if all PDFs can be extended. Return MustBeExtended if any
of the PDFs must be extended. Return CanNotBeExtended otherwise
o RooFitContext, RooAbsGenContext
- Use new extendMode() to abort fit/generator if PDF mode
is incompatible with request
Miscellaneous
-------------
o RooListProxy,RooSetProxy
- Invert error status in case of empty list/set (gave always an
error instead of always suppressing it)
Revision
2882 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 27 18:22:31 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2767 byte(s)
Diff to
previous 2840
Binned data reorganization
--------------------------
o RooAbsArg,RooAbsCategory,RooAbsReal,RooAbsRealLValue,RooAbsCategoryLValue,RooAbsLValue,RooRealVar
- Introduce the concept of 'fit bins' for the purpose of binned fits
So far we have been abusing the plot bins for this purpose but this
will ultimately lead to confusion
RooAbsLValue now defines 5 abstract methods to access the fit bin interface
setFitBin(), getFitBin(), numFitBins(), getFitBinWidth(), createFitBinIterator()
which are implemented in RooAbsCategoryLValue and RooAbsRealLValue
RooRealVar holds the fitBins data member.
o RooDataHist
- Change to use fit bins and range instead of plot bins and range for
binning a dataset
- Add new sum() methods implementing full and partial summation of
of the dataset contents, optionally accounting for bin volume correction
o RooHistPdf
- New PDF constructed from a RooDataHist implements n-dimensional
PDFs constructed from an equivalent histogram. All dimensions can
be either real of discrete
- All partial and full integrations are implemented using the new
RooDataHist::sum() methods.
Plotting reorganization (part 1)
--------------------------------
o RooPlot,RooHist,RooCurve,RooPlotable
- Store the two components of the normalization #events and binWidth
seperately
- Replace getFitRangeNorm() method with getFitRangeNEvt() and getFitRangeBinW()
methods
- Adapt updateFitRangeNorm() to store components of normalization separately
o RooAbsReal ( & RooSimultaneous)
- Add extra enum to plotOn() indicating interpretation of given scalefactor
Raw -> Apply scale factor without any other adjustments
Relative -> Apply scale factor after default normalization adjustment (old implementation)
NumEvent -> Interpret scale factor as number of events to normalize to
For RooAbsReals that are not a RooAbsPdf, the Raw procedure is always applied
Some more reorganization will follow in this area
o RooFormulaVar
- Take out dummy analytical integration definition now that plotOn will do the
right thing by default
Misc. fixes
-----------
o RooAbPdf
- Fix normalization bug in analytical integration by introducing overloaded
analyticalIntegralWN, which returns analyticalIntegral()/getNorm()
instead of just analyticalIntegral()
o RooAddPdf
- Eliminate now obsolete addPdf() and addLastPdf() member functions
Revision
2840 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 25 01:15:59 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2761 byte(s)
Diff to
previous 2838
o RooAbsReal,RooAddModel,RooAddPdf,RooConvolutedPdf,RooProdPdf,
RooFormulaVar,RooProdPdf,RooRealAnalytic,RooSimultaneous
- Change name of
getAnalyticalIntegral(...,const RooArgSet* normSet)
analyticalIntegral(...,const RooArgSet* normSet),
to
getAnalyticalIntegralWN(...,const RooArgSet* normSet)
analyticalIntegralWN(...,const RooArgSet* normSet),
to prevent partial function overloading problems
o RooImproperIntegrator1D
- Fix 'statement unreachable' message (OSF)
o RooProdPdf,RooSimultaneous
- Take out debug messages
Revision
2838 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 23:06:01 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2813 byte(s)
Diff to
previous 2820
Major cleanup in integration of normalization functions
Miscellaneous small improvements and fixes
o Roo1DTable
- Add get(),getFrac() methods to retrieve contents
o RooAbsCollection
- Add selectCommon() method to create new collection
containing args common to two sets
o RooAbsData
- Minor const-correctness changes
o RooAbsReal
- Rearrangement of getAnalyticalIntegral/analyticalIntegral entry points.
Both functions now exist with and without a 'const RooArgSet* normSet'
The functions with normSet are used by RooRealIntegral, and its default
implementation handle the pass-through scenario (code 0 = getVal(normSet))
and defers other codes to the non-normSet variant.
Simple PDFs should implement the non-normSet variants, as they used
to do sofar, except they no longer should (or are able to) process
the passthrough scenario.
Advanced PDFs such as RooAdd,ProdPdf, RooConvolutedPdf that implement
complex integration schemes that depend on the exact normSet configuration
reimplement the getAI,aI functions with normSet.
o RooResolutionModel, RooAddModel
- Implement (or forward in case of RooAddModel) new getNormSpecial method.
This function is identical in functionality to RooAbsPdf::getNorm()
except that it caches a separate copy of the normalization integral.
This member is introduced for the benefit of RooConvolutedPdf::analyticalIntegral
which, in case of a normalized integration, alternatingly calls two different
normalizations. In the original single cache code, this would lead to
100% caching failure and 300% slowdown of the code. getNormSpecial is
protected for access by RooConvolutedPdf only.
o RooAddPdf,RooProdPdf,RooSimultaneous,RooConvolutedPdf
- Re-implement distributed analytic integration bookkeeping using
the auxiliary RooAICRegistry class, which keeps track of multiple
analytical integration codes (hence AIC)
o RooAICRegistry
- New auxiliary class to faciliate the management of distributed analytic
integration.
o RooArgSet
- Minor printing fix
o RooConvolutedPdf
- Complete rewrite of handling of analytical integrations. For RCP objects
analytical integrations are not all necesarily analytic, but include
integrations deferred to convolution objcts. Analytical integrations
are split off for coefficient terms. Complete double bookkeeping introduced
for 'integration' part of analytic integration and 'normalization' part
of integration, each of which can have a different argSet to defer
to the convolution objects and a different coefficient analytical integration
code. Current implementation is believed to be complete.
o RooFormulaVar
- Follow signature change of getAnalyticalIntegral/analyticalIntegral
o RooMath
- Implement file cacheing scheme for complex error function lookup table.
To invoke persistent caching, call RooMath::cacheCERF(kTRUE) prior to
use
o RooRealAnalytic
- Store and forward normalization set to analyticalIntegral call of
bound RooAbsReal
o RooSimultanous
- Implement new plotOn() method, taking a dataSet which can correctly
project a RooSimultaneous. The code is mostly copied from RooAbsReal::
plotOn, except that the plotted pdf is constructed as a RooAddPdf
of the RooSimultaneous components, weighted by the fractions found
in the passed dataset
o RooTreeData
- Small const-correctness fixes
Revision
2820 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 20 01:40:11 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2789 byte(s)
Diff to
previous 2798
Clarify difference between integrable (RooAbsReal) and normalized
(RooAbsPdf) and work on integration of normalized functions
Implement smart integrals for RooAddPdf (fanout of common analytical
integral) and RooProdPdf (drop PDF components fully integrated)
Some small fixed and improvements
o RooAbsCollection
- Implement one-line print in "(a,b,c)" style
o RooAbsPdf,RooAbsReal
- Move matchArgs() functions from RooAbsPdf to RooAbsReal
as they relate to integrability, which is common to all
real valued objects
- Move selfNormalized() from RooAbsReal to RooAbsPdf, which
applies only to normalized functions
- Extend getAnalyticalIntegral() to take an options
normalization set pointer, as the analytic normalization
capabilities of RooAdd/ProdPdf depend on the choice of
normalization
o All core PDFs
- Follow signature change of getAnalyticalIntegral()
o RooAddPdf
- Implement distributed analytical integration of component
PDFs. RooAddPdf forces RooRealIntegral to pass all integrated
dependents to getAnalyticalIntegral (by reimplementing
forceAnalyticalInt).
RooAddPdf::getAnalyticalIntegral will forward the call
to all component PDFs and find the set of dependents
that all components can integrate analytically.
If such a set exists, the components integration codes
are stored in an array and associated with a master integration code
RooAddPdf::analyticalIntegral is copied mostly from evaluate()
replacing each getVal() with getAnalyticalIntegral, passing
the appropriate integration code to each component
o RooProdPdf
- Implement factorizing analytical integration of component PDFs.
Because each PDF is normalized, the integral of a product of
PDFs can often be simplified, e.g. Int(y) A(x)B(y) = A(x)
as Int(y)B(y) is 1 by definition.
RooProdPdf forces RooRealIntegral to pass all integrated
dependents to getAnalyticalIntegral (by reimplementing
forceAnalyticalInt).
getAnalyticalIntegral() will determined which PDFs can be
dropped for a given choice of dependents to be integrated
and a given choice of normalization and constructs a integration
code encoding the pattern of dropped/kept PDFs as a bit pattern.
analyticalIntegral() is mostly copied from evaluate(), skipping
the terms indicated as dropped by the integration code bit pattern.
o RooPdfCustomizer
- Trivial bug fix in build()
o RooRealIntegral
- No longer consider the integrated functions' selfNormalized()
property in the integration logic.
- Fix a bug in the forced_analytical vs numeric integration
determination, which occasionally lead of dependents being
integrated twice, once analytic and once numeric.
Revision
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/RooFormulaVar.h
File length: 2758 byte(s)
Diff to
previous 2778
Generalize RooArgSet to RooAbsCollection and introduce RooArgList
and corresponding proxy. Introduce RooArgList where appropriate
as replacement of a TList of proxies, eliminate all use of TList
inherited functions in RooArgSet/List.
Some optimizations implemented following profiling studies
Various fixes for compilation with Solaris CC 5.0
o RooAbsArg
- Change signature of server management function to use RooAbsCollection
instead of RooArgSet
- Add proxy management support for new RooListProxy class
o RooAbsPdf
- Disable use of RooNameSets as optimization attempt. It appears
to cost more time than it saves
o RooAbsProxy, RooArgProxy, RooAbsReal, RooAcceptReject,
RooDataHist, RooFormula, RooFormulaVar, RooGenCategory,
RooGenContext, RooGenericPdf, RooPlot, RooRealIntegral,
RooResolutionModel, RooSetProxy, RooSuperCategory, RooTreeData
- Follow RooAbsArg member function signature changes
o RooAddPdf, RooConvolutedPdf, RooFitContext, RooSimFitContext,
RooFitResult, RooPdfCustomizer, RooProdPdf,
- Change implementation from using TList to using RooArgList
o RooAbsCollection
- New abstract base class for collections of RooAbsArgs. This
class contains mostly code from the former RooArgSet implementation
o RooArgSet
- Re-implement as derived class of RooAbsCollection. A RooArgSet
cannot contain duplicates (as before), but also doesn't give
random access (by index) to its member elements
o RooArgList
- New implementation of RooAbsCollection that allows duplicates
in the list, allows sorting and lookup by index.
o RooListProxy
- Proxy version of RooArgList, similar to RooSetProxy. To be used
as data member of RooAbsArg implementation to hold external
RooAbsArg references.
Revision
2778 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 4 01:37:42 2001 UTC (13 years, 4 months ago) by
david
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2753 byte(s)
Diff to
previous 2724
RooRealIntegral:
- add logic to reuse an existing numerical integration engine when possible
RooArgSet:
- replace Delete() with _list.Delete()
- create addOwned() member fn that allows objects to be added to a list
with ownership transfered to the list (like addClone())
RooFitResult:
- change _globalCorr and the elements of _corrMatrix to use "copied"
ArgSet's and let the ArgSet dtor handle the cleanup (ie, remove Delete()'s
from RooFitResult)
RooFormula:
- replace RooArgSet::Clear() with removeAll() in actualDependents()
- replace InheritsFrom() with dynamic_cast in DefinedValue()
RooFormulaVar:
- implement getAnalyticalIntegral() and analyticalIntegral() as no-ops
to avoid problems with formulas that integrate to zero over their fit range.
*** does selfNormalized() actually work with RooRealIntegral ??
Revision
2724 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 01:21:48 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2474 byte(s)
Diff to
previous 2630
o All RooAbsReal derived classes
- Changes signature of evaluate(const RooArgSet*) to evaluate()
o RooGenericPdf,RooSimultaneous
- Adapt to use _lastDataSet instead of argset passed via evaluate
o RooFormulaVar
- PDF dependents will be used unnormalized (following evaluate
signature change)
o RooAbsLValue
- New abstract lvalue class defining interface for setPlotBin()
needed for binned datasets
o RooAbsReal,RooAbsCategory,RooAbsString
- Implement setPlotBin() method
o RooAbsReal
- Change copyCache and attachToTree to be aware of 'Float_t'
branches in data sets
o RooDataSet
- Add constructor from TTree with RooFormulaVar cut specification
o RooAbs*
Inline documentation improved
Revision
2626 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2507 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/RooFormulaVar.h
File length: 2508 byte(s)
Diff to
previous 2405
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
2405 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 12 19:06:27 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2427 byte(s)
Diff to
previous 2402
o RooAbsArg
Make client list iterators used in setValueDirty()/ShapeDirty()
data members of RooAbsArg. (Fixes memory leak observed by John Back)
o RooAbsReal
Allow optional scale factor in plotOn()
o RooFormula
Pass dataset pointer in eval() and forward it to DefinedValue()
where real arguments are evaluated
o RooFormulaVar
- Forward data set argument in evaluate() to RooFormula
- evaluate() formula in ctor if RFV has no servers
(i.e. constant string expression), because for these
cases evaluate() gets never called as non-server
RooAbsArg are never dirty by construction.
- Add constructor that allows a title different from the formula expression
Revision
2402 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 9 05:08:48 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2323 byte(s)
Diff to
previous 2397
o RooAbsArg
- Increase (temporary) verbosity of proxy manipulations
o RooAbsPdf
- add matchArgs(....,RooArgSet) to allow matching of non-proxied
RooAbsArgs
o RooConvolutedPdf
- Skip evaluation of convolution terms if coefficient is zero
o RooFormulaVar, RooFormula
- add getParameter(index), getParameter(name) functions
to access pointers of ordinal or named references in formula
(needed by resolution models for basis functions)
o RooResolutionModel
- Store convolution dependent
- Require that primary variable of basis function for convolution
is the resolution models convolution dependent.
- Add servers of basis function as servers to resolution model
instead of basis function itself. The latter confuses the
integration logic, since we don't really use the basis function
object
- Add support for basis function enumeration via the pure
virtual basisCode() function.
- Make isBasisSupported() concrete, calling basisCode(),
- Modify clone() operator of resolution model to name as
argument as sterile cloning and subsequent name change
doesn't work: it breaks the client-server links after
a server redirect. This change should be propagated to
all classes.
- Make changeBasis() virtual because RooTruthModel needs a slightly
different behaviour
o RooTruthModel
- Unlike other resolution models, the basis function must be
a server of this model, as RooTruthModel actually evaluates
the object. Not doing so causes a disconnect between
the basis and the resolution model after a recursive server
redirect. An overloaded changeBasis() supports this non-standard
behaviour
Revision
2397 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 8 05:51:06 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooFormulaVar.h
File length: 2130 byte(s)
Diff to
previous 2200
o RooAbsReal and all concrete derived classes
- Change evaluate() to evaluate(const RooDataSet*)
o RooAbsArg
- Add ctor/dtor trace code to track memory leaks
o RooAbsPdf
- Add getNorm(const RooDataSet*) method
- Add selfNormalized(const RooAbsArg* dep) method
which allows finer granularity in determining
what part of the PDF is self-normalized
- Change selfNormalized(const RooArgSet* depList) method
to call selfNormalized(const RooAbsArg* dep) for all
members of depList
o RooArgProxy
- propagate changeDataSet to proxied argument, so that
a dataset cache change becomes recursive
o RooRealIntegral
- use RooAbsPdf::selfNormalized(const RooAbsArg*) to skip
integration of designated dependents
o RooSetProxy
- Fix bug in copy constructor
o RooResolutionModel
- New base class for convolution kernel PDFs
o RooConvolutedPdf
- New base class for PDFs consisting of a
convolution with a RooResolutionModel
o RooTruthModel
- Implementation of truth resolution model (delta function)
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.
