Log of /trunk/roofit/roofitcore/src/RooCurve.cxx
Parent Directory
Revision
29131 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 22 10:45:58 2009 UTC (5 years, 7 months ago) by
brun
File length: 26171 byte(s)
Diff to
previous 28963
From Wouter:
o RooFitResult
- Export calculation of Schur complement of covariance matrix
through method reducedCovarianceMatrix()
o RooAbsReal
- In linear calculation of partial error band use reduced covariance
matrix as calculated by RooFitResult.
o RooCurve
- Update Y-axis range in addPoint() rather than in ctor to
capture updates to curve after construction, as e.g. done
in construction of error band curves
Revision
28963 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 12 15:47:45 2009 UTC (5 years, 7 months ago) by
wouter
File length: 26145 byte(s)
Diff to
previous 26194
* roofit/roofit & roofit/roofitcore
- Update from dev/roostats branch
- Addition of RooMinimizer interface (from Alfio)
* roofit/roostats
- Minimal changes need to follow some code
changes in roofit/roofitcore
Revision
26194 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 14 14:36:00 2008 UTC (6 years, 2 months ago) by
wouter
File length: 21761 byte(s)
Diff to
previous 26185
o RooCurve
- More improvements in isIdentical() algorithm
o tests/rf307_fullpereventerrors
- Skip histogram comparison
o test/rf705_linearmorph
- Relax testing tolerace
Revision
26185 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 14 08:58:17 2008 UTC (6 years, 2 months ago) by
wouter
File length: 21631 byte(s)
Diff to
previous 26044
o RooPlot
- Add Browse() method so that double-click on RooPlot in TBrowser draws
RooPlot on a Canvas (This behaviour was previously inherited from TH1)
- Add emptyClone() method for stresRooFit support
o RooCurve
- Improved isIdentical(). Interpret tolerance now as number relative to
scale of curve rather than absolute number. Print error message for
every point comparison that fails instead of just the first one. Explicitly
handle curves with different point spacing correctly by using interpolation
o RooHist
- Improved isIdentical(). Interpret tolerance now as number relative to
scale of curve rather than absolute number. Print error message for
every point comparison that fails instead of just the first one.
o RooAbsCollection
- In operator=() also copy Constant attribute of contents
o RooGlobalFunc
- Add RenameAllVariables named argument
o RooWorkspace
- Add concept of parameter snapshots stored in workspace. New methods
loadSnapshot() and saveSnapshot().
- Add option to rename all variables when importing a RooAbsArg through
RenameAllVariables() argument
- Fix bug in import of variable with RenameVariable() when object with
original name is already in workspace
o tests/rf307_fullpereventerrors
- Increase lower bound on dtErr to avoid regions with large numeric sensitivity
o tests/rf208_convolution
- Increase curve comparison tolerance to account for difficulties due to
Landay shape.
o test/rf705_linearmorph
- Reduce plot range in alpha to avoid region with large numeric sensitivity
Revision
26044 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 31 16:45:22 2008 UTC (6 years, 2 months ago) by
wouter
File length: 21169 byte(s)
Diff to
previous 25255
(Fixes inferred from valgrinding of expanded stressRooFit test suite)
o RooParamBinning
- Fix initialization of _owner in default ctor
o RooAbsRealLValue
- Fix small memory leak in createHistogram()
o RooDataSet
- Fix small memory leak in constructor
o RooCurve
- Fix leaking of array of sampling hints in addPoints()
o RooAbsReal
- Fix small leak in plotAsymOn()
- Fix double ownership problem in createIntRI()
o RooProduct
- Fix two small memory leaks
o RooAbsTestStatistics
- Downgrade initSimMode message from ERROR to INFO
o RooAbsPdf
- Add Warning() modifier to plotOn() to set MINUIT SET NOWarn option
- Fix small memory leak in fitTo() when using constraints
- Fix glitch in generate() in extended mode when nPoisson=0
- Fix small memory leak in plotOn() when using ranges
o RooRealIntegral
- Fix small memory leak in constructor
o RooPolyVar
- Add destructor that deletes internal iterator
o RooMinuit
- Add interface to suppress MINUIT warnings
o RooGlobalFunc
- Define Warnings() named argument
o RooArgSet
- Add protection to pool allocation scheme in case pool size is not
exactly N times object size
o RooSimultaneous
- Fix small memory leak
Revision
25209 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 22 13:08:40 2008 UTC (6 years, 5 months ago) by
wouter
File length: 21044 byte(s)
Diff to
previous 25184
o RooAbsReal
- Add interface to specify hint for plot sampling binning. This is useful
for p.d.f.s shapes such as un-interpolated histogram p.d.f.s that may
not correctly converge on a good projection curve using the default
recursive division strategy without an initial hint on where to sample.
o RooHistPdf,RooHistFunc
- Implement plotSamplingHints() method that suggests to same just before
and just after each bin boundary
o RooProdPdf
- Forward plotSamplingHint() from relevant component p.d.f.s
o RooAddPdf
- Implement plotSamplingHints() that forwards hints of component p.d.f.s
and merges them if necessary
o RooRealIntegral
- Forward plotSamplingHint() from integrand
o RooAbsFunc
- Define plotSamplingHints() interface
o RooRealBinding
- Implement plotSamplingHints() method that forwards hints from bound RooAbsReal
o RooScaledFunc
- Implement plotSamplingHints() method that forwards hints from bound RooAbsFunc
o RooCurve
- Use plot sampling hints define by input function to perform initial sampling
if provided, otherwise fall back to default strategy of frame binning sampling.
o RooBanner
- Upgrade version tag to 2.90
o RooCintUtils
- Adjustment in CINT include file location
Revision
25184 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 20 13:59:55 2008 UTC (6 years, 5 months ago) by
wouter
File length: 20257 byte(s)
Diff to
previous 24307
o RooAbsSelfCachedPdf
- Declare embedded RooHistPdf as self-normalized to prevent
superfluous calculation of unit normalization
o RooDataHist
- Add new named argument ctor that can collate multiple
TH[123] into a N+1 dimensional RooDataHist which has
an extra RooCategory to distinguish the source, as
well as import single a TH[123] objects
- Add ctor that can do the same, but specified from
a map<string,TH1> specification.
- Add new importTH1Set(),importTH1() utility methods to implement
common functionaly of both new ctors
- Add adjustBinning() method that encapsulates the functionality
to adjust the RooDataHist observable binning to match that
of a given (imported) TH1, which was formerly contained in the ctor
- Speed up code in interpolateDim() by reducing number of required
lookups of the observable binning definition.
o RooParamBinning
- Add tree printout of boundary functions, if defined in verbose
printing mode
o RooMsgService
- Add special handling of PROGRESS message level: automatically
insert newline when switching from a PROGESS to another message level.
o RooPlot
- In verbose printing, add index number to printout of each contained
plotable object
o RooGenContext
- Fix for handling of observables with parameterized ranges
- Eliminate forgotted debug print statement
o RooAbsRealLValue
- Implement new binning interface methods that take binning reference
rather than binning name, for faster use in internal operations
- Implement new RooAbsLValue methods with RooAbsBinning pointers
o RooDataSet
- Add new named argument constructor that can generically handle imports
of TTrees, RooDataSet and can collate multiple RooDataSets into
a N+1 dimensional RooDataSet with an extra RooCategory that labels
the source dataset
o RooDLLSignificanceModule
- Tune some of the names of the produced output observables
o RooChi2Var
- Set the default error type to RooAbsData::SumW2
o RooCustomizer
- Modify the sterile build() routine to make the returned
head node own all the created components rather than
the customizer itself.
o RooAbsCategoryLValue
- In copyCache(), check that the value copied is in fact
valid for the destination.
o RooFitResult
- Tune the line widths of the objects created in plotOn()
when creating the error ellipse.
- Add a method correlationHist() that returns a 2D histogram
with the correlation matrix element values, which is labeled
with the parameter names.
o RooCurve
- Add explicit handling for evaluation errors that can occur
when sampling the function being represented. New constructor
arguments control how evaluation errors are logged to
RooMsgService, in similar style to RooMinuit, and control
how the drawn output value is affected (as calculated, or
substituted with a user controlled value).
o RooFFTConvPdf
- Add automated handling of FFT sampling windows of the 'physics'
pdf and the 'resolution' pdf. In the new setup the second pdf
is always assumed to be a 'resolution' pdf and its sampling window
is chosen symmetrically around zero, regardless of the definition
of the range of the convolution observable. The width of the sampling
window, and the number of sampling bins is still tied to the "cache"
binning defined in the convolution observable. Added setShift()
modifiers allow the user to manually control the sampling window
shifts on both pdf. The shift introduced by sampling a shifted
window of the resolution effect is correct a posteriori by
performing a compensating rotation of the final FFT buffer.
- Modify FFTCacheElem to cache a functional clone of both pdf
with optional shift transformations applied through a RooLinearVar
substitution of the original convolution observable. Instruct
caching RooDataHist not to forward dirty state propagation calls
and set sampling pdf clones to AlwaysDirty to increased operational
efficiency.
o RooChangeTracker
- Add parameters() method returning the tracked parameters
o RooRealSumPdf
- Implement component selection functionality in plotting as
is available for RooAddPdf
o RooEfficiency
- Implement analytical integral over acceptance category
(it is always 1.0)
o RooHist
- Implement ability to handle RooAbsData::None error bars
(i.e no errors)
- Expand functionality of constructor taking two TH1s
to also represent the efficiency binomial in addition
to the assymmetry binomial
- Add addEfficiencyBin() method to handle calculation
of efficiency bins.
o RooAbsReal
- Make named argument version of fitTo() default method
when invoked with no arguments
- In fitTo(), if pdf is extendable and no explicit Extended() argument
is given, automatically included extended likelihood term
- In fitTo(), disable default running of MINOS when invoked without
arguments
- Move component selection functionality from RooAbsPdf
to here so that it also works for RooRealSumPdf, which
takes RooAbsReals as components rather than RooAbsPdf
- Add simplified createHistogram() method that takes
string with comma separated observable names and
three optional bin numbers.
- Add createHistogram() method that takes a list of
RooCmdArgs that can serve as backend for all user
interface methods.
- In plotOn() support the new Slice() argument for categories
that allow inline specification of of the slice position.
- Also add support for the PrintEvalErrors(Int_t numErr) and
EvalErrorValue(Double_t value) arguments to allow better control
of evaluation error handlign during plotting.
- Also add support for the MoveToBack() argument that immediately
inserts the curve at the bottom of a RooPlot stack.
o RooProduct
- Remove erroneous assert()
o RooAbsCollection
- In snapshot(), only add "Snaphot of" to name if original
has a non-null name.
- In verbose printing mode, remove printing of 'extras' and
only print '(owning contents)' of collection has a non-null name
o RooAddPdf
- Fix logic of recursive fractions constructor. Recursive additions
happen start on the rightmost pair of pdfs, recursively adding
one more pdf to the left at each iteration. Coefficients describe
the fractions of the leftmost pdf in each recursive addition,
starting with the outermost addition of the 1st pdf to the
som of all other pdfs, continuing with the fraction of the
2nd pdf being added to the sum of pdf 3-n etc...
o RooAbsCachedPdf
- Degrade 'parameters have changed' message from INFO to DEBUG
- Interface cache histogram objects to RooExpensiveObjectCache
with associated parameters given by RooChangeTracker
- Fix bug in printing: only print normalization object of
cache if it actually exists
o RooAbsTestStatistic
- Reimplement copy constructor to initialize from scratch from
original contents, to support sane implemlementation of
copying of optimized test statistics with multi-process
calculations.
- Fix redirectServers method for objects implementing multi-process
test statistics
o RooRecursiveFraction
- Invert incoming list of plain fractions when filling internal
list in ctor so that last fraction is 'special' instead of first
to support improved handling of recursive fractions in RooAddPdf
o RooAbsData
- Fix client-server reconnect handling for dataset observables
with parameterized ranges in terms of other dataset observables
- Add simplified createHistogram() method that takes
string with comma separated observable names and
three optional bin numbers. If bin counts are negative,
the ranges of output histogram are automatically calculated.
If the bin counts are positive, the ranges of the observables
are used for the histogram, unless the observable has an
open-ended ranges, in which case the automatic calculation
is used.
- Add createHistogram() method that takes a list of
RooCmdArgs that can serve as backend for all user
interface methods.
- Extend createHistogram() method with named arguments
to take AutoBinning and AutoSymBinning arguments to
automatically calculate the ranges of the output histogram
with the specified number of bins.
- Add a table() method that takes a set of RooCategories
and returns a table of the output states of a RooSuperCategory
of the given input categories.
o RooProfileLL
- Add option to start minimization always from parameters
of global minimum.
o RooRealMPFE
- Remove some forgotted debug printouts
- Pass IsConstant() state of RooRealVars being transferred in
addition to their value and error.
- Fix copy constructor
o RooRealVar
- In printing interface, maker error part of 'value' rather
than of 'extras'
- Fix bug in format() concerning constant parameters with
errors.
o RooAbsPdf
- Move component selection support for RooAddPdf to RooAbsReal
so that it also works with RooRealSumPdf.
- Remove some superfluous DEBUG level print messages
- Add support for EvalErrorWall() named argument in fitTo
to give user control of the 'NLL wall' feature used to
force MINUIT to retreat from regions with evaluation errors
- Enlarge default size of box created by paramOn()
o RooAbsArg
- Add pointer to expensive object cache to use for any expensive
objects to be cached in association with this object
- Add recurseNonDerived option to branchNodeServerList
- Overload printAddress() to so that RooAbsArg base address
is printed rather than RooPrintable base address, which
can be different due to multiple inheritance
- In constant term optimization, prevent addition of
observables with parameterized ranges to cache.
- Add interface methods to get and set the associated
expensive object cache
- Add flipAClean() accessor method for corresponding
static data member to solve windows linkage problems.
o RooRealIntegral
- Add support for cache values of >1D integrals in
expensive object cache
o RooExpensiveObjectCache
- New repository class that holds expensive components of RooAbsArg
function objects along with the parameters value for which the
stored expensive object is valid. All newly created objects
are associated with a default singleton instance in memory,
but objects in RooWorkspaces are associated with a cache in the
workspace.
o RooMCStudy
- Add Silence() named argument to ctor that will silence all
RooFit messages during running below the PROGRESS level
- Store generated number of events in fitParDataSet()
- Only store generated parameter values in fitParDataSet()
if constraints were used
- Give fitParDataSet() a unique named, named after the
fit and/or generator model used.
o RooNumRunningInt
- Fix bug in calculation of cdfs.
o RooMinuit
- Deprecate support for error handling mechanisms that are now
phase out.
- Implement option to ignore evaluation errors
- Improve the contour() method to return a RooPlot containing
contour TGraphs, rather than drawing them directory on a canvas
o RooDouble
- Set name to string representation of value
o RooGlobalFunc
- Add various named argument constructors needed by other code
o RooCintUtils
- New name space with CINT interaction utilities
- Add function to match a given functin pointer to a string with
a function argument list specification to facilitate manual overloading
of method on function pointer declarations, which is not supported
directly by CINT
o RooPrintable
- Introduce printAddress() method to print address
o RooRandomizeParamMCSModule
- Fix bug in init()
o RooAcceptReject
- Adjust code to make it work with observables with parameterized ranges
o RooWorkspace
- Add an embedded expensive object cache to each workspace. Connect each
inserted object to the internal expensive object cache and transfer
any cache contents upon insertion as necessary.
o RooNumIntConfig
- Tune non-verbose printing output
o RooAbsOptTestStatistic
- Implement correct handling of test statistics with observables
that have parameterized ranges in terms of other observables
- Implement sane copy constructor.
o RooHistError
- Add method to calculate confidence intervals for efficiency binomials.
o RooSentinel
- Add cleanup handler for expensive object cache global instance
o RooBinningCategory
- New real->cat function that represents binning associated with
any given RooAbsRealLValue as category functions. Category states
mapping to observable bins are automatically created and named
o RooSimultaneous
- Add support for new Slice() arguments that allow to specify the
slice position for category observables.
o RooTreeData
- More fixes for infernal warning messages from TTree concerning
improperly constructed memory resident trees
- Forward TTree::Draw() method with cut expression.
- Add Efficiency() named argument to plotOn() method to support
plotting of efficiencies represent by a category observable
that indicates which event do (not) pass a given cut
- Support FillColor() and FillStyle() named arguments in plotOn()
for the benefit of bar chart representations of histograms
- Add plotEffOn() method to implement internal handling specific
to efficiency plotting
- Extend functionality of getRange() method to automatically
include margins and optional interval symmetrization around
the mean if requested.
- Adjust observable pruning algorithm in data reading optimization
mode to take observables with parameterized ranges into account
o RooDirItem
- When creating a memory resident object, do not change directory if
already in memory directory.
Revision
24307 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 17 13:21:58 2008 UTC (6 years, 7 months ago) by
wouter
File length: 19394 byte(s)
Diff to
previous 24269
// Finishing touches on end-user interfacing of new RooFit printing organization
o RooAbsData,RooDataHist,RooDataSet
- Move implementation of printValue() from RooAbsData to RooDataHist and RooDataSet
and implement specialized value message for binned and unbinned data
- Remove custom defaultPrintStyle() and defaultPrintContents() implementations in RooAbsData
o RooDataHist,RooDataSet
- Implement a printArgs() method that shows the observables present in the dataset
o RooPlot
- Encode name of variable in default name of RooPlot
- Implement printArgs() that prints name of associated variable
- Implement printValue() that prints list of names of contained objects
- Finetune layout of text in printMultiline, add class name of
contained objects in printing of object list
- Set default print contents to name,value and arguments for all print styles
- Remove customized defaultPrintStyle() method
o RooFitResult
- Some fine tuning of layout of printValue() and printArgs() messages
- Add arguments as default item to be printed in defaultPrintContents()
- In defaultPrintStyle() use kStandard print style if no option is given,
otherwise defer to RooPrintable::defaultPrintStyle()
o RooCurve
- Remove "curve_" prefix from internally constructed name
o RooAbsReal
- In integralNameSuffix() add option to omit empty list of
integrated observables
- Introduce new automatic naming convention for curves created
by plotOn(): FUNCName_Slice[X]_DataAvg[X]_Asym[X] where the
last three suffixes are only appended if necessary. For sum
curves introduce convention CurveName1_PLUS_CurveName2
- Add string curveNameSuffix to PlotOpt to facilitate passing
of curve name extensions introduced by RooAbsPdf::plotOn()
to RooAbsReal::plotOn()
o RooAbsPdf
- Introduce new automatic naming convention for curves created
by plotOn(): PDFName_Comp[X] where the component suffix
is only introduced when components are selected. Any needed
additional options implemented by RooAbsReal::plotOn()
are added by RooAbsReal::plotOn().
o RooAbsCollection
- Fix broken contentsString() method
- Remove custom defaultPrintStyle() implementation
o RooAbsArg
- Remove custom defaultPrintStyle() method
- Add cloneTree() utility function that uses snapshoto to clone
tree expression headed by self and then adds all non-head
nodes as owned component to the head node.
o RooPrintable
- Modify default printTreeStructure() to print message
that tree printing is not implemented in class that
uses this default method
- Create universal defaultPrintStyle() method that maps
Print() options I,S,V,T to RooPrintable styles kInline,
kStandard,kVerbose and kTreeStructure respective. The
default print style is kSingleLine
o RooTreeData
- Introduce new automatic naming convention for histograms
created by plotOn(): h_DATASETName_RangeCut[X]_Cut[X]_Asym[X]
where the last three suffixes are only appended if necessary.
Revision
24269 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 13 15:37:03 2008 UTC (6 years, 7 months ago) by
wouter
File length: 19419 byte(s)
Diff to
previous 23538
o RooConvCoefVar RooDataWeightedAverage RooEllipse RooClassFactory RooConstVar RooDataHist RooDataSet
RooCmdConfig RooConvIntegrandBinding RooCacheManager RooDirItem RooEffGenContext RooCustomizer RooDataHistSliceIter
RooConstraintSum RooCurve RooErrorVar RooEfficiency RooDouble RooEffProd RooDLLSignificanceMCSModule RooCmdArg
- Upgrade inline documention: make sure that every member function has some descriptive comments, every
data member has a descriptive comment, make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
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: 16071 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/RooCurve.cxx
File length: 15861 byte(s)
Diff to
previous 21379
***********************************************************************
* 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
21379 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 14 15:12:29 2007 UTC (7 years, 1 month ago) by
wouter
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 15859 byte(s)
Diff to
previous 21064
o (Large number of classes)
- Systematically use Riosfwd.h in header files instead
of <iostream> or Riostream.h
- Include "Riostream.h" in implementations where necessary
- Convert remaining <iostream> to "Riostream" in implementations
- Outline all inline functions using cout or endl to facilitate
use of fwd declaration of iostreams in all classes
- Elimination of some duplicate headers
- Match use of 'using namespace std' in implementation files
to classes that actually use STL classes
Revision
20988 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 22 14:54:13 2007 UTC (7 years, 2 months ago) by
wouter
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 15777 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/RooCurve.cxx
File length: 15527 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
12129 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 23 07:37:30 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 15681 byte(s)
Diff to
previous 12082
o RooBanner, make_roofit_installkit
- Increment version number to v2.02
o RooEffGenContext, RooEffProd
- Include missing "RooFit.hh"
o RooEffProd
- Fix assert() to work on alpha as well
o RooRealMPFE
- Include "RooMPSentinel" in header to avoid rootcint trouble
o RooMinuit
- Add setEps()
o RooCurve, RooProdPdf
- Fix two 'unreachable statement' warnings on alpha
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/RooCurve.cxx
File length: 15662 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/RooCurve.cxx
File length: 15687 byte(s)
Diff to
previous 11619
o RooFit.hh
- New global header file for compiler patches. Currently contains
single patch for SunOS imported from BaBar.hh
o All .cc files
- Include RooFit.hh as first header file
o RooAbsData
- Make all plotOn() methods public
o RooAbsProxy
- Include pragma to switch of VC++ warning C4355
"'this' : used in base member initializer list'"
which would otherwise be triggered on each proxy initialization.
(each proxy constructor _expects_ a base class ptr so the warning
is misleading)
o RooAdaptiveGaussKronrodIntegrator1D, RooDataHist, RooGaussKronrodIntegrator1D,
RooGraphSpring, RooMCIntegrator, RooPolyVar, RooTreeData
- Change pow --> TMath::power() to eliminate windows compiler warnings
o RooEllipse
- Change constant M_PI to TMath::Pi()
o RooGlobalFunc
- Change RooConst --> RooFit::RooConst as functions has been moved into namespace
o RooMath
- Add erf() and erfc() forwarder functions to TMath::Erf() and TMath::Erfc()
o RooRealConstant
- Move RooConst() function into namespace RooFit
o RooSimultaneous
- Remove one default parameter from implementation version of plotOn() to resolve
overloading ambiguity reported by AIX compiler
o RooTreeData
- Make nested struct PlotOpt public to avoid CINT access problems
o RooTruthModel
- Add explicit cast to fabs() of proxy as it gives warning in Windows C++
Revision
11179 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Feb 24 22:36:07 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 15408 byte(s)
Diff to
previous 11122
o RooBanner
- Add version number 1.9 and update copyright year
o RooAbsCollection
- Improve inline documentation of printLatex()
o RooAbsData
- Improve inline documentation of reduce()
- Improve inline documentation of plotOn()
- Add createHistogram() method that calls RooAbsRealLValue::createHistogram()
and the RooAbsData::fillHistogram()
- Improve inline documentation of createHistogram()
o RooAbsGoodnessOfFit
- Add option to split range by index category for simultaneous fits. If the flag
is set, the range for each RooSim subset is range_{indexstate}
o RooAbsOptGoodnessOfFit
- Add option to split range by index category for simultaneous fits. If the flag
is set, the range for each RooSim subset is range_{indexstate}
- Do not store fit range with PDF if fit was simultaneous fit with split range,
since definition is ambigious in that case.
o RooAbsPdf
- Improve inline documentation of fitTo()
- Improve inline documentation of generate()
- Improve inline documentation of plotOn()
- Improve inline documentation of paramOn()
o RooAbsReal
- Improve inline documentation of createIntegral()
- Add createHistogram() method that calls RooAbsRealLValue::createHistogram()
and the RooAbsData::fillHistogram()
- Improve inline documentation of createHistogram()
- Improve inline documentation of plotOn()
o RooAbsRealLValue
- Improve inline documentation of frame()
- Improve inline documentation of createHistogram()
- Add createHistogram() version that takes RooLinkedList of arguments
to facilitate chain processing in RooAbsReal/Data::createHistogram()
o RooNLLVar, RooChi2Var
- Add argument to ctor to activate SplitRange() feature for simultaneous fits
o RooCmdConfig
- Make copy of command with sub-command before doing recursive processing
o RooCurve
- Set advertised normalization count to 1 instead of to 0. Fixes normalization
problems when plotting >1 curve on a frame w/o data.
o RooMCStudy
- Improve inline documentation of constructor
- Improve inline documentation of plotParam(),plotParamOn(),plotError(),plotPull() and plotNLL()
o RooNumIntFactory
- Suppress warning messages for attempted duplicate registration of numeric integrators
o RooPlot
- In addPlotable() update _normBinWidth only if objects bin width !=0
o RooProdPdf
- Improve inline documentation, most notably remove some documented restrictions that are long obsolete
o RooTreeData
- Improve inline documentation of plotOn()
- In fillHistogram() change THx filling method from AddBinContent() to Fill() as the former does not
update the total number of entries in the ROOT histogram, leaving some plotting methods broken.
- Improve inline documentation of statOn()
Revision
11122 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Feb 15 21:17:17 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 15407 byte(s)
Diff to
previous 11114
o RooAbsBinning
- Implement Clone() in terms of clone(). Fixes problem in cloning reported by Gautier
o RooAbsGoodnessOfFit
- Recognize and skup empty RooDataHists when setting up a simultaneous fit. Fixes bug
reported by Chris Roat
o RooAbsReal
- Add Range(const char* rangeName) feature to plotOn()
o RooAbsRealLValue
- Add new frame() function that accepts named arguments Name(),Title(),Range() and Bins()
o RooCmdConfig
- Add hasProcessed() utility function that tells if a given named argument has been
successfully processed.
o RooCurve
- Add interpolate() function that will interpolate function value for any given x
- Make average() function more robust: any range can now be averaged, not only those
starting and nodes.
- Add parameter to chiSquare() function to pass number of floating parameters in fit
to adjust number of degrees of freedom accordingly.
- Improve chiSquare() behavior when used on RooCurves defined on limited ranges.
o RooGlobalFunc
- Add global functions Title(),Bins(),Range(const char* name),Range(double,double)
o RooHist
- Add makePullHist() function to create a pull histogram of self w.r.t to a given RooCurve
o RooPlot
- Modify chiSquare() as done in RooCurve
- Add makePullHist() function that interfaces similarly named function in RooHist
- Add constructor with name and title arguments for implementation of new frame() function
in RooABsRealLValue
- Add type-safe getCurve() and getHist() functions
o RooTrace
- Remove spurious assert(0) statement
Revision
11114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Feb 14 20:44:30 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 13782 byte(s)
Diff to
previous 10648
o RooNameReg
- Registry for unique string name IDs. Converts a 'const char*' string into
a unique 'const TNamed*' and back. General purpose utility to to map
string identifiers to unique 32-bit numbers
o RooAbsReal
- In getAnalyticalIntegral(WN) and analyticalIntegral(WN) add extra argument
const char* rangeName to identify range over which integration should
be performed
o All RooAbsReal derived classes
- Modify getAnalyticalIntegral(WN) and analyticalIntegral(WN) to follow
change in RooAbsReal. Pass rangeName argument to min() and max() functions
of RooRealProxy to retrieve requested range instead of default range
o RooAbsArg
- Add virtual inRange(const char* rangeName) member function.
o RooAbsCategoryLValue
- Name change get/setFitBin() --> get.setBin(), numFitBins() --> numBins()
getFitBinWidth --> getBinWidth
o RooAbsCollection
- Add printLatex() method for formatted LaTeX printing of lists.
Supports named arguments Columns() to change number of columns,
Format() to change printing format, OutputFile() for printing
directly to file and Sibling() to print along side on or more other lists.
o RooAbsData
- Sanitize plotOn() arrangement: just keep version with RooCmdArg arguments
- Add optional rangeName argument to fillHistogram
o RooAbsGenContext
- Pass normalization set to expectedEvents() to support calculation of
fractional intergrals in extended term (e.g. in RooExtendedPdf)
o RooAbsLValue
- Name change: setFitBin(),getFitBin(),numFitBins(),getFitBinWidth() -->
setBin(),getBin(),numBins(),getBinWidth()
o RooAbsOptGoodnessOfFit
- Follow name changes in RooAbs(Real)Lvalue
o RooAbsPdf
- Modernize syncNormalization by using createIntegral internally
- Add getNormObj() function that returns const RooRealIntegral*
pointer to specified normalization integral. Takes optional
rangeName argument for calculation of fractional integrals.
- Sanitize plotOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Change expectedEvents() and extendedTerm() function signature to
take normalization set argument that can be used to calculated
normalization-dependent fractional integrals (e.g. in RooExtendedPdf)
- Migrate named argument global helper functions for plotOn() to RooGlobalFunc.cc
o RooAbsReal
- Modify createIntegral() method to take optional rangeName argument.
- Sanitize plotOn() and plotAsymOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Migrate named argument global helper functions for plotOn() to RooGlobalFunc.cc
- Add Name() feature to plotOn() to give chosen name to resulting RooCurve
- Add ProjectionRange() feature to plotOn() -- Project PDF only over limited
range as specified by range name to show finite width slices
in projection dimensions
- Add Invisible() feature to plotOn() which stores curve invisibly in
RooPlot.
- Add AddTo() feature to plotOn() which adds curve to existing curve
in Rooplot.
o RooAbsRealValue
- Name change get/set/hasFitMin/Max() --> get/set/hasMin/Max() etc.
o RooAcceptReject
- Follow changes in RooAbsRealLValue
o All numeric integrator engines
- Add "#include RooArgSet.hh" to compensate for removal of stray include in RooCmdConfig.hh
o RooAddPdf
- Add feature to fix interpretation of fractional coefficients in particular reference range
that can be different from default range
o RooChi2Var
- Migrate named argument global helper functions for constructor to RooGlobalFunc.cc
o RooCmdConfig
- Modify defineObject() to also be able to process arrays of objects
- Add process() method with 8 RooCmdArg arguments
- Modify getString() so that it can optionally return an empty string as a null pointer
o RooConvGenContext,RooConvIntegrandBinding
- Follow name changes in RooAbsRealLValue
o RooCurve
- Add constructor that takes two existing curves and two weights. New curve is construction
for OR set of points that define both input curves. Points on one curve that do not exist
on the other are calculate using interpolation.
o RooDataHist, RooDataSet
- Sanitize plotOn() functions
- Follow name changes in RooAbsRealLValue
o RooErrorVar
- Follow name changes in RooAbsRealLValue
o RooExtendPdf
- Completely rewrite using newly introduced fractional integral technology. Change
constructor to take optional const char* rangeName argument to denote restricted
range for expectedEvents() interpretation.
o RooFitResult
- Follow name changes in RooAbsRealLValue
o RooFormula
- Add new interface to make it work with ROOT version 4 as well as ROOT version 3
o RooGenProdProj
- Make it work with optional restricted integration ranges as well
o RooHist
- Add constructor that constructs RooHist from two existing RooHists. Both input
RooHist must have identical structure. In Poisson mode error is recalculated for
total number of events in each bin. In SumW2 mode errors of input RooHists are
combined.
o RooMCStudy,RooMinuit,RooNLLVar
- Follow changes in RooAbsRealLValue and RooAbsPdf::expectedEvents().
o RooNormManager,RooNormListManager,RooNormSetCache
- Make managers aware of range names that are associated with integral definitions.
o RooPlot
- Add optional argument to addPlotable(),addObject(),addTH1() functions to add
given object invisibly.
- Modify updateFitRangeNorm() to optionally refresh the normalization event count
even if it has already been set
- Add getObject() method that identifies object by index rather than by name
- Add internal RooPlot::DrawOpt class that conversion ROOT draw options and
RooPlot options from and to a const char* string.
o RooProdPdf
- Make it work with integrals over restricted ranges
o RooRealAnalytic, RooRealBinding
- Take optional rangeName argument in constructor that modifies output
of getMin() and getMax() functions
o RooRealIntegral
- Take optional rangeName argument in constructor and pass it to analytical integrals
and numeric integrators.
o RooRealProxy
- Modify min() and max() functions to take optional rangeName argument
o RooRealVar
- Follow name changes in RooAbsRealLValue
- Implement getFit*() functions for backward compatibility.
- Augment format() with extra LaTeX formatting options used
in RooAbsCollection::printLatex()
o RooTObjWrap
- Modify so that it can also store lists of objects in addition to single objects
o RooTreeData
- Sanitize plotOn() and plotAsymOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Add Name() feature to plotOn() to give resulting RooHist chosen name
- Add XErrorSize() feature to plotOn() to explicitly control size of X error bars
- Add Invisible() feature to plotOn() to be able to store RooHist invisible to RooPlot
- Add AddTo() feature to plotOn() to be able to add RooHist to an existing RooHist
in RooPlot
- Add RefreshNorm() feature to plotOn() which causes normalization event count in RooPlot
to be refreshed with event count from this plot operation
- Add optional rangeName argument to fillHistogram()
o RooGlobalFunc
- Move all global helper functions that create RooCmdArg named arguments here
- Additionally create short-hand helper functions C(), L() and S() respectively
that create a RooConst, a RooArgList and a RooArgSet. These shorthand functions
are stored in namespace RooFitShortHand and thus not by default available
in the global namespace
Revision
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/RooCurve.cxx
File length: 11652 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
5188 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Aug 27 00:53:24 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 10930 byte(s)
Diff to
previous 4698
>>> Introduction of named parameter plotOn() driver methods + bug fixes
o GNUmakefile.standalone
- Change example compiler to gcc 2.95.3
o RooAbsPdf
- Implement global error flag to signal local evaluation problems
(To be used by eg RooMinuit)
- Add new named parameter plotOn() frontend
- Extend existing plotOn() to accept addition options
- Define global named parameter ctor functions for plotOn()
o RooAbsReal
- Add new named parameter plotOn() frontend
- Extend existing plotOn() to accept addition options
- Define global named parameter ctor functions for plotOn()
o RooAbsString
- Change interface from TString to const char* for efficiency reasons
o RooCurve
- Add new ctor option 'WingMode' to control
curve wings used to control filling behaviour
o RooDataHist
- Implement new named argument plotOn() front end
o RooDouble
- Change inheritance from TObject to TNamed
o RooExtendPdf
- Bug fix in expectedEvents()
o RooFitCore_LinkDef
- Add plotOn() named argument global ctor functions
o RooHtml
- Fix iostream forward declaration
o RooMinuit
- Fix iostream forward declaration
o RooSimultaneous
- Implement new named argument plotOn() frontend
o RooStringVar
- Change interace from TString to const char* for efficiency reasons
o RooTreeData
- Implement new named argument plotOn() frontend
o RooCmdArg
- New class serving as universal method argument.
o RooCmdConfig
- New class. Configurable recipient of universal method arguments.
Owning method defines
- Mapping of (Int_t/Double_t/const char*/TObject) type values
to slot in a RooCmdArg with a given name
- List of required arguments
- List of mutually exclusive commands
- List of command dependencies
and RooCmdConfig::process() method with check syntax, provide
understandable error messages (if necessary) and parse the given
command output to the registered (Int_t/Double_t/const char*/TObject)
fields
o RooInt
- New class. Minimal implementation of a Int_t in a TNamed.
Analoguous to RooDouble
o RooTobjWrap
- New class. Minimal implementation of a TObject pointer in a TNamed.
Analoguous to RooDouble/RooInt.
Revision
4698 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Jun 12 23:53:26 2002 UTC (12 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 10696 byte(s)
Diff to
previous 4300
o RooAICRegistry
- Make snapshot instead of Clone of stored RooArgSets
o RooAbsPdf
- Add projected dependents option to plotNLLOn
- Add 'force' switch to selectNormalization to distinguish
user-propagated vs automatic calls
o RooAbsReal
- Change in selectNormalization
o RooAddPdf
- Use 2-tier process to check if coefficient projection
is current: 1st use pointer of nset,iset, 2nd compare
names with stored RooNameSet. Eliminates unnecessary
recreation of projection integrals if PDF is called
from more than one place
o RooBanner
- Thwart Chris Roats cash flow scheme
o RooCurve
- Change procedure to update y-range limits to properly
work with zero-shifted curves
o RooNLLBinding
- Add projected dependents options
o RooSimultaneous
- Change in selectNormalization
Revision
3472 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 13 23:08:44 2001 UTC (13 years, 1 month ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 10316 byte(s)
Diff to
previous 3246
o RooAbsDataLValue
- Insert small tolerance in limits enforcement to avoid
numerical precision problems when plotting up to the limits
o RooDataHist
- When constructed from a THx, copy the number of bins of the THx
to the input RRVs representing the THx's dimensions
o RooCurve
- Small refinement in plotting 'wings' to avoid visible vertical
lines when functions is <>0 at plot limits
o RooTreeData
- When setting RooHist::setRawEntries() use number of entries,
not number of bins
Revision
3246 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 19 18:03:20 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 10291 byte(s)
Diff to
previous 3198
o RooAbsReal,RooAbsRealLValue
- Migrate createHistogram functions to from RooAbsReal to RooAbsRealLValue
- Use getFitBins()/Range() as default range instead of getPlotBins()/Range()
o RooAbsReal
- In plotOn() provide range and bins to RooCurve in ctor
o RooCurve
- Retrieve range and min. number of bins from ctor arguments instead of
plotbins/range
o RooTreeData
- Adjust to createHistogram migration
Revision
3198 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 9 03:12:08 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 10282 byte(s)
Diff to
previous 3124
o RooPlot
- Add chiSquare() method to calculate chi^2 between a RooCurve
and a RooHist. Actual calculation deferred to RooCurve::chiSquare
o RooCurve
- Add chiSquare() method, using integral of curve over bin width
and accounting for asymmetric errors of a histogram.
- Displace vertical line segments of each RooCurve (which enforce
a properly closed surface when using the "F" draw option) outside
nominal plot range so that they don't show when the curve is
drawn with the "L" option.
Revision
3124 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 27 22:28:23 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 8398 byte(s)
Diff to
previous 3003
A large number of small fixes and improvements
o Roo1DTable
- Modify Print() behaviour. Standard print will
only show non-empty fields, verbose shows all fields
o RooAbsArg
- Change getParameters so that it can accept 0 as
dataset pointer (implies no dependents)
o RooAbsPdf
- Follow plotOn() changes in RooAbsReal
o RooAbsReal
- Add optional const RooArgSet* projData argument to
plotOn(). Projected dependents that appears in this
dataset, if specified, will be projection via summation
over data instead of integration.
- Add clipInvalid option to bindVars() and propagate to
RooRealBinding
- Modify cleanBranchName() to truncate 'clean names'
(which are used for the TTree branch) to 63 chars
as cannot handle such cases (SEGV). In case name
is longer than 63 chars, truncate name at 46 chars
and suffix with _crc followed by hex representation
of CRC32 checksum of the full name.
- Add crc32() method to calculate the checksum of a string
o RooAddModel,RooAddPdf
- Do not evaluate PDF components multiplied by a zero coefficient
o RooAddPdf
- Fix DIV0 in analyticalIntegral if number of expected events
for all PDFs combined totals zero
o RooArgSet
- Add ability to readFromStream and readFromFile to optionally
flag read arguments with a user specified attribute
(Mostly useful to determine which elements have _not_ been read)
o RooConvolutedPdf
- Change declareBasis() signature from a RooArgSet& to a RooArgList&
to correctly handle cases where the names of parameters are identical
(e.g. tau=zero and dm=zero for prompt background models)
- Expand logic in RooGenContext. Add additional requirement for
use of optimized generator context: both the physics pdf and
the resolution model must support direct generation of the
convolution variable.
(Still have to fix RooAddModel/Pdf for cases where all components
can do direct generation)
o RooCurve
- Deploy RooRealBinding::clipInvalid feature to zero plotted functions
outside the validity range of their dependents
- Add extra points at (xlo,0) and (xhi,0) to obtain correct filling
pattern when using the 'F' draw option.
o RooCustomizer
- Add warnings for multiple split or replace rules on the same leaf
o RooDataSet
- Make read() take a const RooArgList& instead of a RooArgList&
and immediately make temporary copy for internal use.
- All constructors with string based cut: add default empty cut.
o RooFitContext
- Ctor: Compare limits on dependents in PDF and dataset if limits
of PDF are smaller and fully contained in those of the dataset,
adjust the dataset ranges in the internal copy and reject events
outside the PDF limits. If PDF ranges are not identical or fully
contained in dataset limits, give error message and abort.
- In fit() fix handling of parameters handed to TMinuit: set pmin/pmax
to the parameter value for constant parameters. For floating parameters
with open limits and without error, use 1/10 of the plot range
instead of 1/10 of the fit range.
o RooFormula,RooFormulaVar
- Change RooArgSet to RooArgList to pass formula parameters.
This allows construction of formulas with ordinal references
for list of parameters with multiple occurrences of the same
variable.
o RooRealBinding
- Add clipInvalid option, specified in ctor. If set, loadValues()
will first check if the values to be loaded are in the limits
of the bound objects dependents. If not the values are not loaded
and an invalid flag is set. If the invalid flag is set operator()
will return 0.
o RooRealVar
- Add various 'named parameter' functions on a trial basis
o RooSimFitContext
- Gracefully handle RooSimultaneous PDFs with missing PDFs.
o RooSimGenContext
- Forgot to set index state in theEvent RooArgSet when generating
the index category
- Remove forced normalization of index state in evaluate()
- Remove dummy plotOn() method and specialized plotOn() with data
method as projection over the index state can now be handled
the regular plotOn method. Overload RooAbsPdf::plotOn to
force caller to specify projection dataset for the index category
if projection over the index category is requested
o RooTable
- Remove print(), add default Print(Option_t *), and reimplement
printing via inheritance from RooPrintable
o RooTreeData
- In loadValues(RooTreeData*) explicitly check isValid() of
each element of _vars after copying. If any is invalid,
reject the event.
- In table() change simple clone of tableVar to deep clone.
Implement use of optional cut string (accidentally omitted sofar)
o RooTruthModel
- Add highly trivial direct generator for the convolution variable
o RooDataProjBinding
- New lightweight binding between an RooAbsReal and a dataset
that returns the projection of the real over the dataset
via summation. If the dataset only contains category variables
an supercategory of all the datasets categories is created
and the data is summed (with appropriate weights) over the
supercategory states instead of over every event.
Revision
3003 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Oct 9 01:41:20 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 8277 byte(s)
Diff to
previous 2995
o RooPdfCustomizer -> RooCustomizer
- Rename class because customizer can also customize
non-PDF objects.
- Inline documentation update
o RooAbsArg
- Add RooCustomizer as friend instead of RooPdfCustomizer
o RooAbsPdf
- Extend plotNLLOn() with an optional precision argument
and a flag to force the lowest plotted NLL to be shifted
down to zero (on by default)
o RooAbsReal
- Change RooPdfCustomizer to RooCustomizer
o RooCurve
- Add option in ctors to shift curve down such that lowest
plotted point touches zero
- add shiftCurveToZero() function to perform that shift
and readjusts plot y-range if necessary
o RooPlotable
- Add setYAxisRange() method for the benefit of RooCurve
o RooSetProxy
- Overload addOwned(RooAbsCollection&,...) method to
avoid partial overloading problems
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/RooCurve.cxx
File length: 7157 byte(s)
Diff to
previous 2959
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
2959 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 3 16:16:32 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 7150 byte(s)
Diff to
previous 2887
o RooAbsArg
- Minor modification in verbose dirty state messaging
o RooAbsCategory
- Recognize integer branches in non-RooDataSet trees
and attach to those in a special mode (similar to how
single precision flaots are treated in RooAbsReal)
- Modify copyCache() to recognize when copying from a
special mode RooAbsCategory. In such cases the index
is copied from the source and the label is then restored
from the destinations state list
o RooAbsCollection,RooSetProxy,RooListProxy
- Add option to remove() to match arg(s) to be removed
only by name and not by pointer in addition
o RooAbsPdf
- Modify syncNormalization() so that it accepts LValue branch
nodes in the normalization set specification.
o RooAbsReal
- Modify createProjection() to properly construct projections
with LValue dependents
- Modify plotOn() to allow plotting of LValues
o RooArgProxy,RooRealProxy,RooCategoryProxy
- Add option in ctor for proxy to take ownership of proxied object
o RooCurve
- Modify ctor to allow plotting of LValues
o RooLinearVar
- Set initial value of plot range and bins from
those of the dependent
o RooRealIntegral
- Some adjustments to LValue substitution algorithm in ctor
o RooTreeData
- Modify all ctors to use new createTree() member function
to instantiate the TTree. createTree() will cd to memory
directory during TTree ctor so that RooDataSet tree will
be memory resident regardless of the current directory
- Warn user when loading invalid values from non-RDS TTrees
Revision
2887 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Sep 28 21:59:29 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 7144 byte(s)
Diff to
previous 2882
Overhaul of plotting (part 2)
-----------------------------
o RooAbsData
- Add new virtual function plotAsymOn(frame,asymCat,...)
for asymmetry plotting
o RooAbsPdf
- Implement plotOn() with normalization support (Raw,Relative,NumEvent)
o RooAbsReal
- Implement new plotting functions:
plotOn(frame,....) - Regular projected plotting
(overloaded in RooAbsPdf)
plotSliceOn(frame,sliceset,...) - Partially projected plotting
plotAsymOn(frame,asymCat,...) - Asymmetry plotting
(for any 'sign-type' cat. variable)
- Projection logic moved from RooCurve::ctor to plotOn(),
rearranged to use createProjection()
- Introduce some protected helper functions for plotting
plotSanityChecks(), makeProjectionSet()
o RooAddPdf
- Implement partial plotting function
plotCompOn(frame,compSet,....)
to plot any arbitrary subset of components
- Fix normalization in evaluate(), revert to default
extendedTerm()
o RooCurve
- Remove projection logic from ctor (moved to RooAbsReal::plotOn)
o RooSimultaneous
- Overload inherited plotOn() with dummy function and message for
user
- Implement plotOn(frame,RooAbsData*) which constructs a RooAddPdf
plot function, with the relative weights determined from
the supplied dataset
- Implement plotCompOn(frame,RooAbsData*,compSet,...) and
plotCompOn(frame,RooAbsData*,indexLabelList,...) to plot only
selected parts of the pdf (supplied as argSet of component
pdfs, or a string with comma separated labels of the index
category)
o RooTreeData
- Introduce dummy plotAsymOn(frame,asymCat,...)
Misc. small fixes / improvements
--------------------------------
o RooAbsCategory
- Add helper function isSignType() to determine if
given category has 2 or 3 states with values -1,0,1
o RooConvolutedPdf
- Fix potential null ptr evaluation in getAnalyticalIntegralWN()
o RooGenContext
- Comment out some unreachable code to suppress OSF compiler warning
o RooPdfCustomizer
- Generalized to work with any RooAbsArg tree.
Need to change name at some point...
o RooStreamParser
- Insert forgotten & in readInteger so that function now
actually modifies integer reference to be read
(Found by OSF compiler)
Revision
2882 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 27 18:22:31 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 8477 byte(s)
Diff to
previous 2838
Binned data reorganization
--------------------------
o RooAbsArg,RooAbsCategory,RooAbsReal,RooAbsRealLValue,RooAbsCategoryLValue,RooAbsLValue,RooRealVar
- Introduce the concept of 'fit bins' for the purpose of binned fits
So far we have been abusing the plot bins for this purpose but this
will ultimately lead to confusion
RooAbsLValue now defines 5 abstract methods to access the fit bin interface
setFitBin(), getFitBin(), numFitBins(), getFitBinWidth(), createFitBinIterator()
which are implemented in RooAbsCategoryLValue and RooAbsRealLValue
RooRealVar holds the fitBins data member.
o RooDataHist
- Change to use fit bins and range instead of plot bins and range for
binning a dataset
- Add new sum() methods implementing full and partial summation of
of the dataset contents, optionally accounting for bin volume correction
o RooHistPdf
- New PDF constructed from a RooDataHist implements n-dimensional
PDFs constructed from an equivalent histogram. All dimensions can
be either real of discrete
- All partial and full integrations are implemented using the new
RooDataHist::sum() methods.
Plotting reorganization (part 1)
--------------------------------
o RooPlot,RooHist,RooCurve,RooPlotable
- Store the two components of the normalization #events and binWidth
seperately
- Replace getFitRangeNorm() method with getFitRangeNEvt() and getFitRangeBinW()
methods
- Adapt updateFitRangeNorm() to store components of normalization separately
o RooAbsReal ( & RooSimultaneous)
- Add extra enum to plotOn() indicating interpretation of given scalefactor
Raw -> Apply scale factor without any other adjustments
Relative -> Apply scale factor after default normalization adjustment (old implementation)
NumEvent -> Interpret scale factor as number of events to normalize to
For RooAbsReals that are not a RooAbsPdf, the Raw procedure is always applied
Some more reorganization will follow in this area
o RooFormulaVar
- Take out dummy analytical integration definition now that plotOn will do the
right thing by default
Misc. fixes
-----------
o RooAbPdf
- Fix normalization bug in analytical integration by introducing overloaded
analyticalIntegralWN, which returns analyticalIntegral()/getNorm()
instead of just analyticalIntegral()
o RooAddPdf
- Eliminate now obsolete addPdf() and addLastPdf() member functions
Revision
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/RooCurve.cxx
File length: 8411 byte(s)
Diff to
previous 2827
Major cleanup in integration of normalization functions
Miscellaneous small improvements and fixes
o Roo1DTable
- Add get(),getFrac() methods to retrieve contents
o RooAbsCollection
- Add selectCommon() method to create new collection
containing args common to two sets
o RooAbsData
- Minor const-correctness changes
o RooAbsReal
- Rearrangement of getAnalyticalIntegral/analyticalIntegral entry points.
Both functions now exist with and without a 'const RooArgSet* normSet'
The functions with normSet are used by RooRealIntegral, and its default
implementation handle the pass-through scenario (code 0 = getVal(normSet))
and defers other codes to the non-normSet variant.
Simple PDFs should implement the non-normSet variants, as they used
to do sofar, except they no longer should (or are able to) process
the passthrough scenario.
Advanced PDFs such as RooAdd,ProdPdf, RooConvolutedPdf that implement
complex integration schemes that depend on the exact normSet configuration
reimplement the getAI,aI functions with normSet.
o RooResolutionModel, RooAddModel
- Implement (or forward in case of RooAddModel) new getNormSpecial method.
This function is identical in functionality to RooAbsPdf::getNorm()
except that it caches a separate copy of the normalization integral.
This member is introduced for the benefit of RooConvolutedPdf::analyticalIntegral
which, in case of a normalized integration, alternatingly calls two different
normalizations. In the original single cache code, this would lead to
100% caching failure and 300% slowdown of the code. getNormSpecial is
protected for access by RooConvolutedPdf only.
o RooAddPdf,RooProdPdf,RooSimultaneous,RooConvolutedPdf
- Re-implement distributed analytic integration bookkeeping using
the auxiliary RooAICRegistry class, which keeps track of multiple
analytical integration codes (hence AIC)
o RooAICRegistry
- New auxiliary class to faciliate the management of distributed analytic
integration.
o RooArgSet
- Minor printing fix
o RooConvolutedPdf
- Complete rewrite of handling of analytical integrations. For RCP objects
analytical integrations are not all necesarily analytic, but include
integrations deferred to convolution objcts. Analytical integrations
are split off for coefficient terms. Complete double bookkeeping introduced
for 'integration' part of analytic integration and 'normalization' part
of integration, each of which can have a different argSet to defer
to the convolution objects and a different coefficient analytical integration
code. Current implementation is believed to be complete.
o RooFormulaVar
- Follow signature change of getAnalyticalIntegral/analyticalIntegral
o RooMath
- Implement file cacheing scheme for complex error function lookup table.
To invoke persistent caching, call RooMath::cacheCERF(kTRUE) prior to
use
o RooRealAnalytic
- Store and forward normalization set to analyticalIntegral call of
bound RooAbsReal
o RooSimultanous
- Implement new plotOn() method, taking a dataSet which can correctly
project a RooSimultaneous. The code is mostly copied from RooAbsReal::
plotOn, except that the plotted pdf is constructed as a RooAddPdf
of the RooSimultaneous components, weighted by the fractions found
in the passed dataset
o RooTreeData
- Small const-correctness fixes
Revision
2820 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 20 01:40:11 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 8278 byte(s)
Diff to
previous 2816
Clarify difference between integrable (RooAbsReal) and normalized
(RooAbsPdf) and work on integration of normalized functions
Implement smart integrals for RooAddPdf (fanout of common analytical
integral) and RooProdPdf (drop PDF components fully integrated)
Some small fixed and improvements
o RooAbsCollection
- Implement one-line print in "(a,b,c)" style
o RooAbsPdf,RooAbsReal
- Move matchArgs() functions from RooAbsPdf to RooAbsReal
as they relate to integrability, which is common to all
real valued objects
- Move selfNormalized() from RooAbsReal to RooAbsPdf, which
applies only to normalized functions
- Extend getAnalyticalIntegral() to take an options
normalization set pointer, as the analytic normalization
capabilities of RooAdd/ProdPdf depend on the choice of
normalization
o All core PDFs
- Follow signature change of getAnalyticalIntegral()
o RooAddPdf
- Implement distributed analytical integration of component
PDFs. RooAddPdf forces RooRealIntegral to pass all integrated
dependents to getAnalyticalIntegral (by reimplementing
forceAnalyticalInt).
RooAddPdf::getAnalyticalIntegral will forward the call
to all component PDFs and find the set of dependents
that all components can integrate analytically.
If such a set exists, the components integration codes
are stored in an array and associated with a master integration code
RooAddPdf::analyticalIntegral is copied mostly from evaluate()
replacing each getVal() with getAnalyticalIntegral, passing
the appropriate integration code to each component
o RooProdPdf
- Implement factorizing analytical integration of component PDFs.
Because each PDF is normalized, the integral of a product of
PDFs can often be simplified, e.g. Int(y) A(x)B(y) = A(x)
as Int(y)B(y) is 1 by definition.
RooProdPdf forces RooRealIntegral to pass all integrated
dependents to getAnalyticalIntegral (by reimplementing
forceAnalyticalInt).
getAnalyticalIntegral() will determined which PDFs can be
dropped for a given choice of dependents to be integrated
and a given choice of normalization and constructs a integration
code encoding the pattern of dropped/kept PDFs as a bit pattern.
analyticalIntegral() is mostly copied from evaluate(), skipping
the terms indicated as dropped by the integration code bit pattern.
o RooPdfCustomizer
- Trivial bug fix in build()
o RooRealIntegral
- No longer consider the integrated functions' selfNormalized()
property in the integration logic.
- Fix a bug in the forced_analytical vs numeric integration
determination, which occasionally lead of dependents being
integrated twice, once analytic and once numeric.
Revision
2799 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 18 02:03:45 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 7970 byte(s)
Diff to
previous 2735
Fix for Remedy 05557 and a similar but unreported problem in generating
o RooAbsReal
- Modify bindVars to take optional normalization set
o RooCurve
- Use new normalized bindings. Modify scale factor algorithm
to work with normalized functions (explicit correction no
longer needed)
o RooGenContext
- Use modified RooRealIntegral ctor with function normalization set
o RooRealBinding
- Extend ctor to take optional function normalization set in ctor
and pass this argset to the bound functions' getVal()
o RooRealIntegral
- Extend ctor to take optional function normalization set in ctor
that is passed to integrated function in passthrough and full
numeric mode
Revision
2735 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 23:43:43 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 8113 byte(s)
Diff to
previous 2722
The following changes enforce set semantics in the public use of
RooArgSet's by removing the public TList interface.
RooArgSet:
- change base class from TList to TObject
- add protected data member THashList _list
- add inline createIterator() to export _list.MakeIterator()
- add inline getSize() to export _list.GetSize()
RooAbsArg,RooAbsData,RooAbsPdf,RooAcceptReject,RooConvolutedPdf,
RooCurve,RooFitContext,RooFitResult,RooFormula,RooFormulaVar,
RooGenContext,RooGenericPdf,RooLinearVar,RooMultiCatIter,
RooNameSet,RooPdfCustomizer,RooRealBinding,RooRealIntegral,
RooSetProxy,RooSuperCategory,RooDataSet:
- replace RooArgSet::MakeIterator() with createIterator(), etc.
RooAbsArg,RooArgProxy,RooSetProxy:
- move a block of duplicated code in RooAbsArg::redirectServers()
RooSetProxy::changePointer() and RooArgProxy::changePointer() into
a new RooAbsArg::findNewServer() member fn.
*** Outstanding problems now resolved by temporary cheater member
*** functions added to RooArgSet:
- RooConvolutedPdf uses RooSetProxy::At() and ::IndexOf()
- RooFitContext uses RooArgSet::At() and ::Sort()
- RooFitResult uses RooArgSet::IndexOf() and ::At()
- RooMultiCatIter uses RooArgSet::getCollection()
- RooPdfCustomizer uses RooArgSet::Sort()
- RooRealBinding uses At()
- RooSimFitContext uses RooArgSet::At() and IndexOf()
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/RooCurve.cxx
File length: 6963 byte(s)
Diff to
previous 2654
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
2654 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 8 23:11:25 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 6904 byte(s)
Diff to
previous 2639
RooAbsIntegrator:
- no longer inherits from TObject
- uses RooAbsFunc interface instead of RooAbsReal
- remove (AbsReal,mode) binding functionality (now performed by
class RooRealAnalytic)
- add counter for number of integrand evaluations
RooIntegrator1D:
- use RooAbsFunc interface instead of RooAbsIntegrator::eval()
- fix array size bug (already fixed in RFT after this routine was copied)
- add a constructor option to select the summation and refinement rule
to use and change the maxSteps, eps defaults to zero (defaults depend on
the rule being used and are now applied in the initialize() method)
- implement a new addMidpoint() summation rule that can be used to
estimate certain improper integrals
- add check for finite integration limits
RooRealIntegrator:
- add isValid() member fn to flag ctor problems
- add check that all integration vars are lvalues
- use new RooIntegrator1D interface
- use new RooRealBinding,RooRealAnalytic classes
- remove maxSteps, eps ctor parameters (they were not being used)
- use new RooInvTransform and RooImproperIntegrator classes for 1-dim
numerical integrals with one or both limits infinite
- change logic for calling initNumIntegrator() so that it correctly
propagates shape/value changes
- make initNumIntegrator() const so it can be called from evaluate()
and make the data members it modifies mutable
- support 1D numerical integration with either limit infinite via
RooImproperIntegrator1D
RooAbsArg,RooAbsRealLValue,RooAbsCategoryLValue:
- add isLValue() member fns
RooInvTransform:
- new RooAbsFunc implementation that performs the change-of-vars
transformation x -> 1/x on an input RooAbsFunc.
RooImproperIntegrator1D:
- new RooAbsIntegrator implementation that performs an integration
where one or both limits are infinite by splitting up the range
into up to 3 subranges that can each be handled by RooIntegrator1D.
RooNumber:
- new class to encapsulate platform-specific numerics (eg, infinity)
RooAbsRealLValue,RooIntegrator1D,RooImproperIntegrator1D,RooLinearVar,
RooRealIntegrator,RooRealVar:
- use RooNumber statics instead of (non-portable) preprocessor INFINITY
and remove unecessary include dependencies on RooAbsRealLValue.hh
RooIntegratorTest.cc:
- test macro that is not compiled into the library
Revision
2639 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 3 21:44:57 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 6716 byte(s)
Diff to
previous 2629
- replace RooAbsFunc1D with more general RooAbsFunc class
- replace RooAbsReal::operator() with bindVars() member function
- add RooRealBinding class that adapts RooAbsReal interface to
RooAbsFunc interface by binding its getVal() method to a specified
set of dependents, eg, {F(x,y,z),{x,z}} => f(x,z)
- add RooScaledFunc class that applies a scale factor to a
RooAbsFunc implementation
- re-implement RooCurve to use new binding classes and the
RooAbsFunc interface
- new RooRealAnalytic class is a lightweight binding of an AbsReal
analytic integral to a set of dependents (will be used to
clean up RooAbsIntegrator, in preparation for a multi-dim
implementation...)
Revision
2629 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 23:54:24 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 5537 byte(s)
Diff to
previous 2624
RooRealIntegral:
- rename Unity to PassThrough
- change function arg type from RooAbsPdf to RooAbsReal
- change (RooAbsReal&) to const_cast (why does the RooRealProxy ctor
need a non-const ref?)
RooAbsIntegrator,RooIntegrator1D:
- change signatures from AbsPdf to AbsReal
Revision
2624 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 1 21:30:16 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 5591 byte(s)
Diff to
previous 2487
- support generating vars that PDF does not depend on explicitly
(they will have uniform distributions)
- support plotting of an AbsReal wrt a variable that it does not
depend on explicitly (plot will be flat but normalization is still
not correct)
- new method RooArgSet::addClone() parallels add() but *only* works
on a copied list (used in RooAcceptReject.cc)
- RooArgSet::remove() can now remove elements from a copied set and
deletes them at the same time.
- change RooRealFunc1D binding object to project out extra variables
instead of calculating along a slice (but normalization wrt x is
not done correctly yet in this case).
Revision
2148 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 9 00:51:10 2001 UTC (13 years, 8 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 4997 byte(s)
Diff to
previous 2129
RooCurve:
- implement variable point spacing based on deviation from line segments
- set default axis labels when creating from an AbsReal(RealVar) binding
RooPlot:
- new addPlotable() member function replaces addHistogram() and also
works with RooCurve objects
- move fDimension=1 into initialize()
- replace sprintf with TString::Form()
RooAbsReal:
- ownership of created curve object is transfered to a plot in plot()
Revision
2129 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon May 7 06:26:14 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 3201 byte(s)
Diff to
previous 2112
o RooAbsPdf: change logic in getVal()
- Results of getVal(0), i.e. without normalization, are no longer
cached as this caused interference between getNorm() and getVal().
o RooAbsReal::plot(): use deep clone and recursiveServerRedirect
instead of shallow clone
o RooPlot
- Fix dimension to 1. This is (surprisingly enough) not done
in TH1, but always in the TH1(F,C,...) implementation classes,
so RooPlot should do this as well. This fixes intermittent plotting
problems where 1D distributions were plotted in a >1 dimensional frame
- Assign unique name to TH1 object as assigning the same name ("frame")
will cause ROOT to re-use the existing object. This might lead to
unexpected results (I think...)
- Use deep cloning of plotVar in RooPlot(RooAbsReal) ctor
o RooAddPdf
- First implementation (functionality as in RooFitTools)
o RooBlindTool,RooUnblindCPAsymVar,RooUnblindCPDeltaTVar
- Moved to RooFitModels
Revision
2112 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Wed May 2 18:09:00 2001 UTC (13 years, 8 months ago) by
david
Original Path:
trunk/roofitcore/src/RooCurve.cxx
File length: 3197 byte(s)
RooHistError:
- new singleton utility class for calculating histogram error bars
RooPrintable:
- lessVerbose() maps Shape & Verbose to Standard
RooAbsArg:
- use writeToStream() for Standard printToStream()
- fix iterator memory leaks in dependsOn() and printToStream()
- copy ctor with name arg uses other object's name if strlen(name)==0
so that the Clone(const char *name= "") operator can use this copy ctor
(maybe we don't need copy ctors w/o name args any more?)
RooAbsArg,RooAbsReal,RooRealVar,RooAbsCategory:
- remove dedicated Standard printToStream()
RooAbsReal:
- implement plot() methods
- add binding method using f(x) syntax (see RooRealFunc1D)
RooRealVar:
- change default fit range in ctors to (-INF,+INF)
- change Clone() signature to match TObject::Clone()
RooFormula:
- multiply-inherit from RooPrintable & implement printToStream,Print
- make actualDependents() const
RooRealFormula:
- standardize printToStream()
- change Clone() signature to match TObject::Clone()
RooCurve:
- new class for smooth 1-dim curve (analog of RooHist)
RooPlotable:
- abstract interface for plotable objects (RooHist,RooCurve)
RooAbsFunc1D:
- abstract interface for evaluating real-valued func of one real var
and performing numerical algorithms on it (1D numerical integrator
should go in here...)
RooRealFunc1D:
- implementation of AbsFunc1D that binds an AbsReal with a RealVar
*** Things to discuss with Wouter:
- remove name from ArgSet ctors? (or make it optional?)
- add optional plot range & unit to some DerivedReal ctors, eg, RealFormula?
- RealFormula: arg is added to list of actual dependents each time it appears
(eg, "1+x*x" -> x is listed twice as a dependent)
- there an overloading ambiguity between:
TObject *Clone();
TObject *Clone(const char *name= "") const;
- do we need copy ctors that don't take a name arg?
- const cast errors in RooAbsIntegrator and RooRealIntegral
- should dependsOn() be recursive by default?
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.
