Log of /trunk/roofit/roofitcore/src/RooAbsIntegrator.cxx
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: 3110 byte(s)
Diff to
previous 34064
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
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: 3088 byte(s)
Diff to
previous 28259
Import roofit/roofit(core) changes from dev/roostats branch to trunk
=== r34062 ===
o RooProdPdf
- Fix compilation error on Windows
- Fix memory leak
- Fix some shadowing problems
o RooDataHist
- Fix memory leak
o RooFactoryWSTool
- Add syntax checker routine to factory front-end. At present
this counts only of all pairs of (),[],{} match.
- Add factory syntax 'set::name(a,b,c)' as factory syntax for
RooWorkspace::defineSet("name","a,b,c") ;
o RooAddPdf
- Fix memory leak
o RooAbsNumGenerator, RooAcceptReject, RooFoamGenerator
- Fix uninitialized pointer problem spotted by valgrind
o RooRealMPFE
- Fix gcc 4.4 warnings by checking return values of all read(),write()
and pipe() calls.
o RooAbsPdf
- Fix variable shadowing issue
o RooRealIntegral
- Fix memory leak
o RooTreeDataStore
- Fix memory leak
o RooSimultaneous
- Fix variable shadowing issue
o RooGlobalFunc, LinkDef2
- Include fix from Kyle/Axel to solve include guard issue in macros
for namespace RooFit
=== r34020 ===
Update to RooRealSumPdf where normalization had memory leak
=== r33961 ===
o RooAbsReal
- Add new method setEvalErrorLoggingMode() that takes three options
PrintErrors (default), CountErrors (new) and CollectErrors (supports
structured printing during minimization
o RooRealMPFE, RooMinimizerFCN, RooMinimizer, RooMinuit
- Follow changes in RooAbsReal
o RooAbsPdf
- Make getLogVal() return log(0) when probability is zero, rather than zero,
to support operation of (non-log) likelihood functions
=== r33945 ===
o RooNumRunningInt, RooCachedPdf, RooCachedReal
- Use aggregateCacheUniqueSuffix() advertised by content to
distinguish objects with identical structure that have
different non-parametric content (such as likelihood functions)
o RooAbsCachedPdf, RooAbsCachedReal
- Allow addition of additional suffix to name of object cached
in expensive object store
o RooAbsReal
- Introduce virtual function cacheUniqueSuffix() that allow function
objects that have non-parametric content that can cause two instance
of an object with the same parameter to behave differently (e.g. likelihoods that
have different datasets but the same pdf) to advertise a string suffix
that can be attached to the index name in the expensive object cache to
distinguish different instances
- Introduct method aggregateCacheUniqueSuffix() that concatenates all suffixes
produced by any branch node into a single string
o RooAbsOptTestStatistic
- Advertise dataset pointer as unique cache suffix
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple n
=== r33943 ===
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple normalization ranges
=== r33758, r33720 ===
o RooPoisson
- Fixes in internal generation code
o RooLogNormal, RooGamma, LinkDef1
- New classes contributed by Gregory Schott
Revision
24247 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 12 14:54:32 2008 UTC (6 years, 7 months ago) by
wouter
File length: 3060 byte(s)
Diff to
previous 24119
o RooAbsSelfCachedPdf RooAbsCacheElement RooAbsProxy RooAbsSelfCachedReal RooAbsRealLValue
RooAbsCachedReal RooAbsGenContext RooAbsCategoryLValue RooAbsAnaConvPdf RooAbsReal
RooAbsCollection RooAICRegistry RooAbsCachedPdf RooAbsTestStatistic RooAbsData RooAbsLValue
RooAbsFunc RooAbsPdf RooAbsArg RooAbsBinning Roo1DTable RooEffProd RooAbsRootFinder RooAbsHiddenReal
RooAbsString RooAbsIntegrator RooMinuit RooAbsCache RooAbsCategory RooAbsOptTestStatistic RooAbsMCStudyModule
- Upgrade inline documention: make sure that every member function has some descriptive comments, every
data member has a descriptive comment, make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
- Remove a couple of obsolete member function
Revision
24119 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by
wouter
File length: 2320 byte(s)
Diff to
previous 23538
o RooAbsSelfCachedPdf
- Follow changes in RooAbsCachedPdf
o RooCachedPdf
- Add option to override default choice of cache observables
(the normalization observables) with a specific set of variables
to make it possible to also cache p.d.f values for all values
of given parameters as well.
- Forward analytical integration capabilities to actual cache p.d.f
- Forward calls on preferred observable order to cached p.d.f
o RooDataHist
- Add option to bin dataset in alternate binning configuration, as
specified by binning name in constructor.
- Add feature to weight() function to enforce special boundaries
when interpolating a histogram representing a cumulative distribution function.
If so, lower-side bounds are forced to zero and upper-side bounds are
forced to 1.0 instead of the default mirroring strategy
o RooMsgService
- Add new topic NumericIntegration
- Show PROGRESS level messages by default
o RooAbsSelfCachedReal
- New base class for self-caching RooAbsReal objects analoguous
to RooAbsSelfCachedPdf
o RooCachedReal
- New class to cache arbitrary RooAbsReal function objects,
analogous to RooAbsCachedPdf
o RooRealBinding
- Add feature to save and restore values of input variables,
used by RooRealIntegral to restore observable values after numeric
integration to original values.
o RooLinearMorph
- New operator p.d.f class implementing using the algorithm described
by Alex Read in NUM A 425 (1999) 357-369 'Linear interpolation of histograms'.
This class implements a generalization for continuous p.d.f
o RooAbsRealLValue
- Following changes in RooAbsLValue
o RooHistFunc
- Real-valued function modeled by external RooDataHist object, analoguous to RooHistPdf,
but without normalization support and allowing negative histogram values
o RooAbsCachedReal
- New abstract base class for caching functions, analoguous to RooAbsCachedPdf.
o RooFracRemainder
- New dedicated helper class to calculate the remainder fraction of a RooAddPdf, i.e. 1-sum(i)x_i
for a given RooArgSet x
o RooCustomizer
- Fix memory management issue for sterile use
o RooAbsCategoryLValue
- Follow changes in RooAbsLValue
o RooNumCdf
- Specialization of RooNumRunningInt to calculate running integrals of p.d.f.s:
the running integral is by construction normalized to one exactly, taking out
any possible imprecisions in the regular integral calculation and by imposing
special constraints on the RooHistFunc that models the output so that the boundaries
are constrained to exactly 0 and 1 when interpolation is used.
o RooFFTConv
- Fix bug in cache naming algorithm
- Follow changes in RooAbsCachedPdf
o RooChangeTracker
- New special purpose object that tracks changes in a given set of variables, used
to determine if cached p.d.fs in RooAbsCachedPdf and RooAbsCachedReal need to
be recalculated due to parameter changes. In addition to valueDirty tracking,
an explicit comparison can be made to stored reference values of variables,
to avoid recalculation of expensive quantities in case a valueDirty is propagated
even if the value did not change (this can e.g. happen when you step though
a RooDataHist where usually only one of the observables changes value, but
all observables propagate a valueDirty every time)
o RooHist
- Bug fix in makeResidual()
o RooAbsReal
- Fix small memory leak in createIntegral
- Expand functionality of fillDataHist: optional correction for binVolume
when filling, and optional progress indication.
- Modify logEvalError() so that when cumulative logging for Minuit is disabled
that messages are printed through the standard message logging service.
- Modify error logging so that name of objects are stored in addition to
pointers so that delayed logging of errors of (cache) objects that no
longer exists can be performed correctly.
- Add virtual function preferredObservableScanOrder() to indicate preferred
order in which multi-dimensional functions should be scanned into a
RooHistPdf, which may matter greatly for the performance of certain
p.d.f.s like RooFFTConvPdf and RooLinearMorph
- Add new function createRunningIntegral() which constructs for a given F(x,y)
a Int[xlo,x] F(x',y) dx. The default strategy is to construct the underlying
integral with createIntegral() and adapt it with a RooCustomizer and a RooParamBinning
to a running integral. In case it concerns a one-dimensional numeric running
integral, the running integral is represented by a dedicated class RooNumRunningInt
which scans the integrand and numerically integrates the scanned histogram
o RooAbsCollection
- Bug fix in nameFieldLength handling of print routine
o RooAbsCachedPdf
- Introduce explicitly the strategy that the cache contains the _normalized_ p.d.f. values,
so that no postior normalization integral is required. This has the added advantages that
the cache p.d.f can be instructed to consider itself normalized skipping an explicit
normalization step in the RooHistPdf.
- Add utility function getCachePdf() and getCacheHist() to retrieve cache p.d.f and histogram
for a given choice of normalization set
- Clean up structure of CacheElem nested class by making guts private and providing accessor
function for derived CacheElem classes. Virtualize cache creation with a new member function
createCache that will allow derived classes to create a derived CacheElem.
- Forward integration handling to cache pdf actually being used
o RooDataHistSliceIter
- Follow changes in RooDataHist for alternate binning
o RooRealMPFE
- Follow changes in eval error logging in RooAbsReal
o RooAbsPdf
- Add createCdf() function to create cumulative distribution functions from p.d.f.s. This is
quite similar to RooAbsReal::createRunningIntegral() but with some c.d.f specific features
related to constraints on normalization
o RooAbsArg
- Fix bug in optimizeCacheMode()
o RooBrentRootFinder
- Improve error messaging through RooMsgService interface.
o RooCmdArg
- Expand payload from 2 to 3 strings
o RooSimWSTool
- Complete rewrite of RooSimPdfBuilder integrated with RooWorkspace for object storage.
o RooNumRunningInt
- New dedicated class to calculate running integral of any function that does not have
an analytical integral implementation. This class scans such a function in a histogram
and then numerically integrates the histogram. The filling of the histogram is performed
adaptively using a recursion division strategy with a precision cutoff to save time
of the filling of smooth functions in finely binned histograms
o RooMultiCategory, RooSuperCategory
- Minor tweak in name of proxies
o RooAbsIntegrator
- Deploy save and restore functionality of RooAbsFunc/RooRealBinding to restore observable
values to prior values after an intergration step.
o RooMinuit
- Fix gcc 4.3 compiler warning
o RooWorkspace
- Add bulk import() function taking a const RooArgSet instead of a RooAbsArg
- Add RecycleConflictNodes() option to ignore conflicts and simply recycle internal
nodes when a different external node is encountered.
- Add new accessors catfunc() for category functions, arg() for generic RooAbsArgs,
and funcArg() for fundamental arguments of any type.
- Add separate section for category functions in Print()
o RooHistPdf
- Add option to declare contents unit normalized. When activated, the analytical
integral is hardwired to 1.
- Add option to propagate cdfBoundaries mode to the underlying RooDataHist.
o RooAbsOptTestStatistic
- Optimize handling of empty rangeName specification (from Alfio)
o RooSimultaneous
- Tune proxy names
- Make p.d.f return zero, in case index category is in state where no p.d.f is assigned,
rather that assert(0)
o LinkDef3.h, Module.mk
- Add new class definitions
Revision
23538 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 24 21:02:00 2008 UTC (6 years, 9 months ago) by
wouter
File length: 2257 byte(s)
Diff to
previous 23134
Import changes from development branch
==== Date: Wed Feb 20 22:33:28 2008 =====
o RooRealSumPdf
- Do _not_ use normalization of RooAbsPdf input components
in numerator of RooRealSumPdf expression since it is
already explicitly occurring in denominator of RooRealSumPdf.
(Fixes wrong normalization reported by Tristan)
o RooObjCacheManager
- Register owner of cache with each cache elememt to
facilitate callbacks
o RooAbsCacheElement
- Add storage for pointer to owner of cache and
supply setOwner() function
o RooAbsPdf
- Use RooObjCacheManager callback mechanism to zero
'last used normalization' pointer in RooAbsPdf
when the cache-owned object pointed is about
to be deleted.
o RooAbsArg
- Make crc32 function static
o RooWorkspace
- Add CodeRepo nested class that allows to store C++ code
of RooAbsArg derived classes that are not in ROOT distribution
but are contained in workspace. When reading any missing
class, code is compiled on the fly allowing for transparent
reading of workspace object from file. Code is found in
location pointed to from TClass objects. Additional search
path for declaration and implementation files can be provided
to be able to handle non-trivial cases.
- Add WSDir nested class that represents information contained
in workspace as read-only TDirectory for easy interactive use.
Directory representation is created using makeDir() member function.
o LinkDef3
- Add nested classes in RooWorkspace
===== Date: Wed Mar 26 23:04:26 2008 =====
o RooProdPdf
- Fix typo in ctor documentaion
- Improve error message in expectedEvents() when no extendable p.d.f.s are found
- Implement getConstraints() function to retrieve constraint p.d.f terms from product
expression given set of observables and set of parameters to be constrained.
o RooMsgService
- Add PROGRESS message level between INFO and WARNING
- Add globalKill level for messages to be able to quickly eliminate all messages below
a given level without interfering with the stream structore of RooMsgService
o RooPrintable
- Implement new printing interface with more details control over items printed trhough contents enum
(multiple ORable options) and style of printing (inline, single line, (verbose) multiline) with style
enum (exclusive options).
- Introduce generic virtual functions for printing of name,title,value,arguments,
and extras of each object.
- Each class can overload the default contents used for all printing
uses (inline,verbose,standard) etc as well as the default printing style invoked by Print()
o RooPlot,RooGenContext, RooAbsRealLValue,RooDataSet,RooNameSet,RooCustomizer, RooAbsGenContext, RooAddModel,
RooFitResult,RooCurve,RooAbsAnaConv,RooHist,RooAbsReal,RooAbsCollection,RooAddPdf,RooTable,RooAbsData,
RooMappedCategory,RooFormula,RooFormulaVar,RooCatType,RooRealVar,RooAbsArg,RooAbsPdf,RooPlotable,RooRealIntegral,
RooAbsBinning,Roo1DTable,RooAddGenContext,RooGenericPdf,RooResolutionMode,RooAbsHiddenReal,RooMultiCategory,
RooAbsString,RooSetProxy,RooProdGenContext,RooConvGenContext,RooGenCategory,RooGrid,RooSimGenContext,
RooThresholdCategory,RooAcceptReject,RooSuperCategory,RooEllipse,RooNumIntConfig,RooAbsCategory,RooListProxy,
RooLinearVar,RooTreeData,RooTreeData
- Update to new RooPrintable interface
o RooGenContext,RooAbsGenContext,RooAddGenContext,RooProdGenContext,RooConvGenContext,RooSimGenContext
- Implement attach() function to simplify management of changing parameters during lifetime of context
o RooAbsRealLValue
- Eliminate inFitRange() warning message as it is gives too many false warnings when used with
parameterized ranges
o RooCustomizer
- Make owning of contents optional to simplify release of created components
o RooAbsReal
- Implement new evaluation error logging mechanism. Rather than passing zero p.d.f values, push error message with
details on a static stack (if logging is enabled by e.g. RooMinuit).
- Augment functionality of createIntegral: explicitly allow integration over ranges with bounds parameterized in
in terms of other integrated observables. Integrals of this type are automatically recognized and cast
as recursive integrals in case of >1-D integrals to integrate over requested phase space.
- Add createIntObj() helper function for above functionaliy.
- Eliminate a lot of commented out debug code from createPlotProjection()
- Modify fillHistogram(): when plot observables are cloned, explicitly interconnect clones again to facilitate
proper plotting of N-D integrals with entangled parameterized ranges
- Add ScaleFactor() argument to fillHistogram to control use of histogram density correction scale factor in Z-scale
of filled histogram
o RooProduction
- Fix bug for persistence
o RooRealMPFE
- Extend client/server protocol with message to retrieve RooAbsReal evaluation error log from server side and
merge with error log on client side
o RooRealVar
- Introduced concept of non-shared alternative binnings(ranges) required to accommodate RooParamBinning ranges
that cannot be shared across instances because of their client/server connection to other objects in p.d.f
expression trees. Modify setBinning to automatically recognize non-shareable binnings and divert those to
non-shared alternative binning container.
- Add setRange([const char*,] RooAbsReal&,RooAbsReal&) methods to simplify creation of parameterized ranges.
o RooAbsArg
- Introduce concept of owned components with addOwnedComponents() interface to be able to make any RooAbsArg
object own any number of others. This can be used to simplify the memory management of object trees
- Introduce prohibitServerRedirect mode that will trigger fatal assert if any server redirect is attempted
to thus configured object. Useful as debugging tool to track faulty copy constructors that leave clone
object tree unintentionally connected to the original object tree.
- Migrate fixed--name-field management tool from RooAbsReal to RooAbsArg. Used to accomplish regular
formatting in RooAbsCollection::printStream.
- Add concept of transient boolean attributes that are not tranferred on copy construction. Mostly useful
for debugging.
- Extend leafNodeServerList and treeNodeServerList to distinguish to types of leaf-nodes: strict leaf modes
in the sense of the client-server tree structure and 'physical' leaf nodes that do not recurse into
nodes that have isDerived()==kFalse. The latter corresponds to the original concept of leaf nodes / variables,
which the former mode, a new addition, explicitly exposes any shape servers contained in parameterized
ranges of variables.
- Fix logic error in recursiveServerRedirect: do not recurse into nodes that are in the replacement list themselves.
- Fix bug in printCompactTree(): value/shape clients were not always properly indicated.
- Add getAllConstraints() method that finds all RooProdPdfs in expression trees and harvest constraints from all
of these from the getConstraint() method
o RooAbsPdf
- Implement new evaluation error logging mechanism for negative p.d.f values and zero normalization integrals
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to fitTo() method.
The Constrain() method retrieves any constraints p.d.f. on parameters multiplied in any RooProdPdf in the normal
p.d.f expression and adds those to the likelihood that is minimized. Only constraints on the listed parameters
will be picked up. Multiple constraints per parameter may exist. The ExternalConstrains() argument implements
similar functionality except that provided external constraint p.d.f.s are added rather than internal constraints.
- Fix potentially fatal bug in print statement in getContext()
- Add new method createCdf() to create a cumulative distribution function from given p.d.f. Given a set of observables x,
the returned c.d.f is implemented in terms of a RooRealIntegral of p.d.f(x') over a parameterized range from [ 0 - x ].
o Roo1DIntegrator
- Improve error message
o RooRealIntegral
- Fix bug in calculation of shape dependencies on observables.
- Add handling of dependencies of integral value on values of objects representing parameterized ranges of
integrated observables.
o RooMCStudy
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to constructor.
In addition to passing these arguments to the fitTo() call of the fit stage, modify event generation as
follows: instead of sampling events from 'static' generator p.d.f, sample value of constrained parameters
from joint constraints p.d.f and sample observables at those parameter settings. Save the generator parameters
for each toy as these change per toy. Change the pull calculation such that it uses the per-event truth values
rather than the per-study truth value if constraints are used.
o RooAddition
- Fix bug in evaluate() related to persistence
o RooMinuit
- Enable/disable new evaluation error logging mechanism prior to and just after each MINUIT call.
- Print logged error messages, if any, in glue function
o RooProjectedPdf
- Fix important bug: normalization set should always include integration set for each configuration
o RooGlobalFunc
- Add definition of Scaling(),Constrain() and ExternalConstraints() helper functions
o RooUniformBinning
- Remove dedicated print function as it output is identical to that of the generic print function in RooAbsBinningx
o RooAbsBinning
- Add virtual methods isParameterized(),lowBound() and highBound() to be to detect and analyze parameterized binnings
through abstract interface
- Add isShareable() method to be able to separate shareable and non-shareable binnings in RooRealVar.
- Add insertHook() and removeHook() function to allow connection of possible proxies present in binning to
owning RooAbsArg.
o RooWorkspace
- Improve code import facility by introducing a class->file mapping step in the CodeStore to correctly handle cases where
multiple classes are defined in a single file.
- Add check that TClass interface actually yields file names.
- Only require default constructor to be present for non-abstract classes. It should be there for abstract classes as
well but current TClass::HasDefaultConstructor() method will not tell us.
o RooTreeData
- Improve renameVariable() method to not only rename the RooAbsArg branch buffer but also any TTree branches involved as well.
While the tree branch names are generally invisible to the user, having branch names that are different from branch buffer names
may cause branch naming conflicts in merge() that are not detectable as branch buffer naming conflicts.
o RooParamBinning
- New class implementing binning with low and high points defined by external RooAbsReal objects
o RooConstrainSum
- Helper class for RooAbsPdf to represent likelihood of collection of constraint p.d.f.s.
==== Date: Fri Mar 28 10:04:57 2008 =====
o RooRecursiveFraction
- Helper function for RooAddPdf that calculates recursive fraction
f1*(1-f2)*(1-f3) from a given set of plain fractions
o RooAddPdf
- Add flag to ctor to optionally interpret fractions as recursive fractions.
If activated it constructs the recursive fractions using RooRecursiveFraction
from the original fractions
o LinkDef3.h, Module.mk
- Add new class RooRecursiveFraction
==== Date: Tue Apr 1 22:42:19 2008 ====
o RooDataWeightedAverage
- New implementation of RooAbsOptTestStatistics that calculates data weighted
average of any RooAbsReal. This class serves as successor of RooDataProjBinding
that no longer complies with new optimization scheme.
o RooRealBinding
- Implement name() function for more useful error messaging in integration
o RooChi2Var,RooNLLVar
- Follow changes in base class
o RooAbsReal
- In plotOn() support binning flag in ProjWData(). Reimplement data-weighted projections
using new RooDataWeightedAverage class instead of RooDataProjBinding which does not
work with new generic function optimization scheme.
- Add support for NumCPU() argument
in plotOn() to facilitate multi-processor calculation of projections. Extend NumCPU()
argument to pass interleaving option in MP splitting mode of RooAbsTestStatistic
- Move fixAddCoefNormalization() and fixAddCoefRange() from RooAbsPdf to RooAbsReal
o RooAbsTestStatistic
- Generalize functionality: allow RooAbsReals as input arguments instead of RooAbsPdfs only.
Also add virtual globalNormalization() function that allows to apply a global normalization
term after combinedValue() operation to facilitate functionality of RooDataWeightedAverage.
- Add option to split data in multiprocessor mode in interleave mode instead of in bulk mode.
Interleave mode is useful for parallel processing of histogram data where bulk partitions
may not contain equal amount of non-zero data points leading to non-optimal load balancing
between processes.
o RooAbsPdf
- Move fixAddCoefRange() and fixAddCoefNormalization to RooAbsReal to support operation of
new generalized RooAbsTestStatistic
o RooIntegrator1D
- Use name() of RooAbsFunc() to clarify warning and error messages.
o RooRealIntegral
- Rename _operMode to _intOperMode to avoid shadowing of equally named data member in RooAbsArg
- Fix bug in recursive printing
o RooSetProxy
- Fix bug in print()
o RooGlobalFunc
- Modify ProjWData() and NumCPU() helper functions with extra optional argument
o RooAbsOptTestStatistic
- Follow changes in RooAbsTestStatistic
o RooAbsFunc
- Add virtual name() function to facilitate better error and warning messages from integrators
=== Date: Tue Apr 15 17:57:32 2008 ===
o RooMsgService
- Add option to prefix streamed messages with process ID to simplify
debugging of parallel fits
o RooAbsProxy
- Add optional addContents flag to print()
o RooArgProxy, RooSetProxy, RooListProxy
- Implement addContents flag in print()
o RooAbsReal
- Reimplement stack of logged error messages in terms of custom EvalError class.
A separate list<EvalError> is now kept for each object that reports an error.
In addition to the given error message a record is constructed of the proxy
values at the time of reporting.
- In printEvalErrors() add option to restrict number of reported items per node.
If number is zero, only number of errors per node is shown (without details)
o RooRealMPFE
- Adjust ReportErrors message to changes EvalError implementation in RooAbsReal.
- Make sure to synchronize remote error logging state with state of parent process
before each evaluate()
o RooRealVar
- Move printing of error from printValue() to printExtras()
o RooNLLVar
- Fix bug in setting of interleave parameter of base class in certain ctors
o RooAbsPdf
- Improve passing of eval error messsages by make separate messages for NaN
and negative values and including details in the error message
- Add PrintEvalError(Int_t nErr) option to fitTo() to control new eval error
message control system
- Int printValue show both value (raw from evaluate()) as well as most recently
used normalization value (if available)
o RooMinuit
- Interface new eval error logging control by adding setPrintEvalErrors(Int_t numEvalErrors)
=== Date: Thu Apr 24 15:11:59 2008 ===
o Various classes
- Fix all -Wshadow compiler warnings
=== Date: Thu Apr 24 16:32:21 2008 ===
o RooMsgService
- Use TSystem::GetPid() rather than getpid() for portability
o RooAbsReal
- Make nested class EvalError public
o RooWorkspace
- Fix windows compiler warning
========================================
o RooBanner
- Increment version tag to 2.40
Revision
21379 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 14 15:12:29 2007 UTC (7 years, 1 month ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 2253 byte(s)
Diff to
previous 21064
o (Large number of classes)
- Systematically use Riosfwd.h in header files instead
of <iostream> or Riostream.h
- Include "Riostream.h" in implementations where necessary
- Convert remaining <iostream> to "Riostream" in implementations
- Outline all inline functions using cout or endl to facilitate
use of fwd declaration of iostreams in all classes
- Elimination of some duplicate headers
- Match use of 'using namespace std' in implementation files
to classes that actually use STL classes
Revision
20161 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 2199 byte(s)
Diff to
previous 19826
o RooAbsCache
- New abstract base class for cache objects associated with RooAbsArgs.
Caches register themselves with the owning RooAbsArg and propagate
all necessary state changes and meta information to objects in the cache
o RooCacheManager
- Concrete template implementation of RooAbsCache with an interface
and functionality styled after RooNormListManager. The template class
provide no special handling for cache contents that includes RooAbsArg
objects and does not forward hook calls. It is thus mostly intended
to cache basic types indexed on a normalization/integration configuration
o RooObjCacheManager
- Class derived from RooCacheManager<RooAbsCacheElement> that implements
all proper call forwarding and handling of state and other meta information
to RooAbsArg objects embedded in the cache elements. To facilitate this
functionality the RooAbsCacheElement defines a pure virtual method
containedArgs() that must be implemented to expose its contents to
the cache manager. The default behavior on a serverRedirect hook is
to sterilize the cache. OperMode changes are not forwarded by default
to the cache contents as cached objects do not necessarily have the
same operation mode (e.g. if the cache contains an integral of its owner).
Any calls to optimizeCacheMode(), printCompactTreeHook(), and findConstantNodes()
are forwarded. Moreover, optimizeCacheMode() calls are remembered and
any objects inserted in the cache after such a call was received will be
optimized upon insertion in the cache
o RooAbsCacheElement
- Abstract base class for objects to be managed by RooObjCacheManager. Each
object must in addition to its payload implement the containedArgs()
member function that exposes the RooAbsArg object content to the manager
for processing. The argument passed to containedArgs() indicates the use
case for the returned list of objects, allowing the cache payload to
return different lists depending upon use. This is for most applications
not required.
o RooAbsCachedPdf
- Abstract base class derived from RooAbsPdf for p.d.f.s that implement
value caching in a grid over the entire domain of the observables.
The base class implements the overall caching logistics and manages
the RooDataHists and RooHistPdfs that respresent the cached contents.
Derived classes must inputBaseName() defined a unique name prefix for
all cache objects, actualObservales() and actualParameters() to
determined the actual observables and parameters given a set of
available observables and fillCacheObject() which should fill the
RooDataHist cache for a given obs/params configuration with the
p.d.fs values.
o RooAbsSelfCachedPdf
- Abstract base class derived from RooAbsCachedPdf that implements
all of the required logistics in RooCachedPdf and only require
derived classes from RooAbsSelfCachedPdf to implement evaluate().
Any class derived from RooAbsPdf can thus be trivially switched
to derived from RooAbsSelfCachedPdf and gain the caching functionality.
o RooCachedPdf
- Concrete class derived from RooAbsCachedPdf that implements
the caching of an externally provided p.d.f in the constructor.
o RooFFTConvPdf
- Concrete class derived from RooAbsCachedPdf that implement generic
numeric convolution of two input p.d.f.s using FFT technique
and convolution theorem. Actual FFTs are calculated by FFTW
through TVirtualFFT interface in ROOT. Present implementation only supports
convolution in one dimension, but this will be extended later
as there are no fundamental limitations in RooAbsCachedPdf nor FFTW.
o RooHistPdf
- Moved from RooFit to RooFitCore because it is used by caching classes
o RooProdPdf
- Use new RooObjCacheManager to store partial objects
- Fix memory leak (already patched in 15.0.14h)
o RooDataHist
- Use new RooCacheManager template to cache partial bin volumes
- Add new set(),setAllWeights() method to update current weight and all weights
respectively, for use in cached p.d.f.s
- Add sliceIterator() that iterates over all bins in a lower dimensional
slice of the dataset
o RooDataHistSliceIter
- Class derived from TIterator that implements the iteration
over a slice in a reduced number of dimensions in a RooDataHist
o RooMsgService
- Speed up processing of debug streams in cases where no debug streams are active
- add macros series oocoutX and oocxcoutX that allow to associate message with
a different object than *this
o RooRealBinding
- Interface new setValue method that allows value to be set outside default
domain, but inside given alternate named range. For use in numeric integrator
bindings
o RooAbsRealLValue
- Add new inRange() method with range name specifier to check against chosen
range instead of default range
o RooCmdConfig
- Fix dangling return pointer problem in decodeStringOnTheFly() method
o RooNameSet
- Fix bug in refoll()
o RooChi2Var, RooNLLVar
- Add processing of AddCoefRange() named argument
o RooConvCoefVar
- Hold p.d.f in proxy without value/shape state propagation to obtain
correct dependency of RooConvCoefVar through separate set proxy
with parameters that do have state propagation
- In getAnalyticalIntegral() ask for integration coefficient specific
to coefficient (following interface change in RooAbsAnaConv)
o RooEfficiency
- Follow interface change in RooCategoryProxy
o RooAbsAnaConvPdf
- Use new RooObjCacheManager to hold normalization and coefficient representations
- Extend getCoefAnalyticalIntegral() interface so that each coefficient
can have a separate integration configuration
- Modify makeCoefVars() such that it constructs the RooConvCoefVars with
actual dependents for each coefficients, rather than inserting dependencies
of any of the coefficients in each coefficient. This logic requires support
from the implementation class that is interface through a new member function
coefVars()
o RooAbsReal
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Remove superfluous _norm[] token in name returned by integralNameSuffix() if
no normalization set is supplied.
- Add a fillDataHist() method that fills a given RooDataHist with a sampling
of the given function. Added for support of caching p.d.f.s
- Downgrading warning on non-dependent projection variables in plotOn() to
a debug level message
- Remove function optimizeDirty(),doConstOpt(),undoConstOpt(),findCacheableBranches()
findUnusedDatasetVariables() and findRedundantCacheServers() as part of reorganization
of optimization functionality.
o RooAbsCollection
- Use iterator semantics instead of vector semantics to process RooLinkedList
contents in assignment operator
- Add utility function contentsString() returning stl string with names
of contents
o RooAddPdf
- Rewrite cache management using new RooObjCacheManager that holds projection
integrals, range integrals and supplemental normalization lists
o RooAbsOptGoodnessOfFit
- Improve handling of normalization ranges and reference ranges for test statistics
containing RooAddPdfs. New named argument in fitTo() and RooNllVar::ctor() pass
reference range for fractions in RooAddPdf components that do not have an explicit
fixed definition already. Name all normalization ranges explicitly after the
subrange to which the're applied to avoid name clashes and conflicts if multiple
normalization ranges are involved.
- Rewrite informational messages through RooMsgService
- Implement new constOptimizeTestStatistic() function that signals all test statistic
components of a RooAbsArg expression tree to perform their constant term optimization
- Implement new optimizeCaching() driver function that changes default lazy-evaluation-with-caching
scheme to test statistic scheme where only parameters objects propagate state changes and
where all components that depend directly or indirectly on observables have lazy evaluation
disabled. Changes to p.d.f objects are delegated to RooAbsPdf::optimizeCacheMode(). Changes
to dataset are delegated to RooAbsData::optimizeReadingWithCaching()
- Implement new optimizeConstantTerms() function that is back end for constOptimizeTestStatistic
implementation.
o RooAICRegistry, RooNormSetCache
- Remove tracking of allocation cycles of RooArgSets as this scheme is superseded by
memory pool mechanism for RooArgSet allocation
o RooMappedCategory
- Follow interface change in RooCategoryProxy.
o RooRealMPFE
- Follow reorganization of optimization functionality: implement new constOptimizeTestStatistic
function for forwarding to slave processes.
o RooRealVar
- Add new setVal() function with range name to facilite setting of values that are outside
default range, but inside specified alternate range. Needed for numeric integration and
certain RooAddPdf coefficient projection.
o RooAbsArg
- Make state management functions public [is/set][Value/ShapeDirty](), setOperMode90
- Add static _flipAClean boolean to support setACleanAdirty() static method.
- Implement mechanism for registration of cache objects with base class RooAbsCache.
Forward all calls to operModeHook(), redirectServersHook(), optimizeCacheMode()
and printCompactTreeHook() to all caches for further processing
- Define constOptimize() function and provide default implementation that forwards
to all servers
- Implement optimizeCacheMode() function that puts expression tree in optimized
caching for test-statistics operations (only cache/lazy evaluate nodes that
do not (indirectly) depend on observables
- Implement findConstantNodes() function that identifies all nodes that depend
exclusively on constant observables and >0 observables that are eligible
for precalculation and caching in test statistics operations by
RooAbsOptTestStatistic::optimizeConstantTerms()
- Define constOptimizeTestStatistics that signal an expression tree that any
embedded test statistic objects should perform their constant term optimization.
Default implementation in RooAbsArg forwards call to all servers.
o RooAbsPdf
- Use new RooObjCacheManager to manage normalization integrals cache.
- Process new SumCoefRange() option in fitTo() that sets the coeffient
interpretation range for all embedded RooAddPdf objects of which
the interpretation range was not explicitly set
- Extend interface of fixAddCoefNormalizationSet(): add extra argument
that controls if AddCoef normalization set are forcibly overruled
for objects that already have an explicit range setting.
o RooRealIntegral
- Add some informational messaging through RooMsgService, rewrite existing ones
- Speed up numeric summations by precreating the involved RooSuperCategory
in the ctor rather than in evaluate().
- Fix bug in dependency insertion: explicitly require servers to be value
server to avoid pulling in fake dependents.
- Remove obsolete data members
- Implement new setACleanADirty() function that atomically flips state of
all AClean objects to ADirty for the duration of the integration step.
Replaces the much more expensive prepareACleanFunc() that did this
only for the objects involved.
- Process factorizing terms in integral only if the list is not empty
- Process Jacobian terms in integral only if the list is not empty
o RooAddGenContext
- Adapt to cache management chanches in RooAddPdf
o RooNumIntFactory
- Use STL classes for internal memory management
o RooSetProxyy
- Implement operator new() and operator() delete as required because
RooArgSet implements them
o RooAbsGoodnessOfFit
- Store and forward AddCoefRange information for embedded RooAddPdf objects
- Implement constOptimizeTestStatistic() and forward to components
o RooErrorVar
- Follow inRange() interface change in RooAbsRealLValue
o RooConvGenContext
- Adapt code to make it work with both RooAbsAnaConv objects and
the newly introduced RooFFTConvPdf
o RooMinuit
- Follow reorganization of optimization functionality
o RooProjectedPdf
- Store projection using new RooObjCacheManager
o RooGlobalFunc
- Add RooFit::SumCoefRange() named argument for RooAbsPdf::fitTo()
and RooNLLVar::ctor() and RooChi2Var::ctor()
o RooClassFactory
- Extend existing makePdf(),makeFunction and makeClass() functions
to also accept RooAbsCategory arguments, to accept an optional string
inserted as the return value expression inserted in the
evaluate() method of the class created, as well as as option string
specifying one or more analytical integrations of the given function
expression that will be advertised in the generated getAnalyticalIntegral()
code and implemented in the generated analyticalIntegral() code
- Add makeAndCompileFunction() and makeAndCompilePdf methods that
generate the code and immediate compile it through ROOTs ACliC interface.
These functions have a simpler interface because the list of arguments
of the function to be created can be specified as a const RooArgSet&
rather than a string with a list of names, thus making it easier
for on-the-fly definition of compiled objects.
- Add defineFunction() and definePdf() methods define and compile
a function/pdf using the above functions and immediately instantiate
an object of the given type passing the specified RooArgSet arguments
to the constructor of the object. These functions make a compiled
equivalent of RooFormulaVar based on the TFormula interpreter, i.e.
RooAbsReal* f = new RooFormulaVar("f","D(1-2w)",RooArgSet(D,w)) ;
becomes
RooAbsReal* f = RooClassFactory::defineFunction("f","D(1-2w)",RooArgSet(D,w)) ;
o RooAbsCategory
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Construct explit clean name for TBranch name if node is cached, equivalent
to what is done in RooAbsReal. Needed because new constOptimizer can also
cache RooAbsCategory objects
o RooArgSet
- Implement operator new() and operator delete() to implement memory pool scheme
for RooArgSets. The goal of this implementation is to insure that two RooArgSet
pointers are _never_ the same. This allows to RooNormSet cache manager to safely
and quickly index integration and normalization configurations by evaluating
the contents of a RooArgSet only the first time it sees it.
o RooSimultaneous
- Implement caching of partial integrals using new RooObjCacheManager
- Following interface change in RooCategoryProxy ;
o RooAbsData
- Defined pure virtual methods optimizeReadingWithCache() and allClientsCached()
o RooTreeData
- Implement optimizeReadingWithCache() which determines given a p.d.f to be
evaluated and a list of the nodes that are cached for it, which observables
in the dataset are no longer required because they are either not an observable
of the p.d.f, or they exclusively feed nodes that are cached. Reading of these
observables is disabled through SetBranchStatus().
- Move allClientsCached() utility function here from RooAbsReal.
o RooCategoryProxy
- Remove const char*() conversion operator in favor of a const char* label() method
to remove possibly ambiguities in C++ math expressions involving category proxies.
o LinkDef3.h
- Add newly defined classes
Revision
12082 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 20 15:45:21 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 2277 byte(s)
Diff to
previous 12063
o RooBanner
- Update version number and copyright
o Many files
- Change <iostream> to "Riostream" to support compilation on platforms
that do not have iostream classes in namespace std
o RooAbsAnaConvPdf
- Fix bug in range integration in getAnalyticalIntegralWN()
- Change getCoefAnalyticalIntegral() signature to include rangeName in argument list
o RooAbsArg
- Add methods getObservables()/getParameters with const RooAbsData& argument
o RooAbsPdf
- Add support for Range(Double_t, Double_t) to specify fit range in fitTo()
- Migrate getMaxVal()/maxVal() to RooAbsReal [Gerhard]
- Fix bug in normalization of PDF projections over limited range: account for both
fraction of data in range and fraction of projection in range (calculation of latter
deferred to RooAbsReal::plotOn)
o RooAbsReal
- Migrate getMaxVal()/maxVal() from RooAbsReal [Gerhard]
- Add code in plotOn() to support normalization of PDF projections plotted in limited range
o RooAbsRealLValue, RooRealVar, RooErrorVar, RooLinearVar
- Change getBinning() so that it only creates a new binning on the fly if a newly added boolean argument
is true. Otherwise, return default binning
o RooAdaptiveGaussKronrodIntegrator1D, RooGaussKronrodIntegrator1D
- Declare prototypes for glue functions
o RooArgSet
- Fix readFromStream() and writeToStream() so that they are consistent with each other again for
both regular and scientific notation mode.
- Fix processing of include directives inside files in readFromFile()
- Suppress warning messages about ignored lines in files unless verbose flag is set. Add verbosity control
flag to readFromFile().
o RooCategory
- Support concept of ranges for categories as well through new member functions setRange(),addToRange(),
clearRange(),hasRange(),isInRange() and isStateInRange(). Ranges are named TLists containing a non-owned
subset of the possible RooCatTypes.
o RooCategoryProxy
- Make lvptr() const since it is.
o RooConvCoefVar
- Pass rangeName in getAnalyticalIntegral() to getCoefAnalyticalIntegral()
o RooPlotable, RooCurve, RooHist, RooEllipse
- Implement getFitRangeNEvt(Double_t, Double_t) that returns the number of events in the given sub-range.
o RooDataHist
- Fix bug using RooAbsData::plotOn --> using RooTreeData::plotOn
o RooGlobalFunc
- Add adjustNorm boolean argument to named argumentss Range()
o RooMultiCatIter
- Require that input is RooAbsCategoryLValue rather than RooAbsCategory.
o RooPlot
- Keep track of object that generated normalization event count in addition to event count itself.
This allows to later on calculate an event count in a limited range through getFitRangeNEvt(Double_t, Double_t)
o RooRealIntegral
- Support ranges in category summation in integration code.
o RooSimPdfBuilder
- Fix bug in unitarity constraint split of parameter in partial build: adjust formula for remainder fraction
so that it only uses the states that are actually built.
- Improve error handling
o RooSuperCategory
- Implement hasRange() and isInRange() functionality inherited from RooAbsRealLValue
o RooClassFactory
- New class that automatically generates code for PDFs and functions given a name and a list of argument names
o RooEffProd
- New class that implement product of PDF and efficiency function. Main feature is efficient implementation
of event generator in case input PDF has 'smart' event generator
o RooEffGenContext
- Generator context associated with RooEffProd
o Module.mk
- ROOT make file module needed to compile RooFit as part of ROOT
o make_roofit_installkit
- Script to package RooFit source as ROOT module for compilation with ROOT system
Revision
12063 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 16 09:31:32 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 2311 byte(s)
Diff to
previous 11619
o RooFit.hh
- New global header file for compiler patches. Currently contains
single patch for SunOS imported from BaBar.hh
o All .cc files
- Include RooFit.hh as first header file
o RooAbsData
- Make all plotOn() methods public
o RooAbsProxy
- Include pragma to switch of VC++ warning C4355
"'this' : used in base member initializer list'"
which would otherwise be triggered on each proxy initialization.
(each proxy constructor _expects_ a base class ptr so the warning
is misleading)
o RooAdaptiveGaussKronrodIntegrator1D, RooDataHist, RooGaussKronrodIntegrator1D,
RooGraphSpring, RooMCIntegrator, RooPolyVar, RooTreeData
- Change pow --> TMath::power() to eliminate windows compiler warnings
o RooEllipse
- Change constant M_PI to TMath::Pi()
o RooGlobalFunc
- Change RooConst --> RooFit::RooConst as functions has been moved into namespace
o RooMath
- Add erf() and erfc() forwarder functions to TMath::Erf() and TMath::Erfc()
o RooRealConstant
- Move RooConst() function into namespace RooFit
o RooSimultaneous
- Remove one default parameter from implementation version of plotOn() to resolve
overloading ambiguity reported by AIX compiler
o RooTreeData
- Make nested struct PlotOpt public to avoid CINT access problems
o RooTruthModel
- Add explicit cast to fabs() of proxy as it gives warning in Windows C++
Revision
10648 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 29 20:24:44 2004 UTC (10 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 2073 byte(s)
Diff to
previous 10638
o All Classs
- Remove '#include BaBar/BaBar.hh' that was erroneously
introduced by the BaBar IOstream migration utilities
o Several class
- Initializion order changes, removal of unused variables,
addition of missing return statements to make all code
compile cleanly with '-Wall -Wno-parentheses'
o RooAbsFunc
- Make resetNumCall() const
o RooAbsIntegrator
- Add calculate() method that wrape integral() between
profiling code the track the number of integrand
function calls
o RooIntegrator1D,RooImproperIntegrator1D,RooSegmentedIntegrator1D,
RooSegmentedIntegrator2D,RooMCIntegrator
- Change interface to take RooNumIntConfig class instead
of now deprecated RooIntegratorConfig class
- Add member function that advertise capability of the integrator:
canIntegrate1D,2D,ND,OpenEnded()
o RooAbsReal
- Change normalization integral management classes
(createIntegral(), (set)defaultIntegratorConfig(),
(set)specialIntegratorConfig()) to work with new
RooNumIntConfig class.
o RooArgSet
- Add new convenience functions get/setRealValue(),
get/setCatLabel/Index(), get/setStringValue() to
manage common content of RooArgSet.
o RooConvCoefVar, RooConvGenContext
- Support class name change RooConvolutedPdf -> RooAbsAnaConfPdf
o RooCustomizer
- Add function setCloneBrancSet() that allows to specify
an external set that takes ownership of the cloned branch
nodes so that customized objects can live beyond the lifetime
of the RooCustomizer instance
o RooImproperIntegrator1D
- Add code to handle limit scenario changes (closed to open ended
and vice versa) on the fly
o RooIntegrator1D
- Add fixSteps option to terminate integral calculation after
fixed number of steps w/o extrapolation. This is more robust
for certain types of integrals
o RooRealIntegral
- Change interface to take RooNumIntConfig class instead of
RooIntegratorConfig class
- Delegate instantiation of numeric integration engines to
new class RooNumIntFactory
o RooNumIntConfig
- New class to store configuration of numeric integator engines.
This class has a brief common section with common properties
like absolute and relative precision convergence criteria,
and a section with implementation specific details for each
engine in the form of a RooArgSet. The default settings for
each existing engine are automatically added to the defaultConfig()
instance during run-time initialization
o RooNumIntFactory
- Factory class for numeric integration engines. Each existing
integrator engine automatically registers with the factory
stating its capabilities (1D,2D,ND / Open-ended). The
createIntegrator() function instantiates an integrator
appropriate for a given problem. In case more than one
integration engine can solve the given problem the (user
changable) information in the RooNumIntConfig passed along
with the call is used.
o RooGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,43, and 87 point rules in succession
until the desired accuracy is reached. Open-ended integrals are
automatically handled through a x -> 1/x coordinate transformation
o RooAdaptiveGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,31,41,51 or 61 point rule and
recursively subdivides the integration domain until the desired accuracy
is reached. For integrands with integrable singulaties the Wynn epsilon
rule can be selected to speed up the converges of these integrals. Open
ended integrals are automatically handles through a x -> 1/x
coordinate transformation
o RooNumConvPdf
- New operator PDF class that implements numeric convolution of
any two PDFs. The calculation of the convolution integrand
is implemented in the auxiliary class RooConvIntegrandBinding,
which in turn can be integrated with any 1-D numeric integration
engine. The default integration method for convolution integrals
is the adaptive Gauss-Kronrod method, which appears to give the
most stable results. By default the integration is performed
from -inf to +inf, but can optionally be restricted to a sliding
window using the setConvolutionWindow class, useful for relatively
narrow resolution PDFs.
o RooAbsAnaConvPdf
- New name of RooConvolutedPdf to clearly distinguish its functionality
from RooNumConvPdf
Revision
2995 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 8 05:20:24 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 1078 byte(s)
Diff to
previous 2654
Documentation update
--------------------
o Most classes
- Update inline documentation
o RooHtml
- Add MakeIndexNew() method that can create sub-index files
by topic. Similar to THtml::MakeIndex(), but topic is taken
from tag in file instead of subdirectory name
- Add MakeIndexOfTopics() method that creates master
index of index files by topic.
o All classes
- Provisionally assign one of the following topic tags to each class
PDF - Probability Density functions
REAL - Real valued functions
CAT - Discrete valued functions
PLOT - Plotting and tabulating
CONT - Container classes
MISC - Miscellaneous
USER - Other user classes
AUX - Auxiliary classes for internal use
o makedocs
- Modify to make new sub-index files and index of topics file.
(Description of topic tags is defined here)
Revision
2654 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 8 23:11:25 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 1066 byte(s)
Diff to
previous 2629
RooAbsIntegrator:
- no longer inherits from TObject
- uses RooAbsFunc interface instead of RooAbsReal
- remove (AbsReal,mode) binding functionality (now performed by
class RooRealAnalytic)
- add counter for number of integrand evaluations
RooIntegrator1D:
- use RooAbsFunc interface instead of RooAbsIntegrator::eval()
- fix array size bug (already fixed in RFT after this routine was copied)
- add a constructor option to select the summation and refinement rule
to use and change the maxSteps, eps defaults to zero (defaults depend on
the rule being used and are now applied in the initialize() method)
- implement a new addMidpoint() summation rule that can be used to
estimate certain improper integrals
- add check for finite integration limits
RooRealIntegrator:
- add isValid() member fn to flag ctor problems
- add check that all integration vars are lvalues
- use new RooIntegrator1D interface
- use new RooRealBinding,RooRealAnalytic classes
- remove maxSteps, eps ctor parameters (they were not being used)
- use new RooInvTransform and RooImproperIntegrator classes for 1-dim
numerical integrals with one or both limits infinite
- change logic for calling initNumIntegrator() so that it correctly
propagates shape/value changes
- make initNumIntegrator() const so it can be called from evaluate()
and make the data members it modifies mutable
- support 1D numerical integration with either limit infinite via
RooImproperIntegrator1D
RooAbsArg,RooAbsRealLValue,RooAbsCategoryLValue:
- add isLValue() member fns
RooInvTransform:
- new RooAbsFunc implementation that performs the change-of-vars
transformation x -> 1/x on an input RooAbsFunc.
RooImproperIntegrator1D:
- new RooAbsIntegrator implementation that performs an integration
where one or both limits are infinite by splitting up the range
into up to 3 subranges that can each be handled by RooIntegrator1D.
RooNumber:
- new class to encapsulate platform-specific numerics (eg, infinity)
RooAbsRealLValue,RooIntegrator1D,RooImproperIntegrator1D,RooLinearVar,
RooRealIntegrator,RooRealVar:
- use RooNumber statics instead of (non-portable) preprocessor INFINITY
and remove unecessary include dependencies on RooAbsRealLValue.hh
RooIntegratorTest.cc:
- test macro that is not compiled into the library
Revision
2629 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 23:54:24 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 1055 byte(s)
Diff to
previous 2222
RooRealIntegral:
- rename Unity to PassThrough
- change function arg type from RooAbsPdf to RooAbsReal
- change (RooAbsReal&) to const_cast (why does the RooRealProxy ctor
need a non-const ref?)
RooAbsIntegrator,RooIntegrator1D:
- change signatures from AbsPdf to AbsReal
Revision
2215 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 16 07:41:08 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 944 byte(s)
Diff to
previous 2158
o RooAbsReal/RooAbsPdf
- Move analytical integration support from AbsReal to AbsPdf
(getAnalyticalIntegral/analyticalIntegral/tryIntegral)
- Add more tryIntegral functions that take 2,3,4 RooArgProxies
o RooAbsRealLValue
- Rename isSafeForIntegration() to isJacobianOK()
- Add jacobian() member that return actual jacobian value
o RooRealIntegral
- Change analytical/numerical integration logic to handle
RooAbsRealLValue objects with a non-unit but constant
jacobian correctly
o RooLinearVar
- Implements most general case of RooAbsRealLValue with
constant but non-unit jacobian: X*slope + offset.
X must be a RooRealVar and slope and offset (RooAbsReal)
must not depend on X
isJacobianOK() only returns true for a given dependent
list of slope (the jacobian) has no dependents, except
for RooAbsCategoryLValues
o Some miscellaneous small bug fixes
Revision
2158 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 10 00:16:09 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 946 byte(s)
Diff to
previous 2114
o RooAbsArg
- Small change in 'Standard' printing logic
- isXXXDirty() will always return kFALSE if isDerived is kFALSE
o RooAbsCategory
- Absorb caching/evaluation code of RooDerivedCategory
- Add defineType(const char*) (without index code)
- Add clearTypes() ;
o RooDerivedCategory
- Retired
o RooAbsCategoryLValue
- New abstract base class for LValue categories
(e.g. RooCategory, RooSuperCategory)
o RooCategory:
- Add methods that publicize the defineType/clearType
members of RooAbsCategory
- Implement getIndex()/Label() that bypasses caching mechanism
o RooMappedCategory
- Complete rewrite using wildcard regular expression mapping
of labels. Hard-coded number mapping deprecated
o RooMapCatEntry
- New auxiliary class for RooMappedCategory
o RooSuperCategory
- New, functionality similar to version in RooFitTools,
but rewritten from scratch
o RooAbsReal
- Absorb caching/evaluation code of RooDerivedReal
- Absorb analytical integration support code of RooDerivedReal
- Absorb range checking code from RooRealVar
o RooAbsRealLValue
- New abstract base class for LValue reals
(.e.g RooRealVar, RooUnblind*)
o RooDerivedReal
- Retired
o RooRealVar
- Implement concrete getVal() that bypasses caching mechanism
o RooProdPdf
- New, functionality similar to version in RooFitTools,
but rewritten from scratch
Revision
2114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 3 02:15:56 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 954 byte(s)
Diff to
previous 2033
o (Most classes)
Merge X(const x&) and X(const char*, const X&) copy constructors
into a single X(const& X, const char*=0)
o RooAbsArg
- Add 'depth-aware' client-server management functions
recursiveRedirectServers(...)
treeNodeServerList(...)
leafNodeServerList(...)
branchNodeServerList(...)
overlaps(...)
dependsOn(...) (now recursive)
- Add/move parameter/dependent interpretation to RooAbsArg
getParameters(...)
getDependents(...)
dependentOverlaps(...)
checkDependents(...)
- Change Clone() to Clone(const char*) and make it call
a pure virtual clone().
o RooAbsPdf
- First implementation
- Actual fitting implemented in RooFitContext
- Incorporates normalization technology from
RooNormFunction (now retired)
- Separate getValNorm() dropped in favour of
getVal(const RooDataSet* =0)
- getVal(...) provides all owned proxies with
the correct data set (which they need for their
value cast operators that don't take an RDS)
o RooFitContext
- First implementation
- Owns a clone of a dataset and a PDF and ties them
together with a redirectServers
- Caches indexed parameter list for fast Minuit lookup
- global Optimizer function seeks out PDF components
that only have constant parameters and add these
as precalculated columns to the data set clone
(redirectServers edits PDF tree to point to cache)
o RooDataSet
- Implement addColumn(RooAbsReal) that adds a column
of precalculated values given function for each
row of the data set
o RooAbsReal
- Change getVal() to getVal(const RooDataSet* set=0)
to allow dynamic normalization for PDFs.
o RooArgProxy and dependents
- Cache last data set used, for use in getVal(...) call in
value cast operator.
o RooRealProxy
- add min()/max() functions that get out the integration limits
if the underlying real is a RooRealVar. (Needed by RooAbsPdf
analytical integration implementations)
o (Most classes)
- A large number of minor fixes have been applied to make
the Solaris 5.7 compiler happy
Revision
2004 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Thu Apr 19 01:42:27 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooAbsIntegrator.cxx
File length: 867 byte(s)
o RooDerivedReal:
- Extend analytical integral interface so that function can,
given a list of reals and categories, indicate which subset it
can analytically integrate / efficiency sum.
o RooRealIntegral
- Can now perform combined analytical/numerical integration.
The RooDerivedReal is asked for the largest part it can
analytically integrate/sum, the rest is taken care of numerically.
The actual numerical integration algorithm is migrated into
a dedicated class.
RRI now also handles higher dimensional numerical integrals,
provided there is a integrator class available for that
o RooAbsIntegrator (new)
Abstract base class for numerical integrators
o RooIntegrator1D (new)
Implementation of 1-dimensional numerical integrator that
used to be implemented in RooRealIntegral
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.
