Log of /trunk/roofit/roofitcore/inc/RooAddPdf.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: 6707 byte(s)
Diff to
previous 42536
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
42536 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Dec 19 13:28:58 2011 UTC (3 years, 1 month ago) by
wouter
File length: 6702 byte(s)
Diff to
previous 42233
o RooAddPdf
- Bug fix: pdfs defined with recursive pdfs are _not_ extended. Explicit
catch and handle this scenario with new data member _recursive
- Bug fix: in expectedEvents() also handle cases where fraction need to
be transformed with range integral ratios and yields are defined by
coefficients.
Revision
42233 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 24 23:35:45 2011 UTC (3 years, 2 months ago) by
wouter
File length: 6602 byte(s)
Diff to
previous 42171
o PiecewiseInterpolation, RooProdPdf, RooRealSumPdf, RooProduct, RooAddPdf,
RooAddition, RooHistPdf, RooHistFunc
- Implement isBinnedDistribution
o RooSimSplitGenContext
- New implementation of RooAbsGenContext for simultaneous pdf.
The difference with the existing RooSimGenContext is that
the logic is implemented at the generate() level rather than
the generateEvent() level, which allows to perform mixed
binned/unnbinned generation
o RooBinnedGenContext
- New implementation of RooAbsGenContext that performs binned
generation, with an unbinned weighted dataset as output.
This new context implements the algorithm of
the now deprecated method RooAbsPdf::generatedWeightedUnbinned()
o RooSimultaneous
- Implement method autoGenContext() that selects a split context
can case (partially) binned generation is requested
- Deprecate generateMixed() - now absorbed in generate()
o RooAbsGenContext
- Make generate() virtual
- Implement processing of extend mode here too
o RooCompositeDataStore
- Fix compiler shadowing warnings
o RooAbsPdf
- Add method binnedGenContext() to return a generator context
for binned generation
- Add method autoGenContex() that can return either a binned
or unbinned context depending on the input and circumstances
- Add support for ExpectedData(),GenBinned(),AllBinned() and AutoBinned()
in generate()
- Deprecate generateWeightedUnbinned() - now absorbed in generate()
o RooLinkedList, RooLinkedListElem
- Adjust memory management of chain elements to avoid slow heap growth
o RooGlobalFunc
- Add GenBinned(),AllBinned() and AutoBinned()
o Module.mk
- Add RooSimSplitGenContext, RooBinnedGenContext
Revision
41536 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 21 20:30:29 2011 UTC (3 years, 3 months ago) by
wouter
File length: 6425 byte(s)
Diff to
previous 36230
*** Deployment of vector datastore & miscellaneous speed improvements ***
o RooProduct,RooProdPdf,RooRealSumPdf,RooConstraintSum,RooAddition
- Deploy minimal iterator
o RooDataHist
- Add sumEntries()
o RooDataSet
- In ctor, allow choice of vector and tree data store.
- Change calls to attachToTree() to attachToStore()
- Add sumEntries() forwarding call to stre
o RooVectorDataStore
- New RooAbsDataStore implementation, based on STL vectors
rather than TTrees
o RooAbsReal
- Adjust getVal() so that clean-cache elements are processed more efficiently
- Add attachToVStore()
o RooAbsCollection,RooLinkedList
- Add minimalIterator() returning by valye a minimistic iterator (forward step only)
with a non-virtual step function
o RooAddPdf
- Deploy minimal iterator
- Skip evaluation of supplemental normalization factors if the're all one
o RooAbsData
- Add static member encoding default storage type (vector vs tree)
- Add method convertToVectorStore() to convert datasets with a tree-based store
to a vector-based store
o RooCompositeDataStore
- Implement dummy loadValues() method
o RooRealVar
- Implement attachToVStore()
o RooAbsPdf
- Deploy minimal iterators
- In getVal() also check for negative integrals as problematic value
o RooAbsArg
- Implement default version of isDerived() that always returns kTRUE
- Add pure virtual method attachToVStore()
- Deploy minimal iterators
- Implement attachToStore() which forwards to attachToTree() or attachToVStore()
depending on the storage type
o RooTreeDataStore
- Use setOperMode() with recursion where needed instead of looping manually
over branches
- Implement sumEntries()
o RooNameReg
- Add special fast handling of null pointers for conversions both ways
o RooAbsCategory
- Implement attachToVstore()
o RooRealVar
- Implement isDerived() method that was orignally in RooAbsArg
- Implement attachToVStore() that optionally attaches error buffers too
o LinkDef3, Module.mk
- Add class RooVectorDataStore
o RooAbsString
- Implement dummy attachToStore()
o RooConstVar, RooCategory
- Implement isDerived() that always returns kFALSE
o RooAbsDataStore
- Add pure virtual method sumEntries()
- Add pure virtual method loadValues()
o RooLinkedListIter
- Add class RooMinimalLinkedListIterator for forward-only
iteration without virtual function calls
- Add typedef to RMLLI
- Add non-virtual NextNV() to RooLinkedListIter
Revision
34064 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 22 15:05:19 2010 UTC (4 years, 7 months ago) by
wouter
File length: 6318 byte(s)
Diff to
previous 30333
Import roofit/roofit(core) changes from dev/roostats branch to trunk
=== r34062 ===
o RooProdPdf
- Fix compilation error on Windows
- Fix memory leak
- Fix some shadowing problems
o RooDataHist
- Fix memory leak
o RooFactoryWSTool
- Add syntax checker routine to factory front-end. At present
this counts only of all pairs of (),[],{} match.
- Add factory syntax 'set::name(a,b,c)' as factory syntax for
RooWorkspace::defineSet("name","a,b,c") ;
o RooAddPdf
- Fix memory leak
o RooAbsNumGenerator, RooAcceptReject, RooFoamGenerator
- Fix uninitialized pointer problem spotted by valgrind
o RooRealMPFE
- Fix gcc 4.4 warnings by checking return values of all read(),write()
and pipe() calls.
o RooAbsPdf
- Fix variable shadowing issue
o RooRealIntegral
- Fix memory leak
o RooTreeDataStore
- Fix memory leak
o RooSimultaneous
- Fix variable shadowing issue
o RooGlobalFunc, LinkDef2
- Include fix from Kyle/Axel to solve include guard issue in macros
for namespace RooFit
=== r34020 ===
Update to RooRealSumPdf where normalization had memory leak
=== r33961 ===
o RooAbsReal
- Add new method setEvalErrorLoggingMode() that takes three options
PrintErrors (default), CountErrors (new) and CollectErrors (supports
structured printing during minimization
o RooRealMPFE, RooMinimizerFCN, RooMinimizer, RooMinuit
- Follow changes in RooAbsReal
o RooAbsPdf
- Make getLogVal() return log(0) when probability is zero, rather than zero,
to support operation of (non-log) likelihood functions
=== r33945 ===
o RooNumRunningInt, RooCachedPdf, RooCachedReal
- Use aggregateCacheUniqueSuffix() advertised by content to
distinguish objects with identical structure that have
different non-parametric content (such as likelihood functions)
o RooAbsCachedPdf, RooAbsCachedReal
- Allow addition of additional suffix to name of object cached
in expensive object store
o RooAbsReal
- Introduce virtual function cacheUniqueSuffix() that allow function
objects that have non-parametric content that can cause two instance
of an object with the same parameter to behave differently (e.g. likelihoods that
have different datasets but the same pdf) to advertise a string suffix
that can be attached to the index name in the expensive object cache to
distinguish different instances
- Introduct method aggregateCacheUniqueSuffix() that concatenates all suffixes
produced by any branch node into a single string
o RooAbsOptTestStatistic
- Advertise dataset pointer as unique cache suffix
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple n
=== r33943 ===
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple normalization ranges
=== r33758, r33720 ===
o RooPoisson
- Fixes in internal generation code
o RooLogNormal, RooGamma, LinkDef1
- New classes contributed by Gregory Schott
Revision
25209 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 22 13:08:40 2008 UTC (6 years, 5 months ago) by
wouter
File length: 6069 byte(s)
Diff to
previous 24261
o RooAbsReal
- Add interface to specify hint for plot sampling binning. This is useful
for p.d.f.s shapes such as un-interpolated histogram p.d.f.s that may
not correctly converge on a good projection curve using the default
recursive division strategy without an initial hint on where to sample.
o RooHistPdf,RooHistFunc
- Implement plotSamplingHints() method that suggests to same just before
and just after each bin boundary
o RooProdPdf
- Forward plotSamplingHint() from relevant component p.d.f.s
o RooAddPdf
- Implement plotSamplingHints() that forwards hints of component p.d.f.s
and merges them if necessary
o RooRealIntegral
- Forward plotSamplingHint() from integrand
o RooAbsFunc
- Define plotSamplingHints() interface
o RooRealBinding
- Implement plotSamplingHints() method that forwards hints from bound RooAbsReal
o RooScaledFunc
- Implement plotSamplingHints() method that forwards hints from bound RooAbsFunc
o RooCurve
- Use plot sampling hints define by input function to perform initial sampling
if provided, otherwise fall back to default strategy of frame binning sampling.
o RooBanner
- Upgrade version tag to 2.90
o RooCintUtils
- Adjustment in CINT include file location
Revision
24261 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 13 10:18:57 2008 UTC (6 years, 7 months ago) by
wouter
File length: 5960 byte(s)
Diff to
previous 23538
o RooCachedPdf RooCachedReal RooChi2Var RooAddModelRooChangeTracker RooCategory RooAddPdf
RooAdaptiveGaussKronrodIntegrator1D RooCacheManager RooArgList RooCatType RooBanner RooBrentRootFinder
RooArgProxy RooCategorySharedProperties RooAddGenContext RooCategoryProxy RooBinning RooAddition RooAcceptReject RooArgSet
- Upgrade inline documention: make sure that every member function has some descriptive comments, every
data member has a descriptive comment, make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
o RooAddPdf
- Add DIV0 protection in updateCoefficients() when running in extended ML mode
Revision
23538 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 24 21:02:00 2008 UTC (6 years, 9 months ago) by
wouter
File length: 5242 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
20408 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 19 12:18:09 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 5206 byte(s)
Diff to
previous 20161
o RooAbsRealLValue
- Remove stray debug print statements
o RooAddPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Add forgotten initializer to regular ctor
o RooAbsCachedPdf
- Add formal server-link dependency on cache parameters to
RooHistPdf cache representation so that the constant term
optimizer can make the correct decision
- Make RooObjCacheManager a persistent data member
o RooObjCacheManager
- Add debug message level information
- Make _optCacheObservables a transient data member and initialize
it in the default ctor.
o RooAbsPdf, RooProjectedPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Make RooObjCacheManager a persistent data member
o RooAbsArg
- Add methods graphVizTree() that produce input files
for AT&Ts graphViz to make graphical representation
of object tree. (To make actual graphics run 'dot -Tps -o graph.ps %s'
where %s is argument passed to graphVizTree().
o RooSetProxy
- Remove stray debug print statements
o RooSimultaneous
- Initialize forgotten data member in all ctors
o RooProdPdf, RooAbsAnaConvPdf
- Make RooObjCacheManager a persistent data member
o RooSuperCategory
- Make contained iterator a transient data member
and initialize it in the default ctor.
o RooCacheManager
- Add explicit separate default ctor.
Revision
20161 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 5190 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/RooAddPdf.h
File length: 4959 byte(s)
Diff to
previous 18738
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
13432 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 1 16:10:20 2005 UTC (9 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4984 byte(s)
Diff to
previous 12296
o RooAbsAnaConvPdf
- Throw away cache of convCoef objects in serverRedirect (solves generator
problem reported by Gerhard)
- Follow interface change of getNormObj()
o RooAbsArg
- Add option pattern string argument to printCompactTree() that causes only
the components with names that match the pattern to be printed
- Add getCloningAncestors() utility function that returns list of pointers
to ancestors in the objects cloning history
o RooAbsGenContext
- Add auxiliary prototype variables to the _theEvent (solves generator problem
reported by Gerhard)
o RooAbsPdf
- Change getNormObj() to take both nset and iset argument so that it can
also cache fractional integrals. This is needed to support the use of
RooAddPdf objects in RooExtendPdf as fractional range intergrals of
RooAddPdfs cannot be represented as a ratio of two integrals in
a the restricted and full range divided by each other
o RooAbsReal
- Change const declaration in one of the createIntegral() declarations
o RooAddGenContext
- Follow interface change in RooAddPdf::updateCoefCache()
o RooAddPdf
- Pass both supplemental and regular normalization set to updateCoefCache() to
be able to deal with situations arising from using RooExtendPdf where the
former is a null pointer.
o RooConvGenContext
- Add auxiliary prototype variables in constructor to list of variables of model
and pdf.
- In initGenerator() resync observable lists _pdfVars and _modelVars to those
in the event that is passed to initGenerator(). Fixes generator problem reported
by Gerhard.
o RooExtendPdf
- Change way fractional integral factor is calculated in expectedEvents(): use
1-step createIntegral() procedure available through new getNormObj() interface.
This fixes a problem calculating the number of expected events in a range
of a RooAddPdf.
o RooGenContext
- Use createIntegral() interface to construct AcceptReject input function rather
than direct call of RooRealIntegral constructor.
o RooProdGenContext
- Small fix in handling of imported dependents in product parsing phase of generator context
o RooProdPdf
- Add forgotten handling of extended PDF term in selected constructors
o RooProduct
- Extend functionality so that product input terms can include RooAbsCategories as well
o RooRealVar
- Introduce concept of 'shared properties' among clones of RooRealVars. This simplifies
user handling of certain RooRealVar properties that are synchronous among all clones
of a RooRealVar. A simple demonstration:
RooRealVar x("x","x",-10,10) ;
RooRealVar* x2 = x->Clone() ;
x.setRange("signal",-1,1) ;
x2->getMin("signal") // returns -1 ;
x2->setMax("signal",5) ;
x.getmax("signal") // returns 5 ;
The sharing is explicitly through cloning and not by name, so two independently
created objects with identical names will not share properties. The sharing
of properties is retained throughout persistence and unpersistence of objects.
For now the definition of the named ranges has been moved into the
shared properties part of RooRealVar and simplifies certain common uses cases such as
RooRealVar x("x","x",-10,10) ;
RooRealVar y("y","y",-10,10) ;
// lots of code
RooAbsPdf* F ; // constructed somewhere
// more code
RooDataSet* D ; // constructed somewhere
y.setRange("signal",-1,1) ;
RooPlot* xframe = x.frame() ;
D->plotOn(xframe,CutRange("signal")) ; // RRV 'y' inside 'D' knows about "signal" through sharing
F->plotOn(xframe,ProjectionRange("signal")) ;
- Increment of RooRealVar schema version number from 2 to 4
- Explicit streamer of RooRealVar has been extended to be able to stream RooRealVar v3 objects
properly and automatically eliminate/reconnect multiple instances of identical shared property
objects that may have been created in ROOT persistence. The streamer is also capable of
reading in v1 and v2 RooRealVars for backward compatibility
o RooSimultaneous
- Modify behaviour of expectedEvents(): if index category is included in normalization set,
return sum of expectedEvents() of all components, otherwise return value of expectedEvents()
of currently selected p.d.f. (the 'old' behavior)
o RooSharedProperties
- Base class for implementation of shared property objects such as RooRealVarSharedProperty
used in RooRealVar. This class embeds a UUID that allows reconnection of multiple RooAbsArgs
to a single instance of a shared property in the unpersistance phase.
o RooSharedProperiesList
- Container class for RooSharedProperties objects that serves as repository for shared properties.
Concrete implementations of RooAbsArg that implement the shared properties concept, such as
RooRealVar, have a an instance of RooSharedPropertiesList as a static data member. This container
class owns all shared properties objects and performs their memory management through reference
counting and automatically eliminates duplicate copies of unique shared properties that many
occur on unpersisting objects
Revision
12296 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 12 11:29:38 2005 UTC (9 years, 6 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4960 byte(s)
Diff to
previous 11619
o RooAbsArg
- Introduces getVariables() as shorthand for getParameters(RooArgSet())
o RooAbsPdf, RooAddPdf, RooExtendPdf, RooProdPdf, RooSimultaneous)
- Change signature of expectedEvents(): omit default nset as nset must
be provided for this functionality to work under all circumstances.
- Add warning message in RooExtendPdf if it is missing and ranges are used
o RooBanner
- Increment version tag from v2.04 to v2.05
o RooPlot
- Fix bug in normalization handling when p.d.f is plotted first on frame.
o RooHistError
- Fix problem in calculation of approximate binomial related to integer->double
conversion [ Ch.Cheng ]
Revision
11172 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 23 15:10:06 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4860 byte(s)
Diff to
previous 11136
o All classes
- Migrate RooAbsArg::getDependents(),dependentOverlaps(),checkDependents(),recursiveCheckDependents() to
getObservables(),observableOverlaps(),checkObservables(),recursiveCheckObservables()
o RooAbsAnaConv
- Copy _convVar in copy ctor so that isDirectGenSafe() also works for copy constructed instances.
Use _isCopy instead of _convVar in declareBasis() to distinguish between original and copy constructed objects
o RooAbsArg
- Migrate RooAbsArg::getDependents(),dependentOverlaps(),checkDependents(),recursiveCheckDependents() to
getObservables(),observableOverlaps(),checkObservables(),recursiveCheckObservables(). Add old names
as forwarding functions to new names for backward compatibility
- Move cleanBranchName() and crc32() here from RooAbsReal
o RooAbsCollection
- Implement new InLine printing options as OneLine option without the newline at the end
- Upgrade printLatex() function to also take new Format() arguments with sub arguments
- Add Bool_t allInRange(const char* range) function that reports if all contained arguments
have values within the specified range
o RooAbsData
- Add plotOn() function that takes a RooLinkedList of RooCmdArgs
- Extend Double_t sumEntries() to take a cutSpec and a rangeSpec argument. If supplied
only the combined weight of entries meeting those criteria will be reported.
o RooAbsGoodnessOfFit
- Add verbose flag to constructor and make printing of informational messages conditional
to verbose flag being set
o RooAbsOptGoodnessOfFit
- Add verbose flag to constructor and make printing of informational messages conditional
to verbose flag being set
o RooAbsPdf
- Add fitTo() function that takes a RooLinkedList of RooCmdArgs
- Add support for Range(), PrintLevel() arguments in fitTo(). Support fitting composite
ranges by constructing composite NLLs using RooAddition.
- Implement named argument version of generate() supporting arguments ProtoData(), Extended(), Verbose() and NumEvents().
Copy support for protodata randomization for extended poisson over/under sampling from RooMCStudy
- Add named argument version of paramOn() supporting named arguments Label(),Layout(),ShowConstants(),Format(),Parameters().
This version also does not require an input data set to weed out observables: the normalization set from the frame is
used instead.
o RooAbsReal
- Add named argument version of createIntegral() function taking NumIntConfig(),NormSet() and Range() arguments.
Supports composite ranges through multiple Range() arguments
- Move algorithm to automatically generate name of integral in a given configuration to separate function integralNameSuffix()
- In plotOn() retire RangeWithVLine() named argument in favor of a separate VLines() argument.
- Move cleanBranchName(), crc32() functions to RooAbsArg
- Add verbose arguments to findCacheableBranches(),doConstOpt(),optimizeDirty(),findRedundantCacheServers() and findUnusedDataVariables()
and make printing of informational messages conditional on verbose flag being set.
o RooAbsRealLValue
- Add version of frame() accepting a RooLinkedList of RooCmdArgs. Add support for AutoRange(const RooAbsData&) and AutoSymRange(const RooAbsData&)
arguments that automatically calculate range that holds all points in given dataset with a specified margin. The latter function guarantees
a range symmetric around the mean of the distribution, unless domain limits of variable prohibit that.
- Add named argument version of createHistogram() taking Binning(), YVar() and ZVar() arguments where latter two arguments also take
optional Binning arguments
o RooChi2Var, RooNLLVar
- Add support for optional Verbose() argument in named argument constructor and pass flag to RooAbsOptGoodnessOfFit
o RooCmdArg
- Implement and interface linked list of sub-arguments. Add flag that controls if RooCmdConfig directly processes subarguments ot not.
- Implement assignment operator
o RooCmdConfig
- Add defineMutex() functions with 3, 4 arguments to facilitate definitions of many-way mutexes
- Add appendMode boolean to defineString(). If set, multiple instances of given string will be concatenated with
comma separattion, instead of multiple instances superceding each other.
- Add static function decodeStringOnTheFly()
o RooDataHist, RooDataSet
- Implement sumEntries() with cutSpec and rangeSpec arguments
o RooDataSet
- Add binnedClone() function
o RooFormula
- Add ifdef construction so that code compiles both with ROOT3 and with ROOT4
o RooGlobalFunc
- Move all global functions into namespace RooFit
o RooIntegrator1D
- Remove spurious debug print message
o RooMCStudy
- Add named argument constructor accepting arguments FitModel(),ConditionalObservables(),ProtoData(),Verbose(),Extended(),
FitOptions()
- Migrate function randomizeProtoOrder to RooAbsPdf
- Reimplement pull calculations using new class RooPullVar
- Add named argument function plotParamOn(). All named arguments are passed to RooAbsData::plotOn()
- Add named argument functions plotParam(),plotError(),plotPull(),plotNLL() taking arguments FrameRange(),
FrameBins(),Frame() and all arguments taken by RooAbsData::plotOn(). All sub arguments of Frame() are
passed to RooAbsRealLValue::frame(). Function plotNLL() takes additional argument FitGauss() that
adds Gaussian fit to plot. All methods default to AutoRange frames, except for plotPull() which
defaults to AutoSymRange()
o RooMinuit
- Suppress informational messages if printLevel is set to -1
o RooNumIntConfig
- Fix bug in printToStream() method
o RooPrintable
- Add InLine printing level. Implement default InLine method as OneLine method without the terminating newline character.
o RooProdPdf
- Reimplement makeRGGPName in terms of RooAbsReal::integralNameSuffix()
o RooRealIntegral
- Make RooAbsReal::getAnalyticalIntegral() return code supercede any information returned through anaSet to
avoid confusion.
o RooRealVar
- Add version of format() function that parses Format() named argument.
- Add setFitBins() function for backward compatibility.
o RooStreamParser
- Fix bug in putBackToken(): forgot to reinsert space to avoid collation with next token.
o RooTreeData
- Implement plotOn() function taking RooLinkedList of RooCmdArgs. Fix bug in determination
of default bin width if explicit binning is given. Add support for parsing of composite ranges.
- Add optional cutSpec and cutRange arguments to moment(),meanVar() and rmsVar() and rework
implementations to support this feature.
- Add named argument version of statOn() taking arguments Label(),Layout(),Format(),What(),Cut(),CutRange().
- Add getRange() function returning highest and lowest value of given variable in dataset.
o RooAddition
- New Utility class that inherits from RooAbsReal that represents a sum of RooAbsReal objects, or
a sum of products of RooAbsReal objects (when constructed with two RooArgLists). Can optionally
own components and is suitable for use with RooMinuit as it passes the errorLevel() definition
of its components
o RooPullVar
- New utility class that inherits fro RooAbsReal that calculates the pull of one RooRealVar
(with errors) w.r.t. another RooRealVar representing the truth value. If asymmetric errors
are defined in the former RRV those will be used for the pull calculation.
Revision
11136 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 16 21:51:48 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4859 byte(s)
Diff to
previous 11114
o RooAbsData
- Introduce reduce() version with named arguments.
- Supports reduced in number of variables with SelectVars()
- Supports selection of events through cut expression or RooFormulaVar with Cut()
- Supports selection of events through pre-defined cut ranges with CutRange() [NEW]
- Support selection of range of events by sequential number with EventRange() [NEW]
o RooAbsGoodnessOfFit
- Add support for fitting subsets of data/pdf combinations selected through predefined cut ranges
o RooAbsOptGoodnessofFit
- Implement fitting of data/PDF in a subrange as indicated by named ranges in RooRealVar.
Automatically select only those data points that are in the indicated range and adjust
the normalization range of the PDF variables to the selected range for the duration of
the fit. Automatically adjust RooAddPdf fraction parameters so that RooAddPdf shapes
are invariant under the normalization range change
o RooAbsPdf
- Add Named argument version of fitTo() supporting named arguments FitOpts,Verbose,Range,
Optimize,Save,Timer,Blind,Strategy,InitialHesse,Hesse,Minos,Extended,NumCPU and
ProjectedObservables.
- Add fixCoefRangeName() function to fix the interpretation of RooAddPdf coefficients
to a given fixed range for all RooAddPdf (sub) components of this PDF. Analoguous
to fixCoefNormalization()
o RooAbsReal
- Automatically plot only the fitted range of a PDF if the PDF has been fit to a subrange
of the default range and no other plot range was specified
- Eliminate RangeWithVLines named argument and introduce separate VLines named argument.
By default 'wings' are added to each RooCurve unless a Range() command is found
or a fit range is found. In that case RooCurves are not decorated. User can optionally
add vertical lines at begin and end of range by adding VLines() named argument in
combination with Range() argument.
- Implement dummy selectNormalizationRange().
o RooAddPdf
- Implement selectNormalizationRange() to propagate a fixed range for the interpretation
of RooAddPdf coefficients. Analoguous to selectNormalization()
o RooSimultaneous
- Implement selectNormalizationRange() to store fixed range in case RooSimultaneous is later
converted to a RooAddPdf for plotting purposes. Analoguous to selectNormalization()
o RooChi2Var,RooNLLVar
- Add support for fitting Chi2/NLL of subset of data/pdf as indicated by pre-defined range.
o RooCmdConfig
- Make return value of getObject() non-const
o RooDataHist, RooDataSet, RooTreeData
- Add support for reducing a RooDataHist/RooDataHist by pre-defined named ranges and sequential event ranges
o RooAbsRealLValue
- Define new pure virtual function hasBinning()
o RooErrorVar, RooLinearVar,RooRealVar
- Implement new virtual function hasBinning()
o RooGlobalFunc
- Add various new global functions for the support of newly introduced named arguments in
RooAbsPdf::fitTo(), RooAbsData::reduce(), RooAbsReal::plotOn()
Revision
11114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Feb 14 20:44:30 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4771 byte(s)
Diff to
previous 8538
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
8534 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 5 21:38:48 2004 UTC (10 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4544 byte(s)
Diff to
previous 8435
o GNUmakefile
- Remove obsolete bin and binscripts targets
o RooAbsPdf
- Make resetErrorCounters() virtual
o RooAddPdf
- Add counter for coefficient >1 warning messages
and stop printing them when counter reaches zero
- Overload resetErrorCounters() to also reset
coeffient warning counter
Revision
8435 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 19 06:09:47 2004 UTC (10 years, 10 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4425 byte(s)
Diff to
previous 5909
Preparation for V1.04 -- RooProdPdf maintance and upgrade
---------------------------------------------------------
o LICENSE, RooBanner
- Update to year 2004
o RooAbsArg
- Add DeleteWatch debug feature: verbal notification
if an object with this flag is beign deleted
o RooAbsGenContext, RooGenContext, RooAddGenContext,
RooConvGenContext, RooSimGenContext, RooMCStudy
- Introduce concept of auxiliary proto variables, which are
generated by other PDF components rather than an external dataset
o RooAbsPdf,RooConvolutedPdf,RooSimultaneous,RooAddPdf
- Modify genContext() to allow optional specification of auxiliary
proto variables
o RooCmdArg
- Add RooProdPdf as friend
o RooGenProdProj
- Modify so that it will work without a denominator term as well
- Fix in memory management that created hidden links between deep
cloned trees that involved RooProdPdf nodes with cached information
o RooProdGenContext
- Enhance functionality so that it can correctly and optimally
generate events for 'correlated product' PDFS. Now, irriducible
PDF terms are generated in a dependency order: 'imported
dependents', i.e. dependents over which a PDF doesn't normalize
are always guaranteed to have been generated by another term
before the importing term is generated. Left over terms wich are
cross importing cannot be disentangled with a linear dependency
scheme and are generated as a monolithic PDF. The ProdGen
context uses the new auxiliary proto variables to correctly
generate the correlation between imported and normalizing
observables.
o RooProdPdf
- Fix some outstanding link management problems
- Add new ctor with named arguments that allows to specify
correlated products
- Adjust product factorization to understand concept of 'imported'
dependents, which allows to split composite terms that would
otherwise be irriducible
- Add term grouping algorithm that groups together irriducible terms that
share dependents in mixed roles (normalizing vs imported) over which is
integrated. Such integrals can only be calculated properly if the
entire product of such terms is integrated rather than the terms
individually.
- Reorganize code a bit: break factorization, term grouping and
prefabrication of partial integral lists into several functions.
Revision
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/RooAddPdf.h
File length: 4367 byte(s)
Diff to
previous 5360
o RooAbsArg & selected derived classes
- Extend redirectServersHook() argument list with one additional
boolean that indicates if the redirect is recursive
- Extend redirectServers() argument list with one additional
boolean indicating whether it is part of a recursive process
Pass recursion flag to redirectServersHook()
- In recursiveRedirectServers(), set recursion flag in calls
to redirectServers
o RooProdPdf
- In redirectServersHook(), only redirect servers on non-owning
product component lists in cache if recursion flag is set
Revision
5360 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 30 00:57:29 2002 UTC (12 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4291 byte(s)
Diff to
previous 5212
o RooAbsArg
- Add cyclical call protection to recursiveRedirectServers()
o RooAbsGoodnessOfFit
- Add missing return in evaluate()
o RooAbsPdf
- Implement redirectServersHook() to forward server redirection
to all cached normalization integrals
- Disable listing of indirectly selected components in plotCompOn()
(not that useful, and potentially very verbose)
o RooAddPdf
- Revert to version with single coefficient projection integral
(instead of ratio of integrals). Add supplemental normalization
term to coefficient projection integrals to handle projection
of RooAddPdfs where the set of dependents of the components
do not overlap (i.e. F(x,y) + G(y,z))
- Add operModeHook() and redirectServersHook() to forward
either operation to the cahced coefficient projection integrals
o RooNormManager
- Add getNormByIndex() and cacheSize() to facilitate server
redirection.
o RooProdGenContext,RooProdPdf
- Back out experimental version that allowed overlapping discrete dependents
due to unsolved problems
- Implement redirectServersHook() to forward operation to cached
projection lists
o RooRealIntegral
- Implement redirectServersHook() that causes restart of numerical
integration engine (if any) to pick up server changes
Revision
5174 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 3926 byte(s)
Diff to
previous 4762
Major new version (to become V00-01-00)
o README
- Update standalone compilation instructions
Refer BaBar users to RooFitBabar/README
o RooAICRegistry
- Fix memory leak
o RooAbsArg
- Add default implementation of constOptimize() that
forwards the call to all servers
- Add RooAbsOptGoodnessOfFit, RooRealMPFE as friends
- Add protected pure virtual method setTreeBranchStatus()
that can be used by the optimizer to disable reading
of the tree branch associated with the RooAbsArg
o RooAbsBinning
- Add description
o RooAbsCategory
- Add operator==()
- Implement setTreeBranchStatus()
o RooAbsCollection
- Add addClone(RooAbsCollection&,...) to add a list of clones
o RooAbsData
- Add pure virtual methods for new caching mechanism:
* cacheClone() returns a clone of the dataset with cache
* resetCache() clears the existing cache
* setArgStatus() disables reading of given args from tree
o New class RooAbsGoodnessOfFit
- Abstract base class for goodness-of-fit variables.
A goodness-of-fit is any quantity calculated from a PDF
and a dataset. This class orgamizes parallelization over multiple
CPUs and calculation of GOFs from simulatenous PDFs.
o New class RooAbsOptGoodnessOfFit
- Abstract base class for goodness-of-fit variables
that calculate the PDF value at each data point in the
given dataset. It implements various optimizations:
caching of constant terms, elimination of unused variables etc.
o RooAbsPdf
- Deploy new normalization integral manager RooNormManager
to cache multiple normalization integrals for a PDF.
This greatly increases the efficiency for certain situations
where PDFs are alternatingly called with 2 or more different
normalization choices
- Reimplement fitTo() in terms of RooNLLVar and RooMinuit.
- Reimplement plotNLLOn() in terms of RooNLLVar and plotOn()
- Migrate plotNLLContours to RooMinuit
- Remove obsolete method fitContext
o RooAbsReal
- Add operator==()
- Implement setTreeBranchStatus()
- Fix memory leak in createProjection()
o RooAbsString
- Implement setTreeBranchStatus()
o RooAddModel
- Eliminate getNormSpecial() construction that was originally
introduced to efficiently handle calls with 2 alternating
projection/normalization configurations originating from
RooConvolutedPdf. This is now handled by RooNormManager.
o RooAddPdf
- Reimplement caching of coefficient projection list and
supplemental normalization list using RooNormListManager.
(Also supports caching of multiple configurations now)
o RooArgSet
- Implement addClone(RooAbsCollection&,...)
o RooBanner
- Add description
o RooBinning
- Add description
o New class RooChi2Var
- Implementation of simple Chi^2 of RooAbsOptGoodnessOfFit
for a RooDataHist and a RooAbsPdf.
Chi^2 is calculated from PDF value at the bin center.
Poisson errors are used if no user defined errors are present
o RooConvolutedPdf
- Reimplement normalization integral management using
RooNormListManager
- Deprecate use of RooResolutionModel::getNormSpecial. No longer needed.
o RooCustomizer
- Fix memory leak
o RooDataHist
- Add lo/hi Error associated with each bin. Default implementation
returns poisson errors. Error is return by weightError().
- New set() function allows user to override poisson errors
o RooDataSet
- Fix copy ctor for weighted datasets
- Implement cacheClone()
o RooDirItem
- Add description
o RooDouble
- Add description
o RooExtendPdf
- Follow changes in normalization management of RooAbsPdf
o Removed class RooFitContext
- Replaced by RooMinuit/RooNLLVar
o RooFitResult
- Change terminology NLL -> FCN (fits are no longer NLL necessarily)
- Store and report accuracy code of minuit error matrix
- Minor tweaking of parameter dumps with mixed symmetric/asymmetric
errors
o RooGenericPdf
- Follow changes in RooAbsPdf normalization management
o RooIntegratorConfig
- Add description
o RooLinTransBinning
- Add description
o RooLinkedListElem
- Add description
o RooLinkedListIter
- Add description
o New class RooMPSentinel
- New class to keep track of server processes started for
parallelized goodness-of-fit calculations. On linux
hosts, these processes don't exit when the parent process
exits. This class sends termination signals when this
singleton class is deleted
o RooMath
- Activate CERF disk caching by default
o New class RooMinuit
- New seamless interface between RooFit objects and MINUIT
Class propagates information forth and back between RooAbsArg
objects and minuits internal memory buffer (e.g. parameter
values, errors, step sizes, constant status)
- This class minimizes any RooAbsReal function (doesn't need to
be a NLL or Chi2)
o Removed class RooNLLBinding
- Obsolete after introduction of RooNLLVar
o New class RooNLLVar
- Implementation for NLL of RooAbsOptGoodnessOfFit
o RooNameSet
- Fix memory leak
o New class RooNormManager
- New manager class for normalization/projection integrals for PDFs
This class matches RooArgSet pointer pairs to the integration
and normalization sets to previously registered integrals.
Multiple pointer pairs can point to the same integral (e.g.
pointer to different RooArgSets with the same contents) and
multiple integrals can be cached. This class doesn't create
the normalization integrals. It merely indicates if it has
one or not, and leaves it up to the owning class to create
and register new normalizations
o New class RooNormListManager
- Similar to RooNormManager, except that RooArgLists of normalization
integrals are caches instead of single integrals
o RooNormSetCache
- Rework functionality. This class, used by RooNorm(List)Manager
manages multiple redundant RooArgSet pointer pairs that represent
the same projection/normalization configuration
o RooProdPdf
- Almost complete rewrite in terms of RooNormListManager
o RooRealConstant
- Minor const changes
o RooRealIntegral
- Streamline iterator use: Create various interator in ctor
and reuse them in evaluate() instead of creating and deleting
them on the fly
o New class RooRealMPFE
- Front end for MultiProcessor calculations. Class RooRealMPFE
takes a RooAbsReal as argument and calculates it in separate
process. Calculations can be started asynchronously with
the calculate() call. The rest of the interface (and behaviour)
is identical to that of the original RooAbsReal.
o RooResolutionModel
- Deprecate getNormSpecial - superceded by RooNormManager
o RooSetProxy
- Implement addClone(const RooAbsCollection&,...)
o Removed class RooSimFitContext
- Obsolete - replaced by RooMinuit/RooNLLVar
o RooSimGenContext
- Fix memory leak
o RooSimultaneous
- remove obsolete fitContext() method
o RooTreeData
- Reimplement caching. Cached functions are now stored in
a separate tree in the dataset. Main benefit of the new
implementation is that caches can efficiently be reset
and refilled on the fly
o makedocs
- Add stanzas for new tutorial macros
Revision
4762 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 19 22:37:09 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4036 byte(s)
Diff to
previous 4698
o RooNormSetCache
- New utility class to keep track of normalization/integration
RooArgSet pointers that correspond to equivalent normalization
(Extension of simple pointer caching method)
o RooAddPdf
- Deploy RooNormSetCache in syncCoefProjList()
Revision
4698 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 12 23:53:26 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 4035 byte(s)
Diff to
previous 4266
o RooAICRegistry
- Make snapshot instead of Clone of stored RooArgSets
o RooAbsPdf
- Add projected dependents option to plotNLLOn
- Add 'force' switch to selectNormalization to distinguish
user-propagated vs automatic calls
o RooAbsReal
- Change in selectNormalization
o RooAddPdf
- Use 2-tier process to check if coefficient projection
is current: 1st use pointer of nset,iset, 2nd compare
names with stored RooNameSet. Eliminates unnecessary
recreation of projection integrals if PDF is called
from more than one place
o RooBanner
- Thwart Chris Roats cash flow scheme
o RooCurve
- Change procedure to update y-range limits to properly
work with zero-shifted curves
o RooNLLBinding
- Add projected dependents options
o RooSimultaneous
- Change in selectNormalization
Revision
4266 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 29 03:19:01 2002 UTC (12 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 3887 byte(s)
Diff to
previous 4227
o RooAbsCollection
- add overlaps() function to check for common elements in to collections
o RooAbsReal
- New feature: Allow sliced variables to appear in projected data set.
If so, a reduced dataset is created on the fly consisting of only
events that are part of the current slice. This saves the caller
the work of creating a projection dataset for the subset of events
of the plotted slice
- Bug fix: before activating coefficient projection transformation,
check if transformation is not identity (e.g. from (A,B) -> (B,A))
o RooRealIntegral
- Make RooIntegratorConfig* pointer data member non-const. This gives
some trouble in the Streamer() generated by older root versions
o RooSimPdfBuilder
- Add buildConfig() methods that take a RooArgSet of dependents instead
of a dataset
o RooSimultaneous
- Overhaul of plotting interface. Now require that a projection dataset
with (at least) the components of the index category is always given,
even if only a single state is plotted.
This allows a consistent treatment of normalization in slice plotting
w.r.t to regular PDFs: the plotted PDF is multiplied by the fraction
of projected data events selected in the plotted slice.
Substantial work on index projection engine now allows all possible
slices, such as a slice in only one of the components of a composite
index category.
Implement 'auto-reduction' feature on projection dataset, as is done
in RooAbsReal::plotOn. In addition also remove index category-related
columns of dataset before passing it on the the RooAddPdf plot variable
This eliminates some fake warning messages
Major improvement in slicing/projection info messages
Revision
4227 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 22 22:43:58 2002 UTC (12 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 3852 byte(s)
Diff to
previous 3342
o RooAbsArg
- Keep track of cloning with attributes. add isCloneOf()
method to test if objects are clones
o RooAbsCollection
- Implement check of 'unique-name rule' in snapshot() method.
Disabled for the moment as we violate this rule in benign ways
in several places in the core code. This needs to be fixed first
o RooAbsPdf
- Add methods to specify numerical integrator configuration to be
used in normalization
There is one global default configuration (RooIntegratorConfig object)
and each PDF can optionally have a private configuration that
overrules the default one.
o RooAddPdf
- Add on-the-fly transformations for coefficients between
normalization sets. Users can now specify a
'reference normalization' via fixCoefNormalization() in
which the fractions will always be interpreted.
If no such reference set is specified the default behaviour
will prevail: the interpretation depends on the current normalization.
o RooAbsReal
- Change plotOn() such that when a PDF containing RooAddPdfs
is projected with data, an appropriate reference normalization
is set for each, if no user-supplied reference normalization
was set. This ensures intuitive behaviour of plotOn() for RooAddPdfs
- Add easy-to-use wrapper function for createProjection()
o RooErrorVar
- Add readFromStream/writToStream()
- Declare fundamental
o RooImproperIntegrator1D,RooIntegrator1D
- Add constructors from RooIntegratorConfig
o RooMCIntegrator
- Add constructor from RooIntegratorConfig
- Make #iterations and #call per iteration for grid refinement
and integration configurable parameters
o RooProdPdf
- Complete rewrite. Now _all_ permutations of integration/normalization
are correctly performed. New implementation uses a product
of partial integrals created with pdf->createIntegral()
o RooRealIntegral
- Add optional RooIntegratorConfig to ctor and pass to numerical
integrator ctors in various places
o RooSetProxy
- Fix server management for owning set proxies
o Many classes
- Anticipate potential failure of snapshot() due to unique-name
rule enforcement and handle such situations appropriately
Revision
3342 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Dec 1 08:12:48 2001 UTC (13 years, 1 month ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 3374 byte(s)
Diff to
previous 3322
o RooAbsCollection
- Add selectByName() member that accepts a comma separated list
of wildcard patterns to create a subset filled with the matching
elements
o RooAbsData
- Fix typo in print message
o RooAbsPdf
- Add new plotCompOn/plotCompSliceOn methods that take
a string wildcard expression or argset of components
to plot. Selected component may occur at any level in
the PDF tree
- Add component selector flag bit to support new component
plotting scheme
o RooAddPdf
- Change evaluate() to only include PDFs that have their
selection bit raised
- Remove old plotCompOn methods()
o RooFitContext
- Store asymmetic errors in parameter RooRealVars, if they
are available
o RooMCStudy
- Adapt to changes in RooRealVar. Ensure persistence of
symmetric and asymmetric errors of RRVs in parameter dataset
o RooRealVar
- Add asymmetric errors and accessor/modifier functions.
Asym. errors are stored and managed independently from
the existing symmetric error
- Introduce hasError(), hasAsymError() functions indicating
if an error has been set to the object.
- Adapt writeToStream/readFromStream to process asymmetric
errors. Split 'L(lo-hi:bins)' token in 'L(lo-hi) B(bins)'
tokens so that bin specification becomes optional. Change
logic for error printing: instead of requiring
(!constant || error>0) simply require hasError()
- By default no longer persist error(s) along with value
when attached to a dataset. To request persistence of
symmetric error, set "StoreError" attribute. To request
persistence of asym. error, set "StoreAsymError" attribute.
o RooSimultaneous
- Deprecate specialized plotCompOn/plotCompSliceOn functions
- Modify regular plotOn to plot a temporary RooAddPdf, with the
coefficients determined from the fractions of the index
state occurring the in the prototype dataset
Revision
3217 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 15 08:46:31 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 3612 byte(s)
Diff to
previous 3078
o RooAbsReal
- in plotOn(), print one line comment about
projections performed with data
o RooAddPdf
- Take care of normalization descrepancies when adding PDFs
with a different number of dependents.
o RooFitContext
- Fix spurious optimizer problem when both PDF branch caching
and dataset trimming are enabled
o RooHistPdf
- Add dummy return value for getPoissonInterval() to make Solaris
CC5 happy
Revision
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/RooAddPdf.h
File length: 3315 byte(s)
Diff to
previous 3037
Complete checkDependents method
-------------------------------
o RooAbsArg
- Implement recursiveCheckDependents() which calls
checkDependents for every tree node and returns
the summary error status
o RooAbsGenContext, RooFitContext
- Use new recursiveCheckDependents before starting
fit/generstor
o RooProPdf
- Implement checkDependents that verifies that no
PDF pair has overlapping dependents
o RooAddPdf
- Remove call forwarding, now handled by recursiveCheckDependents()
o RooFormulaVar,RooGenericPdf
- Remove obsolete checkDependents() functions
Complete PDF extended mode interface
------------------------------------
o RooAbsPdf
- Add new virtual extendMode() function that can
return CanBeExtended, CanNotBeExtended or MustBeExtended
- Add inline wrapper functions canBeExtended() and mustBeExtended()
o RooAddPdf
- Changed to implement new extendMode(). State is either
CannotBeExtended (n-1 coefs) or MustBeExtended (n coefs
or no coefs)
o RooProdPDf
- Changed to implement new extendMode(). Forward extendMode()
of single extendable PDF, or return CannotBeExtended if
there is no extentable PDF
o RooSimultaneous
- Changed to implement new extendMode(). Return CanBeExtended
if all PDFs can be extended. Return MustBeExtended if any
of the PDFs must be extended. Return CanNotBeExtended otherwise
o RooFitContext, RooAbsGenContext
- Use new extendMode() to abort fit/generator if PDF mode
is incompatible with request
Miscellaneous
-------------
o RooListProxy,RooSetProxy
- Invert error status in case of empty list/set (gave always an
error instead of always suppressing it)
Revision
3015 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 12 01:48:47 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 3158 byte(s)
Diff to
previous 2990
New optimized generator contexts for RooAdd/Prod/SimPdf
-------------------------------------------------------
o RooAbsPdf,RooProdPdf,RooAddPdf,RooSimultaneous
- Introduce protected virtual function genContext()
which returns the appropriate generator context
for that PDF:
RooAbsPdf --> RooGenContext
RooProdPdf --> RooProdGenContext
RooAddPdf --> RooAddGenContext
RooSimultaneous --> RooSimGenContext
o RooAbsGenContext
- New abstract generator context
o RooGenContext
- Make inherit from RooAbsContext
o RooAddGenContext
- New optimized generator context for RooAddPdf
that generates the components separately
o RooSimGenContext
- New optimized generator context for RooSimultaneous
that generates the components separately
o RooProdGenContext
- New optimized generator context for RooProdPdf
that generates the dependents of each components
separately and then merges them
Dataset enhancements
-------------------
o RooDataHist
- Add constructor from TH1,TH2,TH3
- Add interpolation order to weight(RooArgSet& coord,...)
function that optionally performs nth order
interpolation of the weight distribution in the
real dimensions of the dataset.
(Currently supports up to 2 real dimensions)
o RooHistPdf
- Add option to ctor to optionally interpolate
histogram contents in real dimensions
o RooDataSet
- Introduce merge() methods that adds the columns
of one or more datasets (of equal length)
Miscellaneous (fixes Remedy #5603)
-------------
o RooRealVar
- Fix output format in writeToStream(). One ')' too many
- Read '+/-' as 3 tokens due to change in parsing rules
o RooArgSet
- Change punctuation rules of parser in readFromStream
so that it doesn't break up variable names with
funny characters
Revision
2990 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 6 06:19:53 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 2984 byte(s)
Diff to
previous 2981
o RooAbsArg
- Modify getDependents() so that it can handle a null normalization
set pointer. (will return empty set)
- Announce server redirects in verboseDirty mode
- Add nameChange flag to recursiveRedirectServers()
o RooAbsPdf
- Remove obsolete dummy functions Scan(),Parameters(),ContourPlot()
- Fix printing of PDFs in 'Standard' mode
- Add plotNLLOn(RooPlot*,...) method implementing RFTs Scan() functionality
- Add paramOn(RooPlot*,...) method implementing RFTs Parameters() functionality
- Add contourPlot() plotNLLContours method, implementing RFTs PlotContour()
functionality. Implementation is deferred to RooFitContext.
o RooAbsReal
- Add checks in frame() method that plot range is neither infinite nor zero
o RooAddModel
- Replace all existing constructors (except copy ctor) with a single
list based constructor (as done in RooAddPdf).
- addModel(), addLastModel() methods removed.
- Implement analytical integration technique performed in RooAddPdf
when model is used as an unconvoluted PDF. Implementation introduces
getAnalyticalIntegralWN(),analyticalIntegralWN(),forceAnalyticalInt(),
removes dummy getAnalyticalIntegral(),analyticalIntegral().
o RooAddPdf
- Add new constructor with PDF list only. Builds an extended sum PDF
from a list of extendable components. Coefficients of the PDFs
are calculated from each PDFs contribution to the total number
of expected events.
o RooFitContext
- Add plotNLLCountours method. Because of MINUIT initialization complications
in TMinuit::Contour, a fast minimization (Migrad only, strategy 0) is
performed on the PDF before the contour plots are made.
o RooNLLBinding
- Lightweight binding objects combines a PDF and a data set and returns
the resulting negative log likelihood as function of one or more
of the PDFs parameters
o RooNorm
- Port of RFT RooNorm class
o RooCutNorm
- Port of and extension of RFT RooCutNorm class. RFC implementation
supports cuts in an arbitrary number of dimensions.
o RooProdPdf
- Introduce support for extended likelihood fits. If exactly one
of the component PDFs can be extended, that the product can be
too (returning the extendable components expected number of events)
o RooSimultaneous
- Introduce support for extended likelihood fits. If all of the
component PDFs can be extended, than the simultaneous PDF can be too
(returning the number of expected events of the active PDF)
Revision
2981 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 5 07:01:50 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 2804 byte(s)
Diff to
previous 2887
Documentation update
--------------------
o RooAbsData,RooAbsPdf,RooAddPdf,RooProdPdf,
RooConvolutedPdf,RooResolutionModel
- Update inline documentation
Misc fixes
----------
o RooHtml
- Remove default arguments in member function implementation
(Causes solaris compiler error)
Revision
2887 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Sep 28 21:59:29 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 2595 byte(s)
Diff to
previous 2882
Overhaul of plotting (part 2)
-----------------------------
o RooAbsData
- Add new virtual function plotAsymOn(frame,asymCat,...)
for asymmetry plotting
o RooAbsPdf
- Implement plotOn() with normalization support (Raw,Relative,NumEvent)
o RooAbsReal
- Implement new plotting functions:
plotOn(frame,....) - Regular projected plotting
(overloaded in RooAbsPdf)
plotSliceOn(frame,sliceset,...) - Partially projected plotting
plotAsymOn(frame,asymCat,...) - Asymmetry plotting
(for any 'sign-type' cat. variable)
- Projection logic moved from RooCurve::ctor to plotOn(),
rearranged to use createProjection()
- Introduce some protected helper functions for plotting
plotSanityChecks(), makeProjectionSet()
o RooAddPdf
- Implement partial plotting function
plotCompOn(frame,compSet,....)
to plot any arbitrary subset of components
- Fix normalization in evaluate(), revert to default
extendedTerm()
o RooCurve
- Remove projection logic from ctor (moved to RooAbsReal::plotOn)
o RooSimultaneous
- Overload inherited plotOn() with dummy function and message for
user
- Implement plotOn(frame,RooAbsData*) which constructs a RooAddPdf
plot function, with the relative weights determined from
the supplied dataset
- Implement plotCompOn(frame,RooAbsData*,compSet,...) and
plotCompOn(frame,RooAbsData*,indexLabelList,...) to plot only
selected parts of the pdf (supplied as argSet of component
pdfs, or a string with comma separated labels of the index
category)
o RooTreeData
- Introduce dummy plotAsymOn(frame,asymCat,...)
Misc. small fixes / improvements
--------------------------------
o RooAbsCategory
- Add helper function isSignType() to determine if
given category has 2 or 3 states with values -1,0,1
o RooConvolutedPdf
- Fix potential null ptr evaluation in getAnalyticalIntegralWN()
o RooGenContext
- Comment out some unreachable code to suppress OSF compiler warning
o RooPdfCustomizer
- Generalized to work with any RooAbsArg tree.
Need to change name at some point...
o RooStreamParser
- Insert forgotten & in readInteger so that function now
actually modifies integer reference to be read
(Found by OSF compiler)
Revision
2882 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 27 18:22:31 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 2445 byte(s)
Diff to
previous 2871
Binned data reorganization
--------------------------
o RooAbsArg,RooAbsCategory,RooAbsReal,RooAbsRealLValue,RooAbsCategoryLValue,RooAbsLValue,RooRealVar
- Introduce the concept of 'fit bins' for the purpose of binned fits
So far we have been abusing the plot bins for this purpose but this
will ultimately lead to confusion
RooAbsLValue now defines 5 abstract methods to access the fit bin interface
setFitBin(), getFitBin(), numFitBins(), getFitBinWidth(), createFitBinIterator()
which are implemented in RooAbsCategoryLValue and RooAbsRealLValue
RooRealVar holds the fitBins data member.
o RooDataHist
- Change to use fit bins and range instead of plot bins and range for
binning a dataset
- Add new sum() methods implementing full and partial summation of
of the dataset contents, optionally accounting for bin volume correction
o RooHistPdf
- New PDF constructed from a RooDataHist implements n-dimensional
PDFs constructed from an equivalent histogram. All dimensions can
be either real of discrete
- All partial and full integrations are implemented using the new
RooDataHist::sum() methods.
Plotting reorganization (part 1)
--------------------------------
o RooPlot,RooHist,RooCurve,RooPlotable
- Store the two components of the normalization #events and binWidth
seperately
- Replace getFitRangeNorm() method with getFitRangeNEvt() and getFitRangeBinW()
methods
- Adapt updateFitRangeNorm() to store components of normalization separately
o RooAbsReal ( & RooSimultaneous)
- Add extra enum to plotOn() indicating interpretation of given scalefactor
Raw -> Apply scale factor without any other adjustments
Relative -> Apply scale factor after default normalization adjustment (old implementation)
NumEvent -> Interpret scale factor as number of events to normalize to
For RooAbsReals that are not a RooAbsPdf, the Raw procedure is always applied
Some more reorganization will follow in this area
o RooFormulaVar
- Take out dummy analytical integration definition now that plotOn will do the
right thing by default
Misc. fixes
-----------
o RooAbPdf
- Fix normalization bug in analytical integration by introducing overloaded
analyticalIntegralWN, which returns analyticalIntegral()/getNorm()
instead of just analyticalIntegral()
o RooAddPdf
- Eliminate now obsolete addPdf() and addLastPdf() member functions
Revision
2870 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 26 18:29:33 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 2525 byte(s)
Diff to
previous 2853
Various memory corruption fixes identified with Insure++
o RooAICRegistry
- replace new Int_t(...) with new Int_t[...] (fortran confusion)
o RooAbsArg
- copy_ctor: explicitly assume attributes are TObjString objects
o RooAbsPdf
- Modification in verbose printing. Instead of 'RooAbsPdf::getVal()/syncNorm'
messages will now be prefixed with name of implementation subclass (IsA()->GetName())
o RooAddPdf
- Add missing iterator dtors
- Implement correct integral for extended form: extra division by sum(coef)
o RooNameSet
- Change delete to delete[] for char[] _nameList in dtor
o RooRealIntegral
- Delete factorization iterator in evaluate()
Revision
2840 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 25 01:15:59 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 2345 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/RooAddPdf.h
File length: 2341 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/RooAddPdf.h
File length: 2317 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/RooAddPdf.h
File length: 2022 byte(s)
Diff to
previous 2724
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
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/RooAddPdf.h
File length: 1911 byte(s)
Diff to
previous 2626
o All RooAbsReal derived classes
- Changes signature of evaluate(const RooArgSet*) to evaluate()
o RooGenericPdf,RooSimultaneous
- Adapt to use _lastDataSet instead of argset passed via evaluate
o RooFormulaVar
- PDF dependents will be used unnormalized (following evaluate
signature change)
o RooAbsLValue
- New abstract lvalue class defining interface for setPlotBin()
needed for binned datasets
o RooAbsReal,RooAbsCategory,RooAbsString
- Implement setPlotBin() method
o RooAbsReal
- Change copyCache and attachToTree to be aware of 'Float_t'
branches in data sets
o RooDataSet
- Add constructor from TTree with RooFormulaVar cut specification
o RooAbs*
Inline documentation improved
Revision
2626 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 1932 byte(s)
Diff to
previous 2619
o RooTrace
- New memory tracing utility (singleton class)
o RooAbsArg,RooDataSet,RooArgSet
- Install hooks for RooTrace in ctors and dtors
o RooThreshEntry
- Fix bug in copy ctor
o RooAbsReal,RooAbsPdf
- Move analytical integration support
(getAnalyticalIntegral,analyticalIntegral,
forceAnalyticalInt,selfNormalized) from RooAbsPdf to RooAbsReal
so that every RooAbsReal can be integrated
o All RooAbsReal derived classes
- Change signature of evaluate(),getVal(),traceEval(),checkDependents()
from X(const RooDataSet* dset) X(const RooArgSet* nset)
o RooAbsPdf
- Manage normalization caching with a RooArgSet listing the dependents
instead of a RooDataSet containing this list
- Remove obsolete nLogLikelihood function (now in RooFitContext)
o RooAbsArg
- rename setProxyDataSet to setProxyNormSet
- add getParameters(),dependentOverlaps() that
take a 'const RooArgSet*'
o Roo*Proxy
- rename changeDataSet() to changeNormSet()
o RooConvolutedPdf
- Replace dummy data set for convolution normalization by an RooArgSet
o RooDataSet
- Remove inheritance from TTree, make it contain a TTree instead.
Forward all relevant TTree member functions. Add correct Clone()
function (now possible due to inheritance change)
o Various classes
- Fix const handling to eliminate Linux2 compiler warnings
Revision
2619 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 1 01:24:08 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 1933 byte(s)
Diff to
previous 2612
o RooAbsPdf
- Hold in addition to _lastDataSet a RooNameSet with the names
of the members of that dataset. If (_lastDataSet != dset) in
syncNormalization, first check if contents of _lastDataSet
is different from dset before redoing the normalization.
If >1 RooConvolutedPdf share a RooResolutionModel, the resolution
model will receive syncNormalization calls for the dummy data
sets contained in all RooConvolutedPdf. All these sets contain
most likely the same set of variables and a recalculation is
thus not necessary.
We cannot use _lastDataSet->get() to get the name list of the
previously used data set because that dataset might no longer
exist
o RooAddModel,RooAddPdf,RooProdPdf,RooSimultaneous
- Change signature of selfNormalized(const RooArgSet* depList)
to selfNormalized(). Partial self-normalization is an ill-defined
concept at this level. The original reason for introducing this
(RooConvolutedPdf objects insisting on handling integrals delegated
to their convolution integrals) has meanwhile been replace with the
forcedAnalyticalInt() method
Revision
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/RooAddPdf.h
File length: 1952 byte(s)
Diff to
previous 2397
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
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/RooAddPdf.h
File length: 1925 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)
Revision
2191 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon May 14 05:22:55 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 1901 byte(s)
Diff to
previous 2129
Reorganize analytical/numerical integration structure
o RooAbsArg
- Back out 'integration dependents' option in getDependents()
(logic moved to RooRealIntegral)
- checkDependents is by default always OK
o RooAbsRealLValue
- Add isSafeForIntegation(const RooArgSet& depList) method
in which an LValue can indicate if it is OK to use the
object as LValue in integration fo the present
parameter/dependent configuration is
o RooRealIntegral
- Move all logic to decide what to integrate numerically/analytically
and where to use LValue and depth-expanded RValue into RRI ctor.
Summary of logic:
For every server of function that is to be integrated
if (RealLValue && isSafeForIntegration && noOverlapWithOtherServers)
Integrate of LValue
else if (CategoryLValue && noOverlapWithOtherServers)
Sum over LValue
else
Integrate/Sum over leafNode dependents of server
Now, all details of integration technique are completely contained
in RooRealIntegral, which can _always_ be performed (if N-dimensional
numerical integration is implemented)
Other changes
o RooFormulaVar
Allow new variable names in formula expression (@0, @1, ... @n)
that reference the nth object in the given RooArgSet.
(e.g. "@0 + @1 * @2")
Revision
2129 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Mon May 7 06:26:14 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooAddPdf.h
File length: 1768 byte(s)
o RooAbsPdf: change logic in getVal()
- Results of getVal(0), i.e. without normalization, are no longer
cached as this caused interference between getNorm() and getVal().
o RooAbsReal::plot(): use deep clone and recursiveServerRedirect
instead of shallow clone
o RooPlot
- Fix dimension to 1. This is (surprisingly enough) not done
in TH1, but always in the TH1(F,C,...) implementation classes,
so RooPlot should do this as well. This fixes intermittent plotting
problems where 1D distributions were plotted in a >1 dimensional frame
- Assign unique name to TH1 object as assigning the same name ("frame")
will cause ROOT to re-use the existing object. This might lead to
unexpected results (I think...)
- Use deep cloning of plotVar in RooPlot(RooAbsReal) ctor
o RooAddPdf
- First implementation (functionality as in RooFitTools)
o RooBlindTool,RooUnblindCPAsymVar,RooUnblindCPDeltaTVar
- Moved to RooFitModels
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.
