Log of /trunk/roofit/roofitcore/src/RooNumIntFactory.cxx
Parent Directory
Revision
24285 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 16 15:05:15 2008 UTC (6 years, 7 months ago) by
wouter
File length: 7915 byte(s)
Diff to
previous 24280
o RooProdPdf RooParamBinning RooMsgService RooStreamParser RooPlot
RooRealBinding RooSharedPropertiesList RooPullVar RooNameSet RooNumCdf
RooThreshEntry RooNumber RooSegmentedIntegrator1D RooRangeBinning
RooRealSumPdf RooProduct RooRefCountList RooSharedProperties RooTable
RooRecursiveFraction RooNormSetCache RooNumConvPdf RooProfileLL
RooObjCacheManager RooQuasiRandomGenerator RooRealMPFE RooRealVar
RooNLLVar RooPlotable RooRealIntegral RooStringVar RooRealConstant
RooNumIntFactory RooMultiCatIter RooNumRunningInt RooMPSentinel
RooResolutionModel RooTruthModel RooMultiCategory RooPolyVar
RooSetProxy RooNumConvolution RooRealVarSharedProperties
RooProdGenContext RooMinuit RooProjectedPdf RooNameReg RooPrintable
RooRandom RooRandomizeParamMCSModule RooUniformBinning RooRealProxy
RooSimGenContext RooThresholdCategory RooSuperCategory RooTrace
RooNumIntConfig RooSegmentedIntegrator2D RooRealAnalytic RooSentinel
RooSimultaneous RooTreeData
- Update of function member documentation.
Revision
24280 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sun Jun 15 20:57:45 2008 UTC (6 years, 7 months ago) by
wouter
File length: 6598 byte(s)
Diff to
previous 23134
o RooMCIntegrator RooMCStudy RooMinuit RooMsgService RooMultiCategory RooMultiCatIter RooNameReg RooNameSet RooNLLVar
RooNormSetCache RooNumber RooNumCdf RooNumConvolution RooNumConvPdf RooNumIntConfig RooNumIntFactory RooNumRunningInt
RooObjCacheManager RooParamBinning RooPlot RooPlotable RooPolyVar RooPrintable RooProdGenContext RooProdPdf RooProduct
RooProfileLL RooProjectedPdf RooPullVar RooQuasiRandomGenerator RooRandom RooRandomizeParamMCSModule RooRangeBinning
RooRealAnalytic RooRealBinding RooRealConstant RooRealIntegral RooRealMPFE RooRealProxy RooRealSumPdf RooRealVar
RooRealVarSharedProperties RooRecursiveFraction RooRefCountList RooResolutionModel RooScaledFunc RooSegmentedIntegrator1D
RooSegmentedIntegrator2D RooSentinel RooSetPair RooSetProxy RooSharedProperties RooSharedPropertiesList RooSimGenContext
RooSimPdfBuilder RooSimultaneous RooSimWSTool RooStreamParser RooStringVar RooSuperCategory RooTable RooThreshEntry
RooThresholdCategory RooTObjWrap RooTrace RooTreeData RooTruthModel RooUniformBinning RooWorkspace
- Upgrade inline documention: make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
- Updating of data, function member documentation _not_ done yet
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/RooNumIntFactory.cxx
File length: 5536 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
20988 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 22 14:54:13 2007 UTC (7 years, 2 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 5458 byte(s)
Diff to
previous 20879
** Bringing trunk up-to-date w.r.t recent changes in branches/dev/roofit branch **
Aggregated messages from branch commits follow
--- Date: Fri Oct 19 20:35:30 2007 New Revision: 20422 ---
o RooAbsArg
- Add debug level print statement in findConstantNodes()
o RooAbsAnaConvPdf
- Do not expose cached RooCoefVars to constant term finding process.
--- Date: Fri Oct 19 21:03:40 2007 New Revision: 20423 ---
o RooPlot
- Add forwarding function for all revent Set*() methods of TH1
--- Date: Fri Oct 19 21:48:40 2007 New Revision: 20424 ---
o RooAbsAnaConvPdf
- Back out special handling of exposure of cached RooCoefVars
to constant term finding process.
o RooObjCacheManager
- Do not perform constant term finding on cache contents
if cache manager is configured to perform clearOnRedirect
for server redirects.
--- Date: Wed Oct 31 23:36:10 2007 New Revision: 20587 ---
o RooAbsRealLValue
- Remove stray debug print statements
o RooAddPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Add forgotten initializer to regular ctor
o RooAbsCachedPdf
- Add formal server-link dependency on cache parameters to
RooHistPdf cache representation so that the constant term
optimizer can make the correct decision
- Make RooObjCacheManager a persistent data member
o RooObjCacheManager
- Add debug message level information
- Make _optCacheObservables a transient data member and initialize
it in the default ctor.
o RooAbsPdf, RooProjectedPdf
- Add new default ctor to fix persistence introduced by
new cache management scheme
- Make RooObjCacheManager a persistent data member
o RooAbsArg
- Add methods graphVizTree() that produce input files
for AT&Ts graphViz to make graphical representation
of object tree. (To make actual graphics run 'dot -Tps -o graph.ps %s'
where %s is argument passed to graphVizTree().
o RooSetProxy
- Remove stray debug print statements
o RooSimultaneous
- Initialize forgotten data member in all ctors
o RooProdPdf, RooAbsAnaConvPdf
- Make RooObjCacheManager a persistent data member
o RooSuperCategory
- Make contained iterator a transient data member
and initialize it in the default ctor.
o RooCacheManager
- Add explicit separate default ctor.
o RooAddModel
- Completely new implementation, based on existing RooAddPdf.
RooResolutionModel functionality (convolution(),basisCode())
taken from original RooAddModel. Reimplement integration strategy
with caching of integral objects, rather than implementing
only common analytical component
o RooAbsAnaConvPdf,RooResolutionModel,RooAbsPdf
- Remove special hook function that were required for functioning
of original RooAddModel
o RooObjCacheManager
- Keep all _optCacheObservables versions created alive in separate owned list
and only delete at end in dtor to avoid dangling pointer in complex
optimizations
o RooAbsArg
- In optimizeCacheMode() ignore nodes that already have been const optimized.
Although const optimization normally happens first, late cache optimization
that happen upon late creation of objects can take place after const optimization.
--- Date: Tue Nov 13 12:04:55 2007 New Revision: 20774 ---
o RooAddModel
- Completely new implementation, based on existing RooAddPdf.
RooResolutionModel functionality (convolution(),basisCode())
taken from original RooAddModel. Reimplement integration strategy
with caching of integral objects, rather than implementing
only common analytical component
o RooAbsAnaConvPdf,RooResolutionModel,RooAbsPdf
- Remove special hook function that were required for functioning
of original RooAddModel
o RooObjCacheManager
- Keep all _optCacheObservables versions created alive in separate owned list
and only delete at end in dtor to avoid dangling pointer in complex
optimizations
o RooAbsArg
- In optimizeCacheMode() ignore nodes that already have been const optimized.
Although const optimization normally happens first, late cache optimization
that happen upon late creation of objects can take place after const optimization.
o RooMsgService
- Some restructuring to speed up code.
- Change topic naming from string to enum.
- Change debug-level print macros to take inline pre-decision
based on static RooMsgService boolean that indicates if any debug
stream is active. Also extend this speedup to doLogD() macro.
- Allow multiple Topic specifications in a single stream using bit-wise
or to reduce default number of streams from 6 to 2.
- Terminate matching logic to streams early for 'universal' streams
for which the logic does not depend on object properties.
o RooGlobalFunc
- Change Topic() argument from RooMsgService::MsgTopic to Int_t to allow specification
of multiple topics
o RooDataHist, RooMsgService, RooGenContext, RooAddModel, RooFFTConvPdf
RooAbsAnaConvPdf, RooAbsReal, RooAddPdf, RooAbsOptGoodnessOfFit, RooAbsCachedPdf
RooProfileLL, RooObjCacheManager, RooAbsArg, RooAbsPdf, RooRealIntegral
RooAddGenContext, RooProdGenContext, RooConvGenContext, RooProjectedPdf, RooClassFactory
RooWorkspace, RooTreeData
- Follow change in RooMsgService interface
--- Date: Tue Nov 13 13:13:05 2007 New Revision: 20776 ---
o RooMCStudy
- Initialize _genParams in 2nd ctor (fixes savannah #31139)
--- Date: Fri Nov 16 21:24:52 2007 New Revision: 20853 ---
o RooProdPdf, RooAddition
- Fix memory leaks found with valgrind
o RooMsgService, RooRealConstant, RooNumIntFactory, RooMinuit, RooNameReg, RooNumIntConfig, RooArgSet
- Add cleanup() function to delete singleton at exit
o RooMinuit
- Initialize _warnLevel data member (valgrind)
o RooAddModel
- Disable coefficient projections in convolution mode
(savannah #31302)
o RooTrace
- Remove messages about objects already deleted when not in verbose mode
o RooSentinel
- New class handling cleanup at exit
--- Date: Mon Nov 19 16:41:52 2007 New Revision: 20901 ---
o Makefile
- Makefile to build stressRooFit
o Makefile.arch
- Stolen from $ROOTSYS/test
o stressRooFit
- Driver framework, base class of unit tests and
automatic plot, curve, fit result comparison tools
that unit tests can request
o TestBasic1
- Basic test running fitting, generation and plotting on Gaussian p.d.f
--- Date: Wed Nov 21 17:58:28 2007 New Revision: 20965 ---
o stressRooFit
- Add regression test support for Double_t values
and RooTables
- In post-test analysis mode, analyze count of
(silent) ERROR messages and fail test if they
occcur
- Eliminate memory leaks in testing framework
- Add arguments '-n <N>' to run single test and
argument '-mc' to run suite in memory checking
mode in which case no references files are opened
to avoid ROOT I/O related noise in valgrind leak reports.
- Link in 21 new tests
o TestBasic2 ... TestBasic22
- New stress testing modules. Modules 4,6,7,11,21 and 22
are empty for now. All others are fully functional.
--- Date: Thu Nov 22 14:32:14 2007 New Revision: 20980 ---
o test/TestBasic15, test/TestBasic16, test/TestBasic20
- Fix memory leak in test code itself
o test/stressRooFit
- Activate RooFit internal memory tracing when run in memory check mode
o RooDataHist
- Fix memory leak
o RooMsgService
- Add Tracing subject
- Fix bug in printing of multi-subject streams
- Keep track of total number of (silent) ERROR messages
- Add method to access contents of stream configurations
o RooIntegrator1D, RooIntegrator2D, RooSegmentedIntegrator1D, RooSegmentedIntegrator2D,
RooGaussKronrodIntegrator1D, RooAdaptiveGaussKronronIntegrator1D, RooMCIntegrator, RooGrid
- Fix default ctor to initialize all values used in dtor
o RooAddModel
- Add optional boolean to ctor to take ownership of components. Used
in RooAddModel::convolution()
- Fix memory leak in convolution()
o RooFitResult
- Migrations to RooMsgService
- Add isIdentical() method for use in regression testing
o RooCurve, RooHist
- Add isIdentical() method for use in regression testing
o Roo1DTable
- Make persistable
- Add isIdentical() method for use in regression testing
o RooMath
- Migrations to RooMsgService
- Register static memory allocation of CERF lookup table in RooSentinel
for cleanup in atexit().
o RooAbsReal
- Migrations to RooMsgService
- Fix invalid read access due to wrong destructor order in plotAsymOn()
- Fix memory leak in plotOn()
o RooAbsCollection
- Restrict creation of hash tables to deep-copy operations
or shallow copy operations of lists with >30 elements
o RooAddPdf, RooRealVar, RooDataProjBinding, RooFormulaVar, RooTreeData
- Migrations to RooMsgService
o RooAbsOptGoodnessOfFit
- Fix memory leak
o RooAbsPdf
- Migrations to RooMsgService
- Fix memory leak in fitTo()
o RooNumIntFactory
- Delete all owned prototype integrators in dtor
o RooBinning
- Fix ctors to always initialize _xlo and _xhi
o RooResolutioModel
- Register static identity RooFormulaVar with RooSentinel
for cleanup in atexit()
o RooSimPdfBuilder
- Migrations to RooMsgService
- Delete all fitCats and RooSimultaneous instances created
by builder in dtor
- Return non-const top-level p.d.f. from buildPdf()
o RooLinkedList
- First delete hash tables, then clear list instead of
reverse order to avoid invalid read problems with TList
o RooMinuit
- Migrations to RooMsgService
- Initialize MINUIT print levels to -1 if RooMsgService
is operating in silent mode
- Trim initial error on parameters if param +/- 2*errors
is out of param range
o RooSentinel
- Add cleanup hooks from RooMath and RooResolutionModel
o RooSimultaneous
- Fix memory leak
- Migrations to RooMsgService
o RooProjectedPdf
- Implement RooProjectedPdf::CacheElem dtor
o RooTable
- Add pure virtual isIdentical() interface
Revision
20161 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 5122 byte(s)
Diff to
previous 19826
o RooAbsCache
- New abstract base class for cache objects associated with RooAbsArgs.
Caches register themselves with the owning RooAbsArg and propagate
all necessary state changes and meta information to objects in the cache
o RooCacheManager
- Concrete template implementation of RooAbsCache with an interface
and functionality styled after RooNormListManager. The template class
provide no special handling for cache contents that includes RooAbsArg
objects and does not forward hook calls. It is thus mostly intended
to cache basic types indexed on a normalization/integration configuration
o RooObjCacheManager
- Class derived from RooCacheManager<RooAbsCacheElement> that implements
all proper call forwarding and handling of state and other meta information
to RooAbsArg objects embedded in the cache elements. To facilitate this
functionality the RooAbsCacheElement defines a pure virtual method
containedArgs() that must be implemented to expose its contents to
the cache manager. The default behavior on a serverRedirect hook is
to sterilize the cache. OperMode changes are not forwarded by default
to the cache contents as cached objects do not necessarily have the
same operation mode (e.g. if the cache contains an integral of its owner).
Any calls to optimizeCacheMode(), printCompactTreeHook(), and findConstantNodes()
are forwarded. Moreover, optimizeCacheMode() calls are remembered and
any objects inserted in the cache after such a call was received will be
optimized upon insertion in the cache
o RooAbsCacheElement
- Abstract base class for objects to be managed by RooObjCacheManager. Each
object must in addition to its payload implement the containedArgs()
member function that exposes the RooAbsArg object content to the manager
for processing. The argument passed to containedArgs() indicates the use
case for the returned list of objects, allowing the cache payload to
return different lists depending upon use. This is for most applications
not required.
o RooAbsCachedPdf
- Abstract base class derived from RooAbsPdf for p.d.f.s that implement
value caching in a grid over the entire domain of the observables.
The base class implements the overall caching logistics and manages
the RooDataHists and RooHistPdfs that respresent the cached contents.
Derived classes must inputBaseName() defined a unique name prefix for
all cache objects, actualObservales() and actualParameters() to
determined the actual observables and parameters given a set of
available observables and fillCacheObject() which should fill the
RooDataHist cache for a given obs/params configuration with the
p.d.fs values.
o RooAbsSelfCachedPdf
- Abstract base class derived from RooAbsCachedPdf that implements
all of the required logistics in RooCachedPdf and only require
derived classes from RooAbsSelfCachedPdf to implement evaluate().
Any class derived from RooAbsPdf can thus be trivially switched
to derived from RooAbsSelfCachedPdf and gain the caching functionality.
o RooCachedPdf
- Concrete class derived from RooAbsCachedPdf that implements
the caching of an externally provided p.d.f in the constructor.
o RooFFTConvPdf
- Concrete class derived from RooAbsCachedPdf that implement generic
numeric convolution of two input p.d.f.s using FFT technique
and convolution theorem. Actual FFTs are calculated by FFTW
through TVirtualFFT interface in ROOT. Present implementation only supports
convolution in one dimension, but this will be extended later
as there are no fundamental limitations in RooAbsCachedPdf nor FFTW.
o RooHistPdf
- Moved from RooFit to RooFitCore because it is used by caching classes
o RooProdPdf
- Use new RooObjCacheManager to store partial objects
- Fix memory leak (already patched in 15.0.14h)
o RooDataHist
- Use new RooCacheManager template to cache partial bin volumes
- Add new set(),setAllWeights() method to update current weight and all weights
respectively, for use in cached p.d.f.s
- Add sliceIterator() that iterates over all bins in a lower dimensional
slice of the dataset
o RooDataHistSliceIter
- Class derived from TIterator that implements the iteration
over a slice in a reduced number of dimensions in a RooDataHist
o RooMsgService
- Speed up processing of debug streams in cases where no debug streams are active
- add macros series oocoutX and oocxcoutX that allow to associate message with
a different object than *this
o RooRealBinding
- Interface new setValue method that allows value to be set outside default
domain, but inside given alternate named range. For use in numeric integrator
bindings
o RooAbsRealLValue
- Add new inRange() method with range name specifier to check against chosen
range instead of default range
o RooCmdConfig
- Fix dangling return pointer problem in decodeStringOnTheFly() method
o RooNameSet
- Fix bug in refoll()
o RooChi2Var, RooNLLVar
- Add processing of AddCoefRange() named argument
o RooConvCoefVar
- Hold p.d.f in proxy without value/shape state propagation to obtain
correct dependency of RooConvCoefVar through separate set proxy
with parameters that do have state propagation
- In getAnalyticalIntegral() ask for integration coefficient specific
to coefficient (following interface change in RooAbsAnaConv)
o RooEfficiency
- Follow interface change in RooCategoryProxy
o RooAbsAnaConvPdf
- Use new RooObjCacheManager to hold normalization and coefficient representations
- Extend getCoefAnalyticalIntegral() interface so that each coefficient
can have a separate integration configuration
- Modify makeCoefVars() such that it constructs the RooConvCoefVars with
actual dependents for each coefficients, rather than inserting dependencies
of any of the coefficients in each coefficient. This logic requires support
from the implementation class that is interface through a new member function
coefVars()
o RooAbsReal
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Remove superfluous _norm[] token in name returned by integralNameSuffix() if
no normalization set is supplied.
- Add a fillDataHist() method that fills a given RooDataHist with a sampling
of the given function. Added for support of caching p.d.f.s
- Downgrading warning on non-dependent projection variables in plotOn() to
a debug level message
- Remove function optimizeDirty(),doConstOpt(),undoConstOpt(),findCacheableBranches()
findUnusedDatasetVariables() and findRedundantCacheServers() as part of reorganization
of optimization functionality.
o RooAbsCollection
- Use iterator semantics instead of vector semantics to process RooLinkedList
contents in assignment operator
- Add utility function contentsString() returning stl string with names
of contents
o RooAddPdf
- Rewrite cache management using new RooObjCacheManager that holds projection
integrals, range integrals and supplemental normalization lists
o RooAbsOptGoodnessOfFit
- Improve handling of normalization ranges and reference ranges for test statistics
containing RooAddPdfs. New named argument in fitTo() and RooNllVar::ctor() pass
reference range for fractions in RooAddPdf components that do not have an explicit
fixed definition already. Name all normalization ranges explicitly after the
subrange to which the're applied to avoid name clashes and conflicts if multiple
normalization ranges are involved.
- Rewrite informational messages through RooMsgService
- Implement new constOptimizeTestStatistic() function that signals all test statistic
components of a RooAbsArg expression tree to perform their constant term optimization
- Implement new optimizeCaching() driver function that changes default lazy-evaluation-with-caching
scheme to test statistic scheme where only parameters objects propagate state changes and
where all components that depend directly or indirectly on observables have lazy evaluation
disabled. Changes to p.d.f objects are delegated to RooAbsPdf::optimizeCacheMode(). Changes
to dataset are delegated to RooAbsData::optimizeReadingWithCaching()
- Implement new optimizeConstantTerms() function that is back end for constOptimizeTestStatistic
implementation.
o RooAICRegistry, RooNormSetCache
- Remove tracking of allocation cycles of RooArgSets as this scheme is superseded by
memory pool mechanism for RooArgSet allocation
o RooMappedCategory
- Follow interface change in RooCategoryProxy.
o RooRealMPFE
- Follow reorganization of optimization functionality: implement new constOptimizeTestStatistic
function for forwarding to slave processes.
o RooRealVar
- Add new setVal() function with range name to facilite setting of values that are outside
default range, but inside specified alternate range. Needed for numeric integration and
certain RooAddPdf coefficient projection.
o RooAbsArg
- Make state management functions public [is/set][Value/ShapeDirty](), setOperMode90
- Add static _flipAClean boolean to support setACleanAdirty() static method.
- Implement mechanism for registration of cache objects with base class RooAbsCache.
Forward all calls to operModeHook(), redirectServersHook(), optimizeCacheMode()
and printCompactTreeHook() to all caches for further processing
- Define constOptimize() function and provide default implementation that forwards
to all servers
- Implement optimizeCacheMode() function that puts expression tree in optimized
caching for test-statistics operations (only cache/lazy evaluate nodes that
do not (indirectly) depend on observables
- Implement findConstantNodes() function that identifies all nodes that depend
exclusively on constant observables and >0 observables that are eligible
for precalculation and caching in test statistics operations by
RooAbsOptTestStatistic::optimizeConstantTerms()
- Define constOptimizeTestStatistics that signal an expression tree that any
embedded test statistic objects should perform their constant term optimization.
Default implementation in RooAbsArg forwards call to all servers.
o RooAbsPdf
- Use new RooObjCacheManager to manage normalization integrals cache.
- Process new SumCoefRange() option in fitTo() that sets the coeffient
interpretation range for all embedded RooAddPdf objects of which
the interpretation range was not explicitly set
- Extend interface of fixAddCoefNormalizationSet(): add extra argument
that controls if AddCoef normalization set are forcibly overruled
for objects that already have an explicit range setting.
o RooRealIntegral
- Add some informational messaging through RooMsgService, rewrite existing ones
- Speed up numeric summations by precreating the involved RooSuperCategory
in the ctor rather than in evaluate().
- Fix bug in dependency insertion: explicitly require servers to be value
server to avoid pulling in fake dependents.
- Remove obsolete data members
- Implement new setACleanADirty() function that atomically flips state of
all AClean objects to ADirty for the duration of the integration step.
Replaces the much more expensive prepareACleanFunc() that did this
only for the objects involved.
- Process factorizing terms in integral only if the list is not empty
- Process Jacobian terms in integral only if the list is not empty
o RooAddGenContext
- Adapt to cache management chanches in RooAddPdf
o RooNumIntFactory
- Use STL classes for internal memory management
o RooSetProxyy
- Implement operator new() and operator() delete as required because
RooArgSet implements them
o RooAbsGoodnessOfFit
- Store and forward AddCoefRange information for embedded RooAddPdf objects
- Implement constOptimizeTestStatistic() and forward to components
o RooErrorVar
- Follow inRange() interface change in RooAbsRealLValue
o RooConvGenContext
- Adapt code to make it work with both RooAbsAnaConv objects and
the newly introduced RooFFTConvPdf
o RooMinuit
- Follow reorganization of optimization functionality
o RooProjectedPdf
- Store projection using new RooObjCacheManager
o RooGlobalFunc
- Add RooFit::SumCoefRange() named argument for RooAbsPdf::fitTo()
and RooNLLVar::ctor() and RooChi2Var::ctor()
o RooClassFactory
- Extend existing makePdf(),makeFunction and makeClass() functions
to also accept RooAbsCategory arguments, to accept an optional string
inserted as the return value expression inserted in the
evaluate() method of the class created, as well as as option string
specifying one or more analytical integrations of the given function
expression that will be advertised in the generated getAnalyticalIntegral()
code and implemented in the generated analyticalIntegral() code
- Add makeAndCompileFunction() and makeAndCompilePdf methods that
generate the code and immediate compile it through ROOTs ACliC interface.
These functions have a simpler interface because the list of arguments
of the function to be created can be specified as a const RooArgSet&
rather than a string with a list of names, thus making it easier
for on-the-fly definition of compiled objects.
- Add defineFunction() and definePdf() methods define and compile
a function/pdf using the above functions and immediately instantiate
an object of the given type passing the specified RooArgSet arguments
to the constructor of the object. These functions make a compiled
equivalent of RooFormulaVar based on the TFormula interpreter, i.e.
RooAbsReal* f = new RooFormulaVar("f","D(1-2w)",RooArgSet(D,w)) ;
becomes
RooAbsReal* f = RooClassFactory::defineFunction("f","D(1-2w)",RooArgSet(D,w)) ;
o RooAbsCategory
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Construct explit clean name for TBranch name if node is cached, equivalent
to what is done in RooAbsReal. Needed because new constOptimizer can also
cache RooAbsCategory objects
o RooArgSet
- Implement operator new() and operator delete() to implement memory pool scheme
for RooArgSets. The goal of this implementation is to insure that two RooArgSet
pointers are _never_ the same. This allows to RooNormSet cache manager to safely
and quickly index integration and normalization configurations by evaluating
the contents of a RooArgSet only the first time it sees it.
o RooSimultaneous
- Implement caching of partial integrals using new RooObjCacheManager
- Following interface change in RooCategoryProxy ;
o RooAbsData
- Defined pure virtual methods optimizeReadingWithCache() and allClientsCached()
o RooTreeData
- Implement optimizeReadingWithCache() which determines given a p.d.f to be
evaluated and a list of the nodes that are cached for it, which observables
in the dataset are no longer required because they are either not an observable
of the p.d.f, or they exclusively feed nodes that are cached. Reading of these
observables is disabled through SetBranchStatus().
- Move allClientsCached() utility function here from RooAbsReal.
o RooCategoryProxy
- Remove const char*() conversion operator in favor of a const char* label() method
to remove possibly ambiguities in C++ math expressions involving category proxies.
o LinkDef3.h
- Add newly defined classes
Revision
15668 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jul 3 15:37:11 2006 UTC (8 years, 6 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 5626 byte(s)
Diff to
previous 13546
o RooAbsCollection
- Fix bug in printLatex() : mangle both upper and lowercase options for sibling lists instead
of just uppercase options
o RooAbsGoodnessOfFit
- Forgot to put certain print statements in if (_verbose) conditionals (C.Roat)
- Order of arguments in calls to create() sometimes wrong (verbose/ncpu swapped) (C.Roat)
o RooAbsOptGoodnessOfFit
- Fix more mistakes with if (_verbose) conditionals (C.Roat)
o RooAbsRealLValue
- Remove forgotten debug print statement
o RooAdaptiveGaussKronrodIntegrator1D,RooGaussKronrodIntegator1D,RooIntegrator1D,RooIntegrator2D,
RooSegmentedIntegrator1D,RooSegmentedIntegrator2D,RooImproperIntegrator1D,RooMCIntegator
- Change initialization process of RooNumIntFactory from dynamic process on loading to
static process in RooNumIntFactor ctor as current model has problems
o RooAddPdf
- Add forgotton initializer for _refCoefRangeName in one of the constructors
o RooArgSet
- Declare writToFile() and writeToStream() as 'const'
o RooBanner
- Increment version tag to v2.08
o RooChi2Var
- Fix copy/paste error in print statements in ctor
o RooFitResult
- Put ROOT version dependent #ifdef around TMatrix forward declaration
to make it work with both ROOT4 and ROOT5
o RooHist,RooPlot
- New implementation of pullHist/residualHist from G.Raven
o RooNumIntConfig
- Add forgotten initializers of RooCategory datamembers to ctor (fixes crashes
observed by J. Rademackers)
o RooNumIntFactory
- Perform static initialization of all numeric integrator engines in the factory constructor
(fixes oberved crashes of all numeric integration and configuration business)
o RooRealVar
- Back out change that setting asymmetric error clear symmetric error and vice versa.
It causes just too much confusion...
o RooSharedPropertiesList
- Explicitly check for and handle input null pointers
Revision
13546 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 8 13:19:58 2005 UTC (9 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 5453 byte(s)
Diff to
previous 12082
o RooCategorySharedProperties
- Shared properties implementation for RooCategory. Contains
definition of named ranges.
o RooCategory
- Move towards shared properties implementation of named ranges
o Roo1DTable RooAbsArg RooAbsCategory
RooAbsCollection RooAbsString RooArgList
RooArgSet RooCategory RooCategory
RooCategoryProxy RooConvCoefVar RooConvGenContext
RooCustomizer RooDataHist RooErrorVar
RooFitResult RooGenCategory RooGenCategory
RooGraphEdge RooGraphNode RooGraphNode RooHtml
RooImproperIntegrator1D RooMultiCategory RooNameSet
RooNumIntConfig RooNumIntFactory RooSuperCategory
RooSuperCategory RooTable RooThreshEntry
- Replace many ROOT header includes by forward declarations
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/RooNumIntFactory.cxx
File length: 5432 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/RooNumIntFactory.cxx
File length: 5471 byte(s)
Diff to
previous 11619
o RooFit.hh
- New global header file for compiler patches. Currently contains
single patch for SunOS imported from BaBar.hh
o All .cc files
- Include RooFit.hh as first header file
o RooAbsData
- Make all plotOn() methods public
o RooAbsProxy
- Include pragma to switch of VC++ warning C4355
"'this' : used in base member initializer list'"
which would otherwise be triggered on each proxy initialization.
(each proxy constructor _expects_ a base class ptr so the warning
is misleading)
o RooAdaptiveGaussKronrodIntegrator1D, RooDataHist, RooGaussKronrodIntegrator1D,
RooGraphSpring, RooMCIntegrator, RooPolyVar, RooTreeData
- Change pow --> TMath::power() to eliminate windows compiler warnings
o RooEllipse
- Change constant M_PI to TMath::Pi()
o RooGlobalFunc
- Change RooConst --> RooFit::RooConst as functions has been moved into namespace
o RooMath
- Add erf() and erfc() forwarder functions to TMath::Erf() and TMath::Erfc()
o RooRealConstant
- Move RooConst() function into namespace RooFit
o RooSimultaneous
- Remove one default parameter from implementation version of plotOn() to resolve
overloading ambiguity reported by AIX compiler
o RooTreeData
- Make nested struct PlotOpt public to avoid CINT access problems
o RooTruthModel
- Add explicit cast to fabs() of proxy as it gives warning in Windows C++
Revision
11179 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 24 22:36:07 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 5380 byte(s)
Diff to
previous 11139
o RooBanner
- Add version number 1.9 and update copyright year
o RooAbsCollection
- Improve inline documentation of printLatex()
o RooAbsData
- Improve inline documentation of reduce()
- Improve inline documentation of plotOn()
- Add createHistogram() method that calls RooAbsRealLValue::createHistogram()
and the RooAbsData::fillHistogram()
- Improve inline documentation of createHistogram()
o RooAbsGoodnessOfFit
- Add option to split range by index category for simultaneous fits. If the flag
is set, the range for each RooSim subset is range_{indexstate}
o RooAbsOptGoodnessOfFit
- Add option to split range by index category for simultaneous fits. If the flag
is set, the range for each RooSim subset is range_{indexstate}
- Do not store fit range with PDF if fit was simultaneous fit with split range,
since definition is ambigious in that case.
o RooAbsPdf
- Improve inline documentation of fitTo()
- Improve inline documentation of generate()
- Improve inline documentation of plotOn()
- Improve inline documentation of paramOn()
o RooAbsReal
- Improve inline documentation of createIntegral()
- Add createHistogram() method that calls RooAbsRealLValue::createHistogram()
and the RooAbsData::fillHistogram()
- Improve inline documentation of createHistogram()
- Improve inline documentation of plotOn()
o RooAbsRealLValue
- Improve inline documentation of frame()
- Improve inline documentation of createHistogram()
- Add createHistogram() version that takes RooLinkedList of arguments
to facilitate chain processing in RooAbsReal/Data::createHistogram()
o RooNLLVar, RooChi2Var
- Add argument to ctor to activate SplitRange() feature for simultaneous fits
o RooCmdConfig
- Make copy of command with sub-command before doing recursive processing
o RooCurve
- Set advertised normalization count to 1 instead of to 0. Fixes normalization
problems when plotting >1 curve on a frame w/o data.
o RooMCStudy
- Improve inline documentation of constructor
- Improve inline documentation of plotParam(),plotParamOn(),plotError(),plotPull() and plotNLL()
o RooNumIntFactory
- Suppress warning messages for attempted duplicate registration of numeric integrators
o RooPlot
- In addPlotable() update _normBinWidth only if objects bin width !=0
o RooProdPdf
- Improve inline documentation, most notably remove some documented restrictions that are long obsolete
o RooTreeData
- Improve inline documentation of plotOn()
- In fillHistogram() change THx filling method from AddBinContent() to Fill() as the former does not
update the total number of entries in the ROOT histogram, leaving some plotting methods broken.
- Improve inline documentation of statOn()
Revision
11139 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 17 14:32:38 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 5378 byte(s)
Diff to
previous 10648
o All numeric integrators
- Change way integrators are registered: Old method involves ROOT function call that assumes gROOT exist
leading to static initialization order fiasco. New method registers initializer functions with
RooNumIntFactory that will perform actual initialization when factory is used for the 1st time
o RooNumIntConfig
- Add methods registerInitializerFunction() to allow registration of initializer functions for
each numeric integrator engine that exists
- Add processInitializers() method to process registration of numeric integrators. Call this
function in get/set/createProtoIntegrator().
- Move static pointer to singleton instance inside instance() function so that initialization
to zero is guaranteed when instance() code is executed
o RooNumIntConfig
- Move static pointer to default instance inside default() function so that initialization
to zero of pointer is guaranteed when default() code is executed
o RooIntegrator1D
- Add configuration option 'extrapolation' that allows to switch off wynn-epsilon extrapolation
and calculate error the simple way (difference in result between last two iterations).
Default remains extrapolation on.
o RooProdPdf
- Change named argument constructor to be less confusing. Constructor now takes name,title and
const RooArgSet& with regular PDFs followed by zero or more Conditional() arguments that
specificy conditional PDFS
o RooGlobalFunc
- Remove global functions Partial() and Full(), add Conditional()
o RooProdGenContext
- Follow changes in RooProdPdf
Revision
10648 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Mon Nov 29 20:24:44 2004 UTC (10 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooNumIntFactory.cxx
File length: 4748 byte(s)
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
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.
