Log of /trunk/roofit/roofitcore/src/RooResolutionModel.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: 12190 byte(s)
Diff to
previous 43683
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
41862 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 10 09:44:32 2011 UTC (3 years, 2 months ago) by
wouter
File length: 12160 byte(s)
Diff to
previous 30333
o PiecewiseInterpolation, RooAbsCachedReal, RooAbsCachedPdf
- Follow adjustment in RooCacheManager
o RooConvCoefVar, RooEffProd, RooResolutionModel, RooErrorVar, RooProjectedPdf, RooAbsHiddenReal
- Migrate to getValV
o RooProdPdf
- Follow adjustment in RooCacheManager
- Migrate to getValV
o RooVectorDataStore
- Various small fixes
- Allow storage of non-constant 'track-and-change' cache entries.
These are cached PDF nodes that are not constant, but need
to be recalculated when selected parameters change. A
RooChangeTracker data member is added to the vectors to
do this dependency checking, and recalculation (as needed)
is performed in method recalculateCache() to be called from
the test stat before looping of the data.
o RooAbsReal
- Introduce new non-virtual inline getVal() methods that handles
clean-cache state cases and delegates all other cases to a
virtual method getValV() that corresponds to the original
getVal() method
- Add 'ignore' more to eval error logging protocal
o RooAddPdf
- Follow adjustment in RooCacheManager
- Optimize control structure in evaluate() to be more efficient
(move conditional outside loop)
o RooAbsTestStatistic
- Add extra argument to constOptimizeTestStatistic to control
activation of track-and-change optimization
o RooRealMPFE
- Migrate to getValV()
- Add support for new track-and-change option argument in
transmission of const optimization request to servers
o RooRealVar
- Exploit new _fast flag of RooAbsReal to choose non-virtual
handling of getVal()
- Migrate to getValV() [ but still dummy ]
- Small fix in attachToVStore()
o RooNLLVar
- Add data member tracking first use
- After first use, trigger wiring of all caches in RooCacheManagers
to speed up trivial cache selection decisions (i.e those where
only a single cache entry exists)
- Add call to RooAbsDataStore::recalculateCache() to implement
track-and-change update prior to likelihood loop
o RooConstVar
- Migrate to getValV()
o RooAbsArg
- Eliminate flipACLean() protocol since no longer used
- Simplify method opermode() now that flipAClean is abandoned.
- In findConstantNodes() add support for change tracking
and include nodes with "ChangeTracking" atttribute in
list of constants. Mark all truly constant expressions
with attribute "ConstantExpression"
- Add extra argument to constOptimizeTestStatistic to control
activation of track-and-change optimization
- In printCompactTree() also print valueDirty state when in Auto mode
- Add method wireAllCaches() which propagates cache wiring request
to all registered cache nodes on all branches nodes
- Add transient data member with namereg pointer to string with
current object name. Overload SetName() and SetName() and title
to clear pointer whenever name changes.
o RooAbsPdf
- Migrate to getValV(). Eliminate handling of clean-cache cases
as this is now done in RooAbsReal::getVal()
- Disable use of RooAbsPdf::raiseEvalError() protocol as this
is now communicated through RooAbsReal::logEvalError()
o RooRealIntegral
- Migrate to getValV()
- Use setInhibitDirty() instead of flipAClean() in evaluate()
when performing numeric integrations
o RooTreeDataStore
- In cachArgs() add code to select only cache items with
label "ConstantExpression" as tree store is unable to
cache track-and-change items
o RooAbsCategory
- When printing also show index associated to label
o RooAbsOptTestStatistic
- Add extra argument to constOptimizeTestStatistic to control
activation of track-and-change optimization
- In optimizeConstantTerms() when trackChanges option is active
request change tracking for all component nodes of RooAddPdf
and RooRealSumPdf, unless these components are RooProdPdf/RooProducts
respectively in which case the components of these products are tracked
o RooRealProxy
- Use _fast attribute of RooAbsArg to directly return value cache
of RooAbsReals if that is allowed
o RooAbsCache
- Add virtual method wireCache()
o RooCacheManager
- Add new method getObj() that takes isetRangeName as 'const char*'
instead of 'const TNamed *' to be able to eliminate the conversion
when in wired mode
- Implement cache wiring - If at moment of the request only a single
cached entry exists - always return that one from here one.
o RooAbsDataStore
- Implement virtual method calculateCache()
Revision
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: 11605 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: 11551 byte(s)
Diff to
previous 23538
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
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: 10297 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
21631 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 10 20:03:35 2008 UTC (7 years ago) by
wouter
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 10230 byte(s)
Diff to
previous 21064
***********************************************************************
* NOTE: THE FOLLOWING FILES MUST BE REMOVED BY HAND AFTER THIS COMMIT *
* WHEN UPDATING AN EXISTING RELEASE AREA *
* *
* include/RooNormManager.h *
* include/RooNormListManager.h *
* roofitcore/src/RooNormManager.o *
* roofitcore/src/RooNormManager.d *
* roofitcore/src/RooNormListManager.o *
* roofitcore/src/RooNormListManager.d *
* *
***********************************************************************
o RooNormListManager, RooNormManager
- Removed, now obsolete. Replacement is RooObjCacheManager
o RooNumber
- Add non-inlined accessor function infinity() to replace
static double inifinity to fix Windows linked problems
o RooStreamParser, RooCurve, RooRangeBinning, RooNumConvolution
RooHistError, RooTreeData, RooRealVar, RooBinning, RooErrorVar
- Follow migration of RooNumber::infinity()
o RooPlot
- Fix SetTitle()
o RooDataSet
- Initialize wgtVar ptr in default ctor
o RooAbsReal
- Redesign scheme to import non-double TTree branches
to RooAbsReal buffer to fix gcc warnings on
strict aliasing rules for type-punned pointers.
o RooAbsPdf
- Make globalSelectComp() non-inline to avoid
Windows linking problems.
o RooResolutionModel
- Fix crash in use of resolution models when completely
const-optimized by deleting _norm pointer on a
serverRedirect.
o RooAbsCategory
- Redesign scheme to import non-integer TTree branches
to RooAbsReal buffer to fix gcc warnings on
strict aliasing rules for type-punned pointers.
o LinkDef2.h, Module.mk
- Remove classes RooNormManager, RooNormListManager
o RooBanner
- Increment version tag to 2.31
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/RooResolutionModel.cxx
File length: 10136 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/RooResolutionModel.cxx
File length: 10071 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/RooResolutionModel.cxx
File length: 10010 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/RooResolutionModel.cxx
File length: 10058 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/RooResolutionModel.cxx
File length: 9870 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
5909 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 14 00:07:58 2003 UTC (12 years ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 9807 byte(s)
Diff to
previous 5461
o RooAbsArg & selected derived classes
- Extend redirectServersHook() argument list with one additional
boolean that indicates if the redirect is recursive
- Extend redirectServers() argument list with one additional
boolean indicating whether it is part of a recursive process
Pass recursion flag to redirectServersHook()
- In recursiveRedirectServers(), set recursion flag in calls
to redirectServers
o RooProdPdf
- In redirectServersHook(), only redirect servers on non-owning
product component lists in cache if recursion flag is set
Revision
5174 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 9108 byte(s)
Diff to
previous 4544
Major new version (to become V00-01-00)
o README
- Update standalone compilation instructions
Refer BaBar users to RooFitBabar/README
o RooAICRegistry
- Fix memory leak
o RooAbsArg
- Add default implementation of constOptimize() that
forwards the call to all servers
- Add RooAbsOptGoodnessOfFit, RooRealMPFE as friends
- Add protected pure virtual method setTreeBranchStatus()
that can be used by the optimizer to disable reading
of the tree branch associated with the RooAbsArg
o RooAbsBinning
- Add description
o RooAbsCategory
- Add operator==()
- Implement setTreeBranchStatus()
o RooAbsCollection
- Add addClone(RooAbsCollection&,...) to add a list of clones
o RooAbsData
- Add pure virtual methods for new caching mechanism:
* cacheClone() returns a clone of the dataset with cache
* resetCache() clears the existing cache
* setArgStatus() disables reading of given args from tree
o New class RooAbsGoodnessOfFit
- Abstract base class for goodness-of-fit variables.
A goodness-of-fit is any quantity calculated from a PDF
and a dataset. This class orgamizes parallelization over multiple
CPUs and calculation of GOFs from simulatenous PDFs.
o New class RooAbsOptGoodnessOfFit
- Abstract base class for goodness-of-fit variables
that calculate the PDF value at each data point in the
given dataset. It implements various optimizations:
caching of constant terms, elimination of unused variables etc.
o RooAbsPdf
- Deploy new normalization integral manager RooNormManager
to cache multiple normalization integrals for a PDF.
This greatly increases the efficiency for certain situations
where PDFs are alternatingly called with 2 or more different
normalization choices
- Reimplement fitTo() in terms of RooNLLVar and RooMinuit.
- Reimplement plotNLLOn() in terms of RooNLLVar and plotOn()
- Migrate plotNLLContours to RooMinuit
- Remove obsolete method fitContext
o RooAbsReal
- Add operator==()
- Implement setTreeBranchStatus()
- Fix memory leak in createProjection()
o RooAbsString
- Implement setTreeBranchStatus()
o RooAddModel
- Eliminate getNormSpecial() construction that was originally
introduced to efficiently handle calls with 2 alternating
projection/normalization configurations originating from
RooConvolutedPdf. This is now handled by RooNormManager.
o RooAddPdf
- Reimplement caching of coefficient projection list and
supplemental normalization list using RooNormListManager.
(Also supports caching of multiple configurations now)
o RooArgSet
- Implement addClone(RooAbsCollection&,...)
o RooBanner
- Add description
o RooBinning
- Add description
o New class RooChi2Var
- Implementation of simple Chi^2 of RooAbsOptGoodnessOfFit
for a RooDataHist and a RooAbsPdf.
Chi^2 is calculated from PDF value at the bin center.
Poisson errors are used if no user defined errors are present
o RooConvolutedPdf
- Reimplement normalization integral management using
RooNormListManager
- Deprecate use of RooResolutionModel::getNormSpecial. No longer needed.
o RooCustomizer
- Fix memory leak
o RooDataHist
- Add lo/hi Error associated with each bin. Default implementation
returns poisson errors. Error is return by weightError().
- New set() function allows user to override poisson errors
o RooDataSet
- Fix copy ctor for weighted datasets
- Implement cacheClone()
o RooDirItem
- Add description
o RooDouble
- Add description
o RooExtendPdf
- Follow changes in normalization management of RooAbsPdf
o Removed class RooFitContext
- Replaced by RooMinuit/RooNLLVar
o RooFitResult
- Change terminology NLL -> FCN (fits are no longer NLL necessarily)
- Store and report accuracy code of minuit error matrix
- Minor tweaking of parameter dumps with mixed symmetric/asymmetric
errors
o RooGenericPdf
- Follow changes in RooAbsPdf normalization management
o RooIntegratorConfig
- Add description
o RooLinTransBinning
- Add description
o RooLinkedListElem
- Add description
o RooLinkedListIter
- Add description
o New class RooMPSentinel
- New class to keep track of server processes started for
parallelized goodness-of-fit calculations. On linux
hosts, these processes don't exit when the parent process
exits. This class sends termination signals when this
singleton class is deleted
o RooMath
- Activate CERF disk caching by default
o New class RooMinuit
- New seamless interface between RooFit objects and MINUIT
Class propagates information forth and back between RooAbsArg
objects and minuits internal memory buffer (e.g. parameter
values, errors, step sizes, constant status)
- This class minimizes any RooAbsReal function (doesn't need to
be a NLL or Chi2)
o Removed class RooNLLBinding
- Obsolete after introduction of RooNLLVar
o New class RooNLLVar
- Implementation for NLL of RooAbsOptGoodnessOfFit
o RooNameSet
- Fix memory leak
o New class RooNormManager
- New manager class for normalization/projection integrals for PDFs
This class matches RooArgSet pointer pairs to the integration
and normalization sets to previously registered integrals.
Multiple pointer pairs can point to the same integral (e.g.
pointer to different RooArgSets with the same contents) and
multiple integrals can be cached. This class doesn't create
the normalization integrals. It merely indicates if it has
one or not, and leaves it up to the owning class to create
and register new normalizations
o New class RooNormListManager
- Similar to RooNormManager, except that RooArgLists of normalization
integrals are caches instead of single integrals
o RooNormSetCache
- Rework functionality. This class, used by RooNorm(List)Manager
manages multiple redundant RooArgSet pointer pairs that represent
the same projection/normalization configuration
o RooProdPdf
- Almost complete rewrite in terms of RooNormListManager
o RooRealConstant
- Minor const changes
o RooRealIntegral
- Streamline iterator use: Create various interator in ctor
and reuse them in evaluate() instead of creating and deleting
them on the fly
o New class RooRealMPFE
- Front end for MultiProcessor calculations. Class RooRealMPFE
takes a RooAbsReal as argument and calculates it in separate
process. Calculations can be started asynchronously with
the calculate() call. The rest of the interface (and behaviour)
is identical to that of the original RooAbsReal.
o RooResolutionModel
- Deprecate getNormSpecial - superceded by RooNormManager
o RooSetProxy
- Implement addClone(const RooAbsCollection&,...)
o Removed class RooSimFitContext
- Obsolete - replaced by RooMinuit/RooNLLVar
o RooSimGenContext
- Fix memory leak
o RooSimultaneous
- remove obsolete fitContext() method
o RooTreeData
- Reimplement caching. Cached functions are now stored in
a separate tree in the dataset. Main benefit of the new
implementation is that caches can efficiently be reset
and refilled on the fly
o makedocs
- Add stanzas for new tutorial macros
Revision
3212 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 14 18:42:38 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 10455 byte(s)
Diff to
previous 3185
o RooAICRegistry
- Tighten conditions for reuse of slots (loose conditions
caused problems for certain projections)
o RooAbsCollection
- Add equals() method to check if two collections have similar
contents
o RooAbsPdf
- Add isDirectGenSafe() method. This code is transplanted from
RooGenContext and determines if a PDF depends via more than
one path on a given dependent. It is put here so that certain
classes (RooAddModel) can override the default implementation
o RooAbsReal
- Add getVal(const RooArgSet&) that forwards to getVal(const RooArgSet*)
o RooAddModel
- Add getGenerator(),initGenerator(),generateEvent() implementing
distributed direct generation if all components support
direct generation of the given set of dependents.
- Overload isDirectGenSafe() as forwarder function to its components
- Fix memory leak in syncNormalization when used as regular PDF
o RooConvolutedPdf
- Minor modifications to verbose messaging
o RooDataHist
- add get(const RooArgSet& coord) to retrieve the bin center
coordinates of the bin enclosing the supplied coordinates
o RooGenContext
- Use RooAbsPdf::isDirectGenSafe() to determine which dependents
are safe for direct generation
o RooSimGenContext
- Fix generation with derived index category from prototype
o RooSimultaneous
- In genContext(), fix algorithm to detect when specialized
RooSimGenContext is appropriate
o RooTruthModel
- Fix analytical integrals with tau=0
Revision
3141 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 31 07:19:31 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 10261 byte(s)
Diff to
previous 3135
o RooAbsArg
- In redirectServers, propagate nameChange flag to redirectServersHook()
o RooArgList
- Suppress warning about extra EOL characters in readFromStream()
in non-verbose mode
o RooFormula
- Add nameChange flag to changeDependents() and process accordingly
o RooFormulaVar,RooGenericPdf,RooResolutionModel
- Change redirectServersHook() function to accept nameChange flag
and process accordingly
o RooPlot
- change findObject(),getAttLine(),getAttFill(),
getAttMarker(),getAttText() to accept null ptr as
object name string. In such case the object/attribute
of the last added object will be returned.
o RooRealIntegral
- Remove obsolete redirectServersHook() function
o RooResolutionModel
- Overload printToStream() to print out basis function details
in verbose mode
o RooTreeData
- In table() set name of table to '<dataset_name>(<cut_spec>)'
instead of "dataset"
o RooTruthModel
- Adapt to implement new set
of 9 (exp/sin/cos) X (plus/minus/sum) basis functions
Revision
3135 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Oct 30 07:29:15 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 9623 byte(s)
Diff to
previous 3048
o RooAbsArg
- Sort parameter list returned by getParameters()
o RooAbsPdf
- In plotOn() fix NumEvent normalization for extended PDFs.
Add RelativeExpected option for extendable PDFs to specify
a scale factor relative to the normalization obtained from
the extended PDFs number of expected events
o RooAbsReal
- Add forceNumInt() option to disable analytical integration.
Mostly useful for testing numerical vs analytic results
o RooFitContext
- Another fix in parameter passing to TMinuit
o RooPlot
- Prefill bin width from RooRealVar binning when constructed
from a RooRealVar
o RooResolutionModel
- Overload getNorm() from RooAbsPdf to suppress the warning message
given by RooAbsPdf when the normalization is zero (legitimate value
for convolution objects)
o RooSimPdfBuilder
- New high-level manager class to construct RooSimultaneous PDFs
from a set of customized prototype PDFs. Customization is
performed internally by an ensemble of RooCustomizer objects.
Revision
3048 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 17 05:04:00 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 9235 byte(s)
Diff to
previous 2995
Efficient generation of convoluted variables
--------------------------------------------
o RooConvGenContext
- New generator context that generates physics
model and resolution model separately and returns
the smeared result
o RooConvolutedPdf
- Overload genContext() to use the new efficient
generator scheme if both resolution model and
and physics model support direct generation
of the convolution variable and the resolution
model has no other dependents
- Add protected changeModel() function to allow
RooConvGenContext to change present model on the
fly.
o RooGenContext
- Add option to force consideration for direct generation
of a given set of dependents. Used by RooConvGenContext
to force direct generation of convolution variable when
convoluted with the truth model
o RooTruthModel
- Hand code the 6 basis functions used for B mixing
and decay as special cases. (Significant speed gain)
o RooResolutionModel
- In convolution(), swicth from RooAbsArg::findServer(0) to
RooFormulaVar::getParameter(0)
Collection Storage / General stability improvement
--------------------------------------------------
o RooAbsCollection
- Switch to use RooLinkedList instead of THashList as
internal storage mechanism
o RooLinkedList,RooLinkedListElem,RooLinkedListIter
- New efficient implementation of a linked list
that doesn't try to access it's members when
removing them (nor does any other funny & illegal
things that all TList subclasses can't seem to stop doing)
Miscellaneous fixes
-------------------
o RooAICRegistry
- Fix copy ctor (clone owned RooArgSets)
o RooFormula
- Introduced delayed compilation of TFormula:
formula is compiled only when value is requested
for the first time. (Efficiency gain for RooFormulaVars
used as basis function, which are often not evaluated
at all)
o RooAbsReal
- Fix erroneous warning message in makeProjectionSet()
o RooAcceptReject
- Delete cache in ctor!
o RooListProxy
- Bug fix: overload addOwned()
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/RooResolutionModel.cxx
File length: 9119 byte(s)
Diff to
previous 2981
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
2981 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 5 07:01:50 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 9113 byte(s)
Diff to
previous 2838
Documentation update
--------------------
o RooAbsData,RooAbsPdf,RooAddPdf,RooProdPdf,
RooConvolutedPdf,RooResolutionModel
- Update inline documentation
Misc fixes
----------
o RooHtml
- Remove default arguments in member function implementation
(Causes solaris compiler error)
Revision
2838 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 24 23:06:01 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 5891 byte(s)
Diff to
previous 2798
Major cleanup in integration of normalization functions
Miscellaneous small improvements and fixes
o Roo1DTable
- Add get(),getFrac() methods to retrieve contents
o RooAbsCollection
- Add selectCommon() method to create new collection
containing args common to two sets
o RooAbsData
- Minor const-correctness changes
o RooAbsReal
- Rearrangement of getAnalyticalIntegral/analyticalIntegral entry points.
Both functions now exist with and without a 'const RooArgSet* normSet'
The functions with normSet are used by RooRealIntegral, and its default
implementation handle the pass-through scenario (code 0 = getVal(normSet))
and defers other codes to the non-normSet variant.
Simple PDFs should implement the non-normSet variants, as they used
to do sofar, except they no longer should (or are able to) process
the passthrough scenario.
Advanced PDFs such as RooAdd,ProdPdf, RooConvolutedPdf that implement
complex integration schemes that depend on the exact normSet configuration
reimplement the getAI,aI functions with normSet.
o RooResolutionModel, RooAddModel
- Implement (or forward in case of RooAddModel) new getNormSpecial method.
This function is identical in functionality to RooAbsPdf::getNorm()
except that it caches a separate copy of the normalization integral.
This member is introduced for the benefit of RooConvolutedPdf::analyticalIntegral
which, in case of a normalized integration, alternatingly calls two different
normalizations. In the original single cache code, this would lead to
100% caching failure and 300% slowdown of the code. getNormSpecial is
protected for access by RooConvolutedPdf only.
o RooAddPdf,RooProdPdf,RooSimultaneous,RooConvolutedPdf
- Re-implement distributed analytic integration bookkeeping using
the auxiliary RooAICRegistry class, which keeps track of multiple
analytical integration codes (hence AIC)
o RooAICRegistry
- New auxiliary class to faciliate the management of distributed analytic
integration.
o RooArgSet
- Minor printing fix
o RooConvolutedPdf
- Complete rewrite of handling of analytical integrations. For RCP objects
analytical integrations are not all necesarily analytic, but include
integrations deferred to convolution objcts. Analytical integrations
are split off for coefficient terms. Complete double bookkeeping introduced
for 'integration' part of analytic integration and 'normalization' part
of integration, each of which can have a different argSet to defer
to the convolution objects and a different coefficient analytical integration
code. Current implementation is believed to be complete.
o RooFormulaVar
- Follow signature change of getAnalyticalIntegral/analyticalIntegral
o RooMath
- Implement file cacheing scheme for complex error function lookup table.
To invoke persistent caching, call RooMath::cacheCERF(kTRUE) prior to
use
o RooRealAnalytic
- Store and forward normalization set to analyticalIntegral call of
bound RooAbsReal
o RooSimultanous
- Implement new plotOn() method, taking a dataSet which can correctly
project a RooSimultaneous. The code is mostly copied from RooAbsReal::
plotOn, except that the plotted pdf is constructed as a RooAddPdf
of the RooSimultaneous components, weighted by the fractions found
in the passed dataset
o RooTreeData
- Small const-correctness fixes
Revision
2798 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 17 18:48:17 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4981 byte(s)
Diff to
previous 2779
Generalize RooArgSet to RooAbsCollection and introduce RooArgList
and corresponding proxy. Introduce RooArgList where appropriate
as replacement of a TList of proxies, eliminate all use of TList
inherited functions in RooArgSet/List.
Some optimizations implemented following profiling studies
Various fixes for compilation with Solaris CC 5.0
o RooAbsArg
- Change signature of server management function to use RooAbsCollection
instead of RooArgSet
- Add proxy management support for new RooListProxy class
o RooAbsPdf
- Disable use of RooNameSets as optimization attempt. It appears
to cost more time than it saves
o RooAbsProxy, RooArgProxy, RooAbsReal, RooAcceptReject,
RooDataHist, RooFormula, RooFormulaVar, RooGenCategory,
RooGenContext, RooGenericPdf, RooPlot, RooRealIntegral,
RooResolutionModel, RooSetProxy, RooSuperCategory, RooTreeData
- Follow RooAbsArg member function signature changes
o RooAddPdf, RooConvolutedPdf, RooFitContext, RooSimFitContext,
RooFitResult, RooPdfCustomizer, RooProdPdf,
- Change implementation from using TList to using RooArgList
o RooAbsCollection
- New abstract base class for collections of RooAbsArgs. This
class contains mostly code from the former RooArgSet implementation
o RooArgSet
- Re-implement as derived class of RooAbsCollection. A RooArgSet
cannot contain duplicates (as before), but also doesn't give
random access (by index) to its member elements
o RooArgList
- New implementation of RooAbsCollection that allows duplicates
in the list, allows sorting and lookup by index.
o RooListProxy
- Proxy version of RooArgList, similar to RooSetProxy. To be used
as data member of RooAbsArg implementation to hold external
RooAbsArg references.
Revision
2779 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 6 20:49:16 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4974 byte(s)
Diff to
previous 2724
Fix (hopefully all) outstanding problems in HEAD induced RooArgSet
changes
o RooAbsArg
- Modify error logic in findNewServer() to not assert if name
changing server change finds no new servers
o RooAddModel
- Change debugging print statements in ::convolution to show
RooAddModel as class instead of RooResolutionModel.
(convolution originally copied from RooResolutionModel)
o RooArgSet
- In removeAll() change Clear() to _list.Clear(). The former
didn't clear the list but went unnoticed because TObject apparently
has a Clear() member as well. Confusing...
o RooConvolutedPdf
- Improve error messaging in case a convolution integral cannot be
constructed
o RooDataSet
- Change RooArgSet::add() to RooArgSet::addOwned() in addColumn()
o RooResolutionModel
- Expand error messaging in convolution()
Revision
2724 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 01:21:48 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4838 byte(s)
Diff to
previous 2665
o All RooAbsReal derived classes
- Changes signature of evaluate(const RooArgSet*) to evaluate()
o RooGenericPdf,RooSimultaneous
- Adapt to use _lastDataSet instead of argset passed via evaluate
o RooFormulaVar
- PDF dependents will be used unnormalized (following evaluate
signature change)
o RooAbsLValue
- New abstract lvalue class defining interface for setPlotBin()
needed for binned datasets
o RooAbsReal,RooAbsCategory,RooAbsString
- Implement setPlotBin() method
o RooAbsReal
- Change copyCache and attachToTree to be aware of 'Float_t'
branches in data sets
o RooDataSet
- Add constructor from TTree with RooFormulaVar cut specification
o RooAbs*
Inline documentation improved
Revision
2665 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 10 22:22:54 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4842 byte(s)
Diff to
previous 2655
o RooDataSet
- Make RDS contain a ptr to a TTree instead of a TTree
so that we can explicitly control the deletion order
of the TTree and its branches
o RooTrace
- Add option to do memory tracing without padding objects
o RooConvolutedPdf,RooResolutionModel
- Add bool's to keep track of basis function ownership and
make each object delete the basis functions it created/cloned
o RooFitContext
- Fix bug in dataset ownership logic: if dataset is not owned,
but dataset is optimized, the new optimized data set is
owned by the context regardless of the way it was constructed
o RooAddModel
- Do not clone components in RooAddModel::Clone() as this is
already taken care of in a tree clone operation
Revision
2655 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 9 01:02:15 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4732 byte(s)
Diff to
previous 2626
o Many classes
- Simplify use of TString as this is suspected to cause spurious
TString memory errors
o Many classes
- Fix about a dozen of memory leaks reported by GC (mostly iterators)
o RooArgProxy,RooSetProxy
- Change order of multiple inheritance to put TObject (or derived)
first. This fixes vtable/vptr mishap on Solaris
o RooAbsArg
- Introduce dynamic_cast<> in changeNormSet() to cast the TObject
from the proxy list into a RooAbsProxy (needed in conjuction
with above change)
o Several classes
- Make destructor virtual, fix Clone() function signature to match
that of TObject
Revision
2626 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4673 byte(s)
Diff to
previous 2619
o RooTrace
- New memory tracing utility (singleton class)
o RooAbsArg,RooDataSet,RooArgSet
- Install hooks for RooTrace in ctors and dtors
o RooThreshEntry
- Fix bug in copy ctor
o RooAbsReal,RooAbsPdf
- Move analytical integration support
(getAnalyticalIntegral,analyticalIntegral,
forceAnalyticalInt,selfNormalized) from RooAbsPdf to RooAbsReal
so that every RooAbsReal can be integrated
o All RooAbsReal derived classes
- Change signature of evaluate(),getVal(),traceEval(),checkDependents()
from X(const RooDataSet* dset) X(const RooArgSet* nset)
o RooAbsPdf
- Manage normalization caching with a RooArgSet listing the dependents
instead of a RooDataSet containing this list
- Remove obsolete nLogLikelihood function (now in RooFitContext)
o RooAbsArg
- rename setProxyDataSet to setProxyNormSet
- add getParameters(),dependentOverlaps() that
take a 'const RooArgSet*'
o Roo*Proxy
- rename changeDataSet() to changeNormSet()
o RooConvolutedPdf
- Replace dummy data set for convolution normalization by an RooArgSet
o RooDataSet
- Remove inheritance from TTree, make it contain a TTree instead.
Forward all relevant TTree member functions. Add correct Clone()
function (now possible due to inheritance change)
o Various classes
- Fix const handling to eliminate Linux2 compiler warnings
Revision
2619 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 1 01:24:08 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4674 byte(s)
Diff to
previous 2612
o RooAbsPdf
- Hold in addition to _lastDataSet a RooNameSet with the names
of the members of that dataset. If (_lastDataSet != dset) in
syncNormalization, first check if contents of _lastDataSet
is different from dset before redoing the normalization.
If >1 RooConvolutedPdf share a RooResolutionModel, the resolution
model will receive syncNormalization calls for the dummy data
sets contained in all RooConvolutedPdf. All these sets contain
most likely the same set of variables and a recalculation is
thus not necessary.
We cannot use _lastDataSet->get() to get the name list of the
previously used data set because that dataset might no longer
exist
o RooAddModel,RooAddPdf,RooProdPdf,RooSimultaneous
- Change signature of selfNormalized(const RooArgSet* depList)
to selfNormalized(). Partial self-normalization is an ill-defined
concept at this level. The original reason for introducing this
(RooConvolutedPdf objects insisting on handling integrals delegated
to their convolution integrals) has meanwhile been replace with the
forcedAnalyticalInt() method
Revision
2612 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 05:54:23 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4957 byte(s)
Diff to
previous 2487
o All RooAbsArg derived classes
- Change clone() to clone(const char* newname=0) to facilitate cloning with alternate names.
o RooAbsArg
- Add another layer to link management: operMode. If operMode=auto, all behaves
as before. If operMode=AClean, the arg assumes the cache is always clean and
getValueDirty() will always return false. If operMode=ADirty, the arg assumes
the cache is always dirty and isValueDirty will always return true.
The ADirty and AClean modes are used by the optimizer in the fit context
to shut down link management (and save time) for cases where the arg is
always dirty after a dirty state propagation from one of the dependents.
The AClean mode is used similarly for args that are cached in the dataset
The setOperMode() member is protected as care should be taken in switching modes.
It is the callers responsability to ensure that the claimed state (especially
in case of AClean) is indeed correct.
- Split setValueDirty(Bool_t flag) in setValueDirty() and clearValueDirty().
The latter is trivial and can be inlined to save time.
- redirectServers() now has an optional nameChange flag that allows to reconnect
to servers with different names. If the option is enabled, a link will be reconnected
to the server with a 'ORIGNAME:<servername>' attribute instead of a server with <servername>
This feature is used by RooPdfCustomizer.
- Added recursive printDirty() member that listed dirty state of arg and all its servers.
- Add sorting capability by implementing IsSortable() and CompareTo() members.
Sorting will result in alphabetical ordering by object name.
o RooAbsCategory
- Change tree attachement: store both label and index fields in tree instead of
just the index field. Looking up the corresponding label turns out to be rather
expensive, especially if many state are defined.
- The postTreeLoadHook() mechanism that formerly implemented the index lookup
has been abandoned completely (save 1 virtual function call per data set load).
o RooAbsPdf
- Change function call structure of eval tracing a bit to reduce the number
of calls per trace from virtual calls to 1 concrete call.
- In syncNormalization, if the data sets are different, first check if they
also have a different contents before processing the change. (Save multiple
identical normalization calculations for cases were a resolution model is
shared by >1 RooConvolutedPdf. (WVE Caveat: this has some problems: code will
die if cached data set is deleted before pdf. Will fix this soon)
Install pre- and postSyncNormalizationHook functions that can be used to customize
the call. Used by RooConvolutedPdf to create/update dummy data sets used to
push down partial integrations to the convolution integrals.
- Move nLogLikelihood to RooFitContext
o RooAbsReal
- in attachToTree(), mangle name of object in tree to exclude math symbols that
are interpreted by root in certain circumstances
o RooAddModel
- Store coef and proxy iterators in class instead of creating them on the fly each
time in evaluate()
- Release ownership of proxied resolution models in the copy constructor. If the
AddModel is copied, the proxied components will be owned by the list created
by RooArgSet::snapshot().
- Include name of AddModel owner in component resolution model to avoid multiple
identically named object in certain PDF configurations
- Export 'master list' of combined normalization leaf node servers of all components.
The convolutedPdf needs this for it's own dependency calculation
o RooArgSet
- Add silent option to remove()
o RooCatType
- Store name in char[] instead of in TNamed::fName (a TString) so that
the name can be attached to a Tree. (A TString is not a TObject)
o RooConvolutedPdf
- Push integration of all dependents that do not overlap with the coefficients
to the convolution integrals, instead of just the convolution variable
o RooDataSet
- Add new constructor that allows to specify the cut as a RooFormulaVar object
instead of a string. This allows to cut on function arguments that are not
part of the data set
- Allow to switch off dirty state propagation after a row-load operation
(can be used in certain optimization scenarios)
o RooFitContext
- Add option to not clone either dataset or pdf on construction
- Remove non-RooRealVar parameters from master parameter list to prevent that
MINUIT chokes on them
- Sort minuit parameter list alphabetically
- Add cache optimization option, which shuts down all link management for the
all pdf value components (not normalization). This can save a significant amount
of time, especially for very complex PDFs as the number dirty propagations scales
with the square of the number of nodes. Use newly introduces AClean and ADirty
modes to ensure proper evaluation of PDF nodes
- Add option to execute migrad with 'strategy 0', which skips the evaluation of
the error matrix. (Saves time if you do that later with HESSE anyway)
- Move nLoglikelihood() function from RooAbsPdf to here.
- Improve readability of messages in fitting in log-mode: print on screen only value
and name of parameters that change instead of dumping all their values all the time.
The old format has been retained in the log file, to allow automated processing of such files.
o RooFormulaVar
- Also update _origList on a serverRedirect
- Export ok() function of RooFormula (indicates if expression compiled ok)
o RooMath
- Add fast, interpolated, complex error function. Upon first use separate lookup tables
are filled for the im and re part of the complex error function. New functions will
do a 2nd or 3rd order 2D interpolation (depending on z) of the lookup table for either
the re part, the im part or both. Precision is better that 1e-6 in ~99% of covered
phase space. Imprecise regions are in problematic part of cErf where giant fluctuations
occur. Typical likelihood calculated with interpolated cErf agrees in the first 10
significant digits. Interpolation function is ~3.5 times faster than original CWERF
implementation, when only 1 component (im/re) of cErf is needed (most cases).
Interpolation function taken from Numerical Recipes and further optimized for
fixed grid assumption
o RooMappedCategory
- Clone also MapCatEntries in RooMappedCategory copy ctor
o RooProdPdf
- Store coef and proxy iterators in class, instead of instantiating them on the fly
in evaluate()
- Add optional cutoff parameter. If running PDF product goes below cutoff, product
calculation is terminated (default value=0, very small values like 1e-15 can be
benificial in case of wide window calculations a Gaussian + something flattish)
o RooRealIntegral
- Allow and perform integration over variables that input function doesn't depend
on (multiply integral by product of ranges of such variables)
o RooResolutionModel
- In convolution(): append name of owner to convolution, to avoid non-identical
convolutions with the same name in certain PDF configurations
- Forward redirectServers to basis function
o RooSimultaneous
- Overload fitTo() to create a RooSimFitContext instead of a RooFitContext
which allows certain additional optimizations specific to RooSimultaneous
- Normalize by the number of registered PDFs instead of the number of types
defined by the index category (allows to to partial fits)
o RooStreamParser
- Take '}' and ';' out of the default punctuation list so that RooSuperCategory
state names do not get broken up into multiple tokens
o RooThresholdCategory
- New category class that applies a series of thresholds on a RooRealVar to
define its state.
o RooThreshEntry
- Support class for RooThresholdCategory
o RooPdfCustomizer
- Utility class that serves a factory to build multiple PDFs from a single prototype
that have slightly different leaf nodes.
The class takes a proto type and a master index category in the constructor.
A series of splitting rules determines how given leaf nodes are to be 'split'
over the master index category or a subset of the master index (in case the master
index is a RooSuperCategory)
The instiated 'split' leaf nodes are put in an argset referenced in the constructor.
and the owner of the argset is responsible for deleting them (or passing them on
to another RooPdfCustomizer). The instantiated branch nodes are owned by the customizer.
o RooSimFitContext
- Specialized fit context, derived from RooFitContext, that optimizes the likelihood
calculation in case the top level pdf is a RooSimultaneous. The original data
set is broken into pieces, corresponding to a single state of the RooSimultaneous
index category and those data subsets are combined with the corresponding PDF branches
of the RooSimultaneous to form an array of regular RooFitContexts. The total likelihood
is calculated as the sum of the likelihoods from the array of fit contexts.
The NLL output from each subcontext is cached and only recalculated if a parameter
that the PDF of that subcontexts depends on, is changed.
This form of calculation is very efficient for fits where the correlation matrix has
a block diagonal form. The CPU time in RooSimFitContext scales (approximately) with
the number of elements in the block diagonal elements instead of with the total number
of elements.
o Nearly all classes
- A large number of minor bugs has been fixed and many functions
that are called very frequently have been inlined, made non-virtual or
have been eliminated, following the result of repeated profiler studies.
Revision
2443 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 23 01:20:34 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4282 byte(s)
Diff to
previous 2402
o RooAbsArg
- Add unregister methods for proxies
o RooAbsPdf
- Add forceAnalyticalInt() method to allow more complex negotiation
between RooRealIntegral and RooAbsPdf implementation
(needed by RooConvolutedPdf)
o RooArgProxy
- Store owner in data member, and unregister self in destructor
o RooSetProxy
- Unregister self in destructor
o RooConvolutedPdf
- Introduce getCoefAnalyticalIntegral()/coefAnalyticalIntegral()
methods, similar to non-coef methods in RooAbsPdf to support
analytical integration of coefficient terms
- Rewrite normalization framework. Entire normalization is now
done in analyticalIntegral, which forces RooRealIntegral via
the new forceAnalyticalIntegral() method to delegate integration
over convolution variables to us
o RooRealIntegral
- Implement handling of RooAbsPdf::forceAnalyticalInt() declarations
o RooResolutionModel
- Reduce verbosity
- Overload RooAbsPdf::traceEvalHook to explicitly allow negative values
o RooTruthModel
- Reduce verbosity
o RooComplex
- Imported from RooFitTools
o RooMath
- Imported from RooFitTools
- Functions related to histogram error calculated stripped
o RooAddModel
- RooResolutionModel derived class that can add various ResolutionModels
with relative fractions. Similar to RooAdPdf for PDFs
Revision
2402 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 9 05:08:48 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 4077 byte(s)
Diff to
previous 2397
o RooAbsArg
- Increase (temporary) verbosity of proxy manipulations
o RooAbsPdf
- add matchArgs(....,RooArgSet) to allow matching of non-proxied
RooAbsArgs
o RooConvolutedPdf
- Skip evaluation of convolution terms if coefficient is zero
o RooFormulaVar, RooFormula
- add getParameter(index), getParameter(name) functions
to access pointers of ordinal or named references in formula
(needed by resolution models for basis functions)
o RooResolutionModel
- Store convolution dependent
- Require that primary variable of basis function for convolution
is the resolution models convolution dependent.
- Add servers of basis function as servers to resolution model
instead of basis function itself. The latter confuses the
integration logic, since we don't really use the basis function
object
- Add support for basis function enumeration via the pure
virtual basisCode() function.
- Make isBasisSupported() concrete, calling basisCode(),
- Modify clone() operator of resolution model to name as
argument as sterile cloning and subsequent name change
doesn't work: it breaks the client-server links after
a server redirect. This change should be propagated to
all classes.
- Make changeBasis() virtual because RooTruthModel needs a slightly
different behaviour
o RooTruthModel
- Unlike other resolution models, the basis function must be
a server of this model, as RooTruthModel actually evaluates
the object. Not doing so causes a disconnect between
the basis and the resolution model after a recursive server
redirect. An overloaded changeBasis() supports this non-standard
behaviour
Revision
2397 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Fri Jun 8 05:51:06 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooResolutionModel.cxx
File length: 2858 byte(s)
o RooAbsReal and all concrete derived classes
- Change evaluate() to evaluate(const RooDataSet*)
o RooAbsArg
- Add ctor/dtor trace code to track memory leaks
o RooAbsPdf
- Add getNorm(const RooDataSet*) method
- Add selfNormalized(const RooAbsArg* dep) method
which allows finer granularity in determining
what part of the PDF is self-normalized
- Change selfNormalized(const RooArgSet* depList) method
to call selfNormalized(const RooAbsArg* dep) for all
members of depList
o RooArgProxy
- propagate changeDataSet to proxied argument, so that
a dataset cache change becomes recursive
o RooRealIntegral
- use RooAbsPdf::selfNormalized(const RooAbsArg*) to skip
integration of designated dependents
o RooSetProxy
- Fix bug in copy constructor
o RooResolutionModel
- New base class for convolution kernel PDFs
o RooConvolutedPdf
- New base class for PDFs consisting of a
convolution with a RooResolutionModel
o RooTruthModel
- Implementation of truth resolution model (delta function)
This form allows you to request diffs between any two revisions of this file.
For each of the two "sides" of the diff,
enter a numeric revision.
