Log of /trunk/roofit/roofitcore/inc/RooDataHist.h
Parent Directory
Revision
44507 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 4 12:30:41 2012 UTC (2 years, 7 months ago) by
axel
File length: 9187 byte(s)
Diff to
previous 42598
Remove
using namespace std;
from Riostream.h, which has huge consequences for all of ROOT.
Riostream.h is now a simple wrapper for fstream, iostream, iomanip for backward compatibility; Riosfwd.h simply wraps iosfwd.
Because of templates and their inline functions, Riostream.h needed to be included in headers, too (e.g. TParameter.h), which violated the assumption that Riostream.h is not exposing its using namespace std to headers.
ROOT now requires R__ANSISTREAM, R__SSTREAM, which does not change the set of supported compilers.
Without "using namespace std", several identifiers are now prefixed by std::; e.g. roofit/* source files now have a using namespace std to keep their coding style.
TFile::MakeProject() now generates "using namespace std" to convert the CINT-style class names into C++ ones.
Revision
42598 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 12 14:48:11 2012 UTC (3 years ago) by
wouter
File length: 9172 byte(s)
Diff to
previous 42443
o RooDataHist
- Add support for inverse bin volume corrected, needed for RooHistPdf
o RooHistPdf
- Use inverse bin volument correction in partial analytical integrals for correct calculation
(bug reported by G. Raven)
o RooDataSet
- In legacy tree-based constructors, also convert data store to vector-type if that
is set as the default storage type
o RooAbsOptTestStatistic
- Disable level-2 optimization (cache-and-track) if storage class of dataset is not RooVectorDataStore
Revision
42443 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 8 15:08:16 2011 UTC (3 years, 1 month ago) by
wouter
File length: 9118 byte(s)
Diff to
previous 41536
o RooAbsData
- In split() explicitly add weight variable to component datasets if
the dataset is weighted. This fixes a bug (reported by M Baak)
that weights are ignored when a weighted dataset generated
from RooSimulateous::generate() are ignored in the likelihood.
(this happens because the weights are only in the component datastores
in the form constructed by RooSimGenContext::generate() and not
in the top-level dataset). The 'fast-split' which is executed e.g.
by setData() is not affected by this because it directly recycles
the component datastores
o RooDataSet,RooDataHist,RooAbsData
- Add new optional argument to emptyClone() to introduce
weight variable on the fly if needed.
o RooDataHist
- Speed up getIndex() by allowing fast-assign methods
o RooFactoryWSTool
- Add inverse conditional symbol '|~' to PROD() notation
i.e. PROD(F|~x,G) interprets pdf F as conditional on all observables
_except_ x
o RooUnitTest, Module.mk
- Regression testing class. Moved from stressRooFit here so that
it can also be used by stressRooStats
Revision
41536 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 21 20:30:29 2011 UTC (3 years, 3 months ago) by
wouter
File length: 9068 byte(s)
Diff to
previous 39919
*** Deployment of vector datastore & miscellaneous speed improvements ***
o RooProduct,RooProdPdf,RooRealSumPdf,RooConstraintSum,RooAddition
- Deploy minimal iterator
o RooDataHist
- Add sumEntries()
o RooDataSet
- In ctor, allow choice of vector and tree data store.
- Change calls to attachToTree() to attachToStore()
- Add sumEntries() forwarding call to stre
o RooVectorDataStore
- New RooAbsDataStore implementation, based on STL vectors
rather than TTrees
o RooAbsReal
- Adjust getVal() so that clean-cache elements are processed more efficiently
- Add attachToVStore()
o RooAbsCollection,RooLinkedList
- Add minimalIterator() returning by valye a minimistic iterator (forward step only)
with a non-virtual step function
o RooAddPdf
- Deploy minimal iterator
- Skip evaluation of supplemental normalization factors if the're all one
o RooAbsData
- Add static member encoding default storage type (vector vs tree)
- Add method convertToVectorStore() to convert datasets with a tree-based store
to a vector-based store
o RooCompositeDataStore
- Implement dummy loadValues() method
o RooRealVar
- Implement attachToVStore()
o RooAbsPdf
- Deploy minimal iterators
- In getVal() also check for negative integrals as problematic value
o RooAbsArg
- Implement default version of isDerived() that always returns kTRUE
- Add pure virtual method attachToVStore()
- Deploy minimal iterators
- Implement attachToStore() which forwards to attachToTree() or attachToVStore()
depending on the storage type
o RooTreeDataStore
- Use setOperMode() with recursion where needed instead of looping manually
over branches
- Implement sumEntries()
o RooNameReg
- Add special fast handling of null pointers for conversions both ways
o RooAbsCategory
- Implement attachToVstore()
o RooRealVar
- Implement isDerived() method that was orignally in RooAbsArg
- Implement attachToVStore() that optionally attaches error buffers too
o LinkDef3, Module.mk
- Add class RooVectorDataStore
o RooAbsString
- Implement dummy attachToStore()
o RooConstVar, RooCategory
- Implement isDerived() that always returns kFALSE
o RooAbsDataStore
- Add pure virtual method sumEntries()
- Add pure virtual method loadValues()
o RooLinkedListIter
- Add class RooMinimalLinkedListIterator for forward-only
iteration without virtual function calls
- Add typedef to RMLLI
- Add non-virtual NextNV() to RooLinkedListIter
Revision
34138 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Jun 25 21:03:15 2010 UTC (4 years, 7 months ago) by
wouter
File length: 8950 byte(s)
Diff to
previous 30333
o RooProdPdf
- Fix a handful of small memory leaks
o RooDataHist
- When importing data from TH1s with non-uniform binning, import by default the density
and not the absolute value.
- Add option to Import() to import absolute value instead of density (useful for histograms
with ratio-based contents such as efficiencies)
o RooAddPdf
- Bug fix in analystical coefficient integration
o RooAbsTestStatistic
- Introduce clearer error message when dataset for simultaneous fit
cannot be split due to absence of index categgory
o RooMCStudy
- Improve info messages
o RooSimWSTool
- Add handling for splits in non-lvalue category functions such as RooMappedCategory
o RooMinuit,RooMinimizer
- Change contour() code so that it restores function parameters at original values at end of call
o RooGlobalFunc
- Add optional boolean argument to Import() to support change in RooDataHist
o RooRandomizeParamMCSModule
- Fix smal memory leak
o RooHistPdf
- Fix bug in (partial) analytical integrals for cases where underlying histogram has non-uniform binning
o LinkDef3
- Add dictionary for RooCacheManager<vector<double> >
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: 8563 byte(s)
Diff to
previous 28259
* 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
26851 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 11 22:18:27 2008 UTC (6 years, 1 month ago) by
wouter
File length: 8641 byte(s)
Diff to
previous 25184
o RooDataHist
- Add method cacheValidEntries() to calculate which bins are valid inside the
RooDataHist after the ranges of the observables have been adjusted
- Implement valid() method which return true if current bin is still inside
the defined range of the observables
- Modify sumEntries() so that only valid bins are included
o RooTreeData,RooAbsData
- Implement method valid() which returns true by default
o RooAbsOptTestStatistic
- Fix typo in print message
- Trigger calculation of valid bins in binned datasets after range
adjustments have been made
o RooNLLVar,RooChi2Var
- Only process valid bins of binned datasets
o RooFFTConvPdf
- Fix bug in cache construction: do not redirect servers of internal function
clones to global parameters that are also non-convolution observables
in the cache histogram
o RooAbsReal
- Print proper error message if a RooAbsReal is attached to a tree branch
that represents an array
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: 8469 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: 7487 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: 7394 byte(s)
Diff to
previous 24119
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
24119 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by
wouter
File length: 6824 byte(s)
Diff to
previous 23538
o RooAbsSelfCachedPdf
- Follow changes in RooAbsCachedPdf
o RooCachedPdf
- Add option to override default choice of cache observables
(the normalization observables) with a specific set of variables
to make it possible to also cache p.d.f values for all values
of given parameters as well.
- Forward analytical integration capabilities to actual cache p.d.f
- Forward calls on preferred observable order to cached p.d.f
o RooDataHist
- Add option to bin dataset in alternate binning configuration, as
specified by binning name in constructor.
- Add feature to weight() function to enforce special boundaries
when interpolating a histogram representing a cumulative distribution function.
If so, lower-side bounds are forced to zero and upper-side bounds are
forced to 1.0 instead of the default mirroring strategy
o RooMsgService
- Add new topic NumericIntegration
- Show PROGRESS level messages by default
o RooAbsSelfCachedReal
- New base class for self-caching RooAbsReal objects analoguous
to RooAbsSelfCachedPdf
o RooCachedReal
- New class to cache arbitrary RooAbsReal function objects,
analogous to RooAbsCachedPdf
o RooRealBinding
- Add feature to save and restore values of input variables,
used by RooRealIntegral to restore observable values after numeric
integration to original values.
o RooLinearMorph
- New operator p.d.f class implementing using the algorithm described
by Alex Read in NUM A 425 (1999) 357-369 'Linear interpolation of histograms'.
This class implements a generalization for continuous p.d.f
o RooAbsRealLValue
- Following changes in RooAbsLValue
o RooHistFunc
- Real-valued function modeled by external RooDataHist object, analoguous to RooHistPdf,
but without normalization support and allowing negative histogram values
o RooAbsCachedReal
- New abstract base class for caching functions, analoguous to RooAbsCachedPdf.
o RooFracRemainder
- New dedicated helper class to calculate the remainder fraction of a RooAddPdf, i.e. 1-sum(i)x_i
for a given RooArgSet x
o RooCustomizer
- Fix memory management issue for sterile use
o RooAbsCategoryLValue
- Follow changes in RooAbsLValue
o RooNumCdf
- Specialization of RooNumRunningInt to calculate running integrals of p.d.f.s:
the running integral is by construction normalized to one exactly, taking out
any possible imprecisions in the regular integral calculation and by imposing
special constraints on the RooHistFunc that models the output so that the boundaries
are constrained to exactly 0 and 1 when interpolation is used.
o RooFFTConv
- Fix bug in cache naming algorithm
- Follow changes in RooAbsCachedPdf
o RooChangeTracker
- New special purpose object that tracks changes in a given set of variables, used
to determine if cached p.d.fs in RooAbsCachedPdf and RooAbsCachedReal need to
be recalculated due to parameter changes. In addition to valueDirty tracking,
an explicit comparison can be made to stored reference values of variables,
to avoid recalculation of expensive quantities in case a valueDirty is propagated
even if the value did not change (this can e.g. happen when you step though
a RooDataHist where usually only one of the observables changes value, but
all observables propagate a valueDirty every time)
o RooHist
- Bug fix in makeResidual()
o RooAbsReal
- Fix small memory leak in createIntegral
- Expand functionality of fillDataHist: optional correction for binVolume
when filling, and optional progress indication.
- Modify logEvalError() so that when cumulative logging for Minuit is disabled
that messages are printed through the standard message logging service.
- Modify error logging so that name of objects are stored in addition to
pointers so that delayed logging of errors of (cache) objects that no
longer exists can be performed correctly.
- Add virtual function preferredObservableScanOrder() to indicate preferred
order in which multi-dimensional functions should be scanned into a
RooHistPdf, which may matter greatly for the performance of certain
p.d.f.s like RooFFTConvPdf and RooLinearMorph
- Add new function createRunningIntegral() which constructs for a given F(x,y)
a Int[xlo,x] F(x',y) dx. The default strategy is to construct the underlying
integral with createIntegral() and adapt it with a RooCustomizer and a RooParamBinning
to a running integral. In case it concerns a one-dimensional numeric running
integral, the running integral is represented by a dedicated class RooNumRunningInt
which scans the integrand and numerically integrates the scanned histogram
o RooAbsCollection
- Bug fix in nameFieldLength handling of print routine
o RooAbsCachedPdf
- Introduce explicitly the strategy that the cache contains the _normalized_ p.d.f. values,
so that no postior normalization integral is required. This has the added advantages that
the cache p.d.f can be instructed to consider itself normalized skipping an explicit
normalization step in the RooHistPdf.
- Add utility function getCachePdf() and getCacheHist() to retrieve cache p.d.f and histogram
for a given choice of normalization set
- Clean up structure of CacheElem nested class by making guts private and providing accessor
function for derived CacheElem classes. Virtualize cache creation with a new member function
createCache that will allow derived classes to create a derived CacheElem.
- Forward integration handling to cache pdf actually being used
o RooDataHistSliceIter
- Follow changes in RooDataHist for alternate binning
o RooRealMPFE
- Follow changes in eval error logging in RooAbsReal
o RooAbsPdf
- Add createCdf() function to create cumulative distribution functions from p.d.f.s. This is
quite similar to RooAbsReal::createRunningIntegral() but with some c.d.f specific features
related to constraints on normalization
o RooAbsArg
- Fix bug in optimizeCacheMode()
o RooBrentRootFinder
- Improve error messaging through RooMsgService interface.
o RooCmdArg
- Expand payload from 2 to 3 strings
o RooSimWSTool
- Complete rewrite of RooSimPdfBuilder integrated with RooWorkspace for object storage.
o RooNumRunningInt
- New dedicated class to calculate running integral of any function that does not have
an analytical integral implementation. This class scans such a function in a histogram
and then numerically integrates the histogram. The filling of the histogram is performed
adaptively using a recursion division strategy with a precision cutoff to save time
of the filling of smooth functions in finely binned histograms
o RooMultiCategory, RooSuperCategory
- Minor tweak in name of proxies
o RooAbsIntegrator
- Deploy save and restore functionality of RooAbsFunc/RooRealBinding to restore observable
values to prior values after an intergration step.
o RooMinuit
- Fix gcc 4.3 compiler warning
o RooWorkspace
- Add bulk import() function taking a const RooArgSet instead of a RooAbsArg
- Add RecycleConflictNodes() option to ignore conflicts and simply recycle internal
nodes when a different external node is encountered.
- Add new accessors catfunc() for category functions, arg() for generic RooAbsArgs,
and funcArg() for fundamental arguments of any type.
- Add separate section for category functions in Print()
o RooHistPdf
- Add option to declare contents unit normalized. When activated, the analytical
integral is hardwired to 1.
- Add option to propagate cdfBoundaries mode to the underlying RooDataHist.
o RooAbsOptTestStatistic
- Optimize handling of empty rangeName specification (from Alfio)
o RooSimultaneous
- Tune proxy names
- Make p.d.f return zero, in case index category is in state where no p.d.f is assigned,
rather that assert(0)
o LinkDef3.h, Module.mk
- Add new class definitions
Revision
23538 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 24 21:02:00 2008 UTC (6 years, 9 months ago) by
wouter
File length: 6470 byte(s)
Diff to
previous 23134
Import changes from development branch
==== Date: Wed Feb 20 22:33:28 2008 =====
o RooRealSumPdf
- Do _not_ use normalization of RooAbsPdf input components
in numerator of RooRealSumPdf expression since it is
already explicitly occurring in denominator of RooRealSumPdf.
(Fixes wrong normalization reported by Tristan)
o RooObjCacheManager
- Register owner of cache with each cache elememt to
facilitate callbacks
o RooAbsCacheElement
- Add storage for pointer to owner of cache and
supply setOwner() function
o RooAbsPdf
- Use RooObjCacheManager callback mechanism to zero
'last used normalization' pointer in RooAbsPdf
when the cache-owned object pointed is about
to be deleted.
o RooAbsArg
- Make crc32 function static
o RooWorkspace
- Add CodeRepo nested class that allows to store C++ code
of RooAbsArg derived classes that are not in ROOT distribution
but are contained in workspace. When reading any missing
class, code is compiled on the fly allowing for transparent
reading of workspace object from file. Code is found in
location pointed to from TClass objects. Additional search
path for declaration and implementation files can be provided
to be able to handle non-trivial cases.
- Add WSDir nested class that represents information contained
in workspace as read-only TDirectory for easy interactive use.
Directory representation is created using makeDir() member function.
o LinkDef3
- Add nested classes in RooWorkspace
===== Date: Wed Mar 26 23:04:26 2008 =====
o RooProdPdf
- Fix typo in ctor documentaion
- Improve error message in expectedEvents() when no extendable p.d.f.s are found
- Implement getConstraints() function to retrieve constraint p.d.f terms from product
expression given set of observables and set of parameters to be constrained.
o RooMsgService
- Add PROGRESS message level between INFO and WARNING
- Add globalKill level for messages to be able to quickly eliminate all messages below
a given level without interfering with the stream structore of RooMsgService
o RooPrintable
- Implement new printing interface with more details control over items printed trhough contents enum
(multiple ORable options) and style of printing (inline, single line, (verbose) multiline) with style
enum (exclusive options).
- Introduce generic virtual functions for printing of name,title,value,arguments,
and extras of each object.
- Each class can overload the default contents used for all printing
uses (inline,verbose,standard) etc as well as the default printing style invoked by Print()
o RooPlot,RooGenContext, RooAbsRealLValue,RooDataSet,RooNameSet,RooCustomizer, RooAbsGenContext, RooAddModel,
RooFitResult,RooCurve,RooAbsAnaConv,RooHist,RooAbsReal,RooAbsCollection,RooAddPdf,RooTable,RooAbsData,
RooMappedCategory,RooFormula,RooFormulaVar,RooCatType,RooRealVar,RooAbsArg,RooAbsPdf,RooPlotable,RooRealIntegral,
RooAbsBinning,Roo1DTable,RooAddGenContext,RooGenericPdf,RooResolutionMode,RooAbsHiddenReal,RooMultiCategory,
RooAbsString,RooSetProxy,RooProdGenContext,RooConvGenContext,RooGenCategory,RooGrid,RooSimGenContext,
RooThresholdCategory,RooAcceptReject,RooSuperCategory,RooEllipse,RooNumIntConfig,RooAbsCategory,RooListProxy,
RooLinearVar,RooTreeData,RooTreeData
- Update to new RooPrintable interface
o RooGenContext,RooAbsGenContext,RooAddGenContext,RooProdGenContext,RooConvGenContext,RooSimGenContext
- Implement attach() function to simplify management of changing parameters during lifetime of context
o RooAbsRealLValue
- Eliminate inFitRange() warning message as it is gives too many false warnings when used with
parameterized ranges
o RooCustomizer
- Make owning of contents optional to simplify release of created components
o RooAbsReal
- Implement new evaluation error logging mechanism. Rather than passing zero p.d.f values, push error message with
details on a static stack (if logging is enabled by e.g. RooMinuit).
- Augment functionality of createIntegral: explicitly allow integration over ranges with bounds parameterized in
in terms of other integrated observables. Integrals of this type are automatically recognized and cast
as recursive integrals in case of >1-D integrals to integrate over requested phase space.
- Add createIntObj() helper function for above functionaliy.
- Eliminate a lot of commented out debug code from createPlotProjection()
- Modify fillHistogram(): when plot observables are cloned, explicitly interconnect clones again to facilitate
proper plotting of N-D integrals with entangled parameterized ranges
- Add ScaleFactor() argument to fillHistogram to control use of histogram density correction scale factor in Z-scale
of filled histogram
o RooProduction
- Fix bug for persistence
o RooRealMPFE
- Extend client/server protocol with message to retrieve RooAbsReal evaluation error log from server side and
merge with error log on client side
o RooRealVar
- Introduced concept of non-shared alternative binnings(ranges) required to accommodate RooParamBinning ranges
that cannot be shared across instances because of their client/server connection to other objects in p.d.f
expression trees. Modify setBinning to automatically recognize non-shareable binnings and divert those to
non-shared alternative binning container.
- Add setRange([const char*,] RooAbsReal&,RooAbsReal&) methods to simplify creation of parameterized ranges.
o RooAbsArg
- Introduce concept of owned components with addOwnedComponents() interface to be able to make any RooAbsArg
object own any number of others. This can be used to simplify the memory management of object trees
- Introduce prohibitServerRedirect mode that will trigger fatal assert if any server redirect is attempted
to thus configured object. Useful as debugging tool to track faulty copy constructors that leave clone
object tree unintentionally connected to the original object tree.
- Migrate fixed--name-field management tool from RooAbsReal to RooAbsArg. Used to accomplish regular
formatting in RooAbsCollection::printStream.
- Add concept of transient boolean attributes that are not tranferred on copy construction. Mostly useful
for debugging.
- Extend leafNodeServerList and treeNodeServerList to distinguish to types of leaf-nodes: strict leaf modes
in the sense of the client-server tree structure and 'physical' leaf nodes that do not recurse into
nodes that have isDerived()==kFalse. The latter corresponds to the original concept of leaf nodes / variables,
which the former mode, a new addition, explicitly exposes any shape servers contained in parameterized
ranges of variables.
- Fix logic error in recursiveServerRedirect: do not recurse into nodes that are in the replacement list themselves.
- Fix bug in printCompactTree(): value/shape clients were not always properly indicated.
- Add getAllConstraints() method that finds all RooProdPdfs in expression trees and harvest constraints from all
of these from the getConstraint() method
o RooAbsPdf
- Implement new evaluation error logging mechanism for negative p.d.f values and zero normalization integrals
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to fitTo() method.
The Constrain() method retrieves any constraints p.d.f. on parameters multiplied in any RooProdPdf in the normal
p.d.f expression and adds those to the likelihood that is minimized. Only constraints on the listed parameters
will be picked up. Multiple constraints per parameter may exist. The ExternalConstrains() argument implements
similar functionality except that provided external constraint p.d.f.s are added rather than internal constraints.
- Fix potentially fatal bug in print statement in getContext()
- Add new method createCdf() to create a cumulative distribution function from given p.d.f. Given a set of observables x,
the returned c.d.f is implemented in terms of a RooRealIntegral of p.d.f(x') over a parameterized range from [ 0 - x ].
o Roo1DIntegrator
- Improve error message
o RooRealIntegral
- Fix bug in calculation of shape dependencies on observables.
- Add handling of dependencies of integral value on values of objects representing parameterized ranges of
integrated observables.
o RooMCStudy
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to constructor.
In addition to passing these arguments to the fitTo() call of the fit stage, modify event generation as
follows: instead of sampling events from 'static' generator p.d.f, sample value of constrained parameters
from joint constraints p.d.f and sample observables at those parameter settings. Save the generator parameters
for each toy as these change per toy. Change the pull calculation such that it uses the per-event truth values
rather than the per-study truth value if constraints are used.
o RooAddition
- Fix bug in evaluate() related to persistence
o RooMinuit
- Enable/disable new evaluation error logging mechanism prior to and just after each MINUIT call.
- Print logged error messages, if any, in glue function
o RooProjectedPdf
- Fix important bug: normalization set should always include integration set for each configuration
o RooGlobalFunc
- Add definition of Scaling(),Constrain() and ExternalConstraints() helper functions
o RooUniformBinning
- Remove dedicated print function as it output is identical to that of the generic print function in RooAbsBinningx
o RooAbsBinning
- Add virtual methods isParameterized(),lowBound() and highBound() to be to detect and analyze parameterized binnings
through abstract interface
- Add isShareable() method to be able to separate shareable and non-shareable binnings in RooRealVar.
- Add insertHook() and removeHook() function to allow connection of possible proxies present in binning to
owning RooAbsArg.
o RooWorkspace
- Improve code import facility by introducing a class->file mapping step in the CodeStore to correctly handle cases where
multiple classes are defined in a single file.
- Add check that TClass interface actually yields file names.
- Only require default constructor to be present for non-abstract classes. It should be there for abstract classes as
well but current TClass::HasDefaultConstructor() method will not tell us.
o RooTreeData
- Improve renameVariable() method to not only rename the RooAbsArg branch buffer but also any TTree branches involved as well.
While the tree branch names are generally invisible to the user, having branch names that are different from branch buffer names
may cause branch naming conflicts in merge() that are not detectable as branch buffer naming conflicts.
o RooParamBinning
- New class implementing binning with low and high points defined by external RooAbsReal objects
o RooConstrainSum
- Helper class for RooAbsPdf to represent likelihood of collection of constraint p.d.f.s.
==== Date: Fri Mar 28 10:04:57 2008 =====
o RooRecursiveFraction
- Helper function for RooAddPdf that calculates recursive fraction
f1*(1-f2)*(1-f3) from a given set of plain fractions
o RooAddPdf
- Add flag to ctor to optionally interpret fractions as recursive fractions.
If activated it constructs the recursive fractions using RooRecursiveFraction
from the original fractions
o LinkDef3.h, Module.mk
- Add new class RooRecursiveFraction
==== Date: Tue Apr 1 22:42:19 2008 ====
o RooDataWeightedAverage
- New implementation of RooAbsOptTestStatistics that calculates data weighted
average of any RooAbsReal. This class serves as successor of RooDataProjBinding
that no longer complies with new optimization scheme.
o RooRealBinding
- Implement name() function for more useful error messaging in integration
o RooChi2Var,RooNLLVar
- Follow changes in base class
o RooAbsReal
- In plotOn() support binning flag in ProjWData(). Reimplement data-weighted projections
using new RooDataWeightedAverage class instead of RooDataProjBinding which does not
work with new generic function optimization scheme.
- Add support for NumCPU() argument
in plotOn() to facilitate multi-processor calculation of projections. Extend NumCPU()
argument to pass interleaving option in MP splitting mode of RooAbsTestStatistic
- Move fixAddCoefNormalization() and fixAddCoefRange() from RooAbsPdf to RooAbsReal
o RooAbsTestStatistic
- Generalize functionality: allow RooAbsReals as input arguments instead of RooAbsPdfs only.
Also add virtual globalNormalization() function that allows to apply a global normalization
term after combinedValue() operation to facilitate functionality of RooDataWeightedAverage.
- Add option to split data in multiprocessor mode in interleave mode instead of in bulk mode.
Interleave mode is useful for parallel processing of histogram data where bulk partitions
may not contain equal amount of non-zero data points leading to non-optimal load balancing
between processes.
o RooAbsPdf
- Move fixAddCoefRange() and fixAddCoefNormalization to RooAbsReal to support operation of
new generalized RooAbsTestStatistic
o RooIntegrator1D
- Use name() of RooAbsFunc() to clarify warning and error messages.
o RooRealIntegral
- Rename _operMode to _intOperMode to avoid shadowing of equally named data member in RooAbsArg
- Fix bug in recursive printing
o RooSetProxy
- Fix bug in print()
o RooGlobalFunc
- Modify ProjWData() and NumCPU() helper functions with extra optional argument
o RooAbsOptTestStatistic
- Follow changes in RooAbsTestStatistic
o RooAbsFunc
- Add virtual name() function to facilitate better error and warning messages from integrators
=== Date: Tue Apr 15 17:57:32 2008 ===
o RooMsgService
- Add option to prefix streamed messages with process ID to simplify
debugging of parallel fits
o RooAbsProxy
- Add optional addContents flag to print()
o RooArgProxy, RooSetProxy, RooListProxy
- Implement addContents flag in print()
o RooAbsReal
- Reimplement stack of logged error messages in terms of custom EvalError class.
A separate list<EvalError> is now kept for each object that reports an error.
In addition to the given error message a record is constructed of the proxy
values at the time of reporting.
- In printEvalErrors() add option to restrict number of reported items per node.
If number is zero, only number of errors per node is shown (without details)
o RooRealMPFE
- Adjust ReportErrors message to changes EvalError implementation in RooAbsReal.
- Make sure to synchronize remote error logging state with state of parent process
before each evaluate()
o RooRealVar
- Move printing of error from printValue() to printExtras()
o RooNLLVar
- Fix bug in setting of interleave parameter of base class in certain ctors
o RooAbsPdf
- Improve passing of eval error messsages by make separate messages for NaN
and negative values and including details in the error message
- Add PrintEvalError(Int_t nErr) option to fitTo() to control new eval error
message control system
- Int printValue show both value (raw from evaluate()) as well as most recently
used normalization value (if available)
o RooMinuit
- Interface new eval error logging control by adding setPrintEvalErrors(Int_t numEvalErrors)
=== Date: Thu Apr 24 15:11:59 2008 ===
o Various classes
- Fix all -Wshadow compiler warnings
=== Date: Thu Apr 24 16:32:21 2008 ===
o RooMsgService
- Use TSystem::GetPid() rather than getpid() for portability
o RooAbsReal
- Make nested class EvalError public
o RooWorkspace
- Fix windows compiler warning
========================================
o RooBanner
- Increment version tag to 2.40
Revision
21379 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Dec 14 15:12:29 2007 UTC (7 years, 1 month ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6476 byte(s)
Diff to
previous 21257
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
21212 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Dec 5 16:16:45 2007 UTC (7 years, 1 month ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6468 byte(s)
Diff to
previous 20879
o RooDataHist, RooDataSet, RooFitResult
- Overload SetName() and SetNameTitle() to remove
and append from associated directory
(Savannah bug #28906)
o RooPlot
- Fix handling of SetName(), SetNameTitle()
as done above
- Make sure that RooPlot is attached to gDirectory
and internal TH1 is not
- Make sure that name changes apply to RooPlot and
not to TH1 (Savannah #31371)
o RooAbsTestStatistic, RooAbsOptTestStatistic
- Fix bug in default value of _splitRange that is propagated
to client calculators in Simultaneous + MultiProcessor mode
(Savannah #31632)
o RooRealSumPdf
- Fix bug in default ctor to allow persistence
Revision
20161 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by
wouter
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6373 byte(s)
Diff to
previous 18735
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
13547 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 8 15:26:16 2005 UTC (9 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6017 byte(s)
Diff to
previous 13546
o RooAbsData
- Extend interface of emptyClone() with optional argument
specifying the subset of observables to clone
o RooDataHist, RooDataSet
- Implement interface change in emptyClone()
o RooTreeData
- In split() do not include split category (components)
in output datasets as it may result in unacceptable
memory consumption for binned datasets
o RooProdPdf
- Fix bug in handling of ranges for certain type of conditional product
Revision
13546 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Dec 8 13:19:58 2005 UTC (9 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 5982 byte(s)
Diff to
previous 13490
o RooCategorySharedProperties
- Shared properties implementation for RooCategory. Contains
definition of named ranges.
o RooCategory
- Move towards shared properties implementation of named ranges
o Roo1DTable RooAbsArg RooAbsCategory
RooAbsCollection RooAbsString RooArgList
RooArgSet RooCategory RooCategory
RooCategoryProxy RooConvCoefVar RooConvGenContext
RooCustomizer RooDataHist RooErrorVar
RooFitResult RooGenCategory RooGenCategory
RooGraphEdge RooGraphNode RooGraphNode RooHtml
RooImproperIntegrator1D RooMultiCategory RooNameSet
RooNumIntConfig RooNumIntFactory RooSuperCategory
RooSuperCategory RooTable RooThreshEntry
- Replace many ROOT header includes by forward declarations
Revision
13490 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Dec 5 14:58:16 2005 UTC (9 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 5987 byte(s)
Diff to
previous 12082
o RooConvGenContext
- Remove forgotten debug print statement
o RooDataHist
- Initialize _realIter to zero in default ctor so that object don't crash in dtor
(Bug report by Chris Roat)
o RooFitResult
- Do not call appendToDir() in 1st constructor when invoked as default ctor
(name=0,title=0) to avoid ROOT memory management problems
o RooSimPdfBuilder
- Allocate config string memory buffer dynamically to avoid memory overruns
for very complex builds
o RooStreamParser
- Fix processing of skipped lines to also skip the continuation lines if the skipped
line was folded over multiple file lines
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/inc/RooDataHist.h
File length: 5987 byte(s)
Diff to
previous 11411
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
11172 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 23 15:10:06 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 5957 byte(s)
Diff to
previous 11136
o All classes
- Migrate RooAbsArg::getDependents(),dependentOverlaps(),checkDependents(),recursiveCheckDependents() to
getObservables(),observableOverlaps(),checkObservables(),recursiveCheckObservables()
o RooAbsAnaConv
- Copy _convVar in copy ctor so that isDirectGenSafe() also works for copy constructed instances.
Use _isCopy instead of _convVar in declareBasis() to distinguish between original and copy constructed objects
o RooAbsArg
- Migrate RooAbsArg::getDependents(),dependentOverlaps(),checkDependents(),recursiveCheckDependents() to
getObservables(),observableOverlaps(),checkObservables(),recursiveCheckObservables(). Add old names
as forwarding functions to new names for backward compatibility
- Move cleanBranchName() and crc32() here from RooAbsReal
o RooAbsCollection
- Implement new InLine printing options as OneLine option without the newline at the end
- Upgrade printLatex() function to also take new Format() arguments with sub arguments
- Add Bool_t allInRange(const char* range) function that reports if all contained arguments
have values within the specified range
o RooAbsData
- Add plotOn() function that takes a RooLinkedList of RooCmdArgs
- Extend Double_t sumEntries() to take a cutSpec and a rangeSpec argument. If supplied
only the combined weight of entries meeting those criteria will be reported.
o RooAbsGoodnessOfFit
- Add verbose flag to constructor and make printing of informational messages conditional
to verbose flag being set
o RooAbsOptGoodnessOfFit
- Add verbose flag to constructor and make printing of informational messages conditional
to verbose flag being set
o RooAbsPdf
- Add fitTo() function that takes a RooLinkedList of RooCmdArgs
- Add support for Range(), PrintLevel() arguments in fitTo(). Support fitting composite
ranges by constructing composite NLLs using RooAddition.
- Implement named argument version of generate() supporting arguments ProtoData(), Extended(), Verbose() and NumEvents().
Copy support for protodata randomization for extended poisson over/under sampling from RooMCStudy
- Add named argument version of paramOn() supporting named arguments Label(),Layout(),ShowConstants(),Format(),Parameters().
This version also does not require an input data set to weed out observables: the normalization set from the frame is
used instead.
o RooAbsReal
- Add named argument version of createIntegral() function taking NumIntConfig(),NormSet() and Range() arguments.
Supports composite ranges through multiple Range() arguments
- Move algorithm to automatically generate name of integral in a given configuration to separate function integralNameSuffix()
- In plotOn() retire RangeWithVLine() named argument in favor of a separate VLines() argument.
- Move cleanBranchName(), crc32() functions to RooAbsArg
- Add verbose arguments to findCacheableBranches(),doConstOpt(),optimizeDirty(),findRedundantCacheServers() and findUnusedDataVariables()
and make printing of informational messages conditional on verbose flag being set.
o RooAbsRealLValue
- Add version of frame() accepting a RooLinkedList of RooCmdArgs. Add support for AutoRange(const RooAbsData&) and AutoSymRange(const RooAbsData&)
arguments that automatically calculate range that holds all points in given dataset with a specified margin. The latter function guarantees
a range symmetric around the mean of the distribution, unless domain limits of variable prohibit that.
- Add named argument version of createHistogram() taking Binning(), YVar() and ZVar() arguments where latter two arguments also take
optional Binning arguments
o RooChi2Var, RooNLLVar
- Add support for optional Verbose() argument in named argument constructor and pass flag to RooAbsOptGoodnessOfFit
o RooCmdArg
- Implement and interface linked list of sub-arguments. Add flag that controls if RooCmdConfig directly processes subarguments ot not.
- Implement assignment operator
o RooCmdConfig
- Add defineMutex() functions with 3, 4 arguments to facilitate definitions of many-way mutexes
- Add appendMode boolean to defineString(). If set, multiple instances of given string will be concatenated with
comma separattion, instead of multiple instances superceding each other.
- Add static function decodeStringOnTheFly()
o RooDataHist, RooDataSet
- Implement sumEntries() with cutSpec and rangeSpec arguments
o RooDataSet
- Add binnedClone() function
o RooFormula
- Add ifdef construction so that code compiles both with ROOT3 and with ROOT4
o RooGlobalFunc
- Move all global functions into namespace RooFit
o RooIntegrator1D
- Remove spurious debug print message
o RooMCStudy
- Add named argument constructor accepting arguments FitModel(),ConditionalObservables(),ProtoData(),Verbose(),Extended(),
FitOptions()
- Migrate function randomizeProtoOrder to RooAbsPdf
- Reimplement pull calculations using new class RooPullVar
- Add named argument function plotParamOn(). All named arguments are passed to RooAbsData::plotOn()
- Add named argument functions plotParam(),plotError(),plotPull(),plotNLL() taking arguments FrameRange(),
FrameBins(),Frame() and all arguments taken by RooAbsData::plotOn(). All sub arguments of Frame() are
passed to RooAbsRealLValue::frame(). Function plotNLL() takes additional argument FitGauss() that
adds Gaussian fit to plot. All methods default to AutoRange frames, except for plotPull() which
defaults to AutoSymRange()
o RooMinuit
- Suppress informational messages if printLevel is set to -1
o RooNumIntConfig
- Fix bug in printToStream() method
o RooPrintable
- Add InLine printing level. Implement default InLine method as OneLine method without the terminating newline character.
o RooProdPdf
- Reimplement makeRGGPName in terms of RooAbsReal::integralNameSuffix()
o RooRealIntegral
- Make RooAbsReal::getAnalyticalIntegral() return code supercede any information returned through anaSet to
avoid confusion.
o RooRealVar
- Add version of format() function that parses Format() named argument.
- Add setFitBins() function for backward compatibility.
o RooStreamParser
- Fix bug in putBackToken(): forgot to reinsert space to avoid collation with next token.
o RooTreeData
- Implement plotOn() function taking RooLinkedList of RooCmdArgs. Fix bug in determination
of default bin width if explicit binning is given. Add support for parsing of composite ranges.
- Add optional cutSpec and cutRange arguments to moment(),meanVar() and rmsVar() and rework
implementations to support this feature.
- Add named argument version of statOn() taking arguments Label(),Layout(),Format(),What(),Cut(),CutRange().
- Add getRange() function returning highest and lowest value of given variable in dataset.
o RooAddition
- New Utility class that inherits from RooAbsReal that represents a sum of RooAbsReal objects, or
a sum of products of RooAbsReal objects (when constructed with two RooArgLists). Can optionally
own components and is suitable for use with RooMinuit as it passes the errorLevel() definition
of its components
o RooPullVar
- New utility class that inherits fro RooAbsReal that calculates the pull of one RooRealVar
(with errors) w.r.t. another RooRealVar representing the truth value. If asymmetric errors
are defined in the former RRV those will be used for the pull calculation.
Revision
11136 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 16 21:51:48 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6039 byte(s)
Diff to
previous 11114
o RooAbsData
- Introduce reduce() version with named arguments.
- Supports reduced in number of variables with SelectVars()
- Supports selection of events through cut expression or RooFormulaVar with Cut()
- Supports selection of events through pre-defined cut ranges with CutRange() [NEW]
- Support selection of range of events by sequential number with EventRange() [NEW]
o RooAbsGoodnessOfFit
- Add support for fitting subsets of data/pdf combinations selected through predefined cut ranges
o RooAbsOptGoodnessofFit
- Implement fitting of data/PDF in a subrange as indicated by named ranges in RooRealVar.
Automatically select only those data points that are in the indicated range and adjust
the normalization range of the PDF variables to the selected range for the duration of
the fit. Automatically adjust RooAddPdf fraction parameters so that RooAddPdf shapes
are invariant under the normalization range change
o RooAbsPdf
- Add Named argument version of fitTo() supporting named arguments FitOpts,Verbose,Range,
Optimize,Save,Timer,Blind,Strategy,InitialHesse,Hesse,Minos,Extended,NumCPU and
ProjectedObservables.
- Add fixCoefRangeName() function to fix the interpretation of RooAddPdf coefficients
to a given fixed range for all RooAddPdf (sub) components of this PDF. Analoguous
to fixCoefNormalization()
o RooAbsReal
- Automatically plot only the fitted range of a PDF if the PDF has been fit to a subrange
of the default range and no other plot range was specified
- Eliminate RangeWithVLines named argument and introduce separate VLines named argument.
By default 'wings' are added to each RooCurve unless a Range() command is found
or a fit range is found. In that case RooCurves are not decorated. User can optionally
add vertical lines at begin and end of range by adding VLines() named argument in
combination with Range() argument.
- Implement dummy selectNormalizationRange().
o RooAddPdf
- Implement selectNormalizationRange() to propagate a fixed range for the interpretation
of RooAddPdf coefficients. Analoguous to selectNormalization()
o RooSimultaneous
- Implement selectNormalizationRange() to store fixed range in case RooSimultaneous is later
converted to a RooAddPdf for plotting purposes. Analoguous to selectNormalization()
o RooChi2Var,RooNLLVar
- Add support for fitting Chi2/NLL of subset of data/pdf as indicated by pre-defined range.
o RooCmdConfig
- Make return value of getObject() non-const
o RooDataHist, RooDataSet, RooTreeData
- Add support for reducing a RooDataHist/RooDataHist by pre-defined named ranges and sequential event ranges
o RooAbsRealLValue
- Define new pure virtual function hasBinning()
o RooErrorVar, RooLinearVar,RooRealVar
- Implement new virtual function hasBinning()
o RooGlobalFunc
- Add various new global functions for the support of newly introduced named arguments in
RooAbsPdf::fitTo(), RooAbsData::reduce(), RooAbsReal::plotOn()
Revision
11114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Feb 14 20:44:30 2005 UTC (9 years, 11 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 5916 byte(s)
Diff to
previous 8640
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
8640 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 21 23:14:29 2004 UTC (10 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6652 byte(s)
Diff to
previous 8538
o RooDataHist
- Add calculatePartialBinVolume() to calculate partial
volume of all bins (given a subset of dimensions).
Partial bin volume information is cached across function
calls.
- Modify sum(const RooArgSet& sumSet, const RooArgSet& sliceSet,
Bool_t correctForBinSize) so that the correctForBinSize
argument only applies to the dimensions of bins which are not
summed over.
o RooHistPdf
- Reactive analytical partial summation if no interpolation is used.
Use the newly modified RooDataSet::sum() function with partial bin
volume correction activated
Revision
8524 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 31 01:37:39 2004 UTC (10 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6404 byte(s)
Diff to
previous 6406
o RooDataHist
- Fix broken copyCache() function (broke plotting of RooNLLVar
constructed from binned datasets)
o RooAbsGoodnessOfFit, RooAbsOptGoodnesOfFit
- Add printCompactTreeHook() functions to display cached
pdf configuration in printCompactTree()
o RooRealIntegral
- Update header file (forgotten in last commit)
Revision
6406 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 9 01:33:59 2003 UTC (11 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6383 byte(s)
Diff to
previous 6398
o RooAbsData, RooDataHist, RooDataSet
- add sumEntries() method that returns sum of weights as Double_t
- extend plotOn() methods to take error type as argument
o RooAbsPdf, RooChi2Var, RooNLLVar, RooTreeData
- Replace numEntries(kTRUE) with sumEntries() where appropriate
o RooTreeData
- Add support for DataError() named argument in plotOn() to
optionally override type of errors drawn (Poisson vs SumW2)
- In fillHistogram, accumulate SumW2 errors in output THx
o RooHist
- Add support for custom errors, as set in the TH1 taken as argument
Revision
6398 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 7 21:39:20 2003 UTC (11 years, 9 months ago) by
wverkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 6273 byte(s)
Diff to
previous 6391
o RooDataHist
- Add sum of weight field in internal bookkeeping
for the purpose of weighted chi^2 fits
- Import sumw2 from THx in ctor
- Extend weightError() function to return either Poisson
or SumW2 error
o RooChi2Var
- Add new ctor with named argument interface
- Add ctor option to select either Poisson or SumW2 errors
for chi^2 calculation
o RooCmdConfig
- add static decodeXXXOnTheFly methods to parse named argument
fields in a single function call to be able to initialize
a base class ctor with named arguments
o LinkDef
- Add Extended(),DataError() and NumCPU() named argument
creator functions
Revision
5317 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 17 06:39:35 2002 UTC (12 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 5963 byte(s)
Diff to
previous 5212
o RooAbsPdf, RooAbsReal, RooDataHist, RooTreeData
- Changed protected plotOn() to accept RooLinkedList instead of TList
o RooCmdConfig
- Change process(),stripCmdList to use RooLinkedList instead of TList
o RooFormula
- Changes all internal lists to RooLinkedList (was TList, TObjArray)
o RooHashTable, RooLinkedList, RooLinkedListElem, RooLinkedListIter
- Change interface from RooAbsArg to TObject
o RooHtml
- Update copyright, web address etc
o RooRefCountList
- Inherit from RooLinkedList instead of THashList
o RooSimultaneous
- Fix handling of RooCmdArgLists & change protected plotOn() interface from
TList to RooLinkedList
o RooTrace
- Fix include files
o makedocs
- Set default to production color scheme
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/inc/RooDataHist.h
File length: 5321 byte(s)
Diff to
previous 5174
>>> 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
5174 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 4764 byte(s)
Diff to
previous 4754
Major new version (to become V00-01-00)
o README
- Update standalone compilation instructions
Refer BaBar users to RooFitBabar/README
o RooAICRegistry
- Fix memory leak
o RooAbsArg
- Add default implementation of constOptimize() that
forwards the call to all servers
- Add RooAbsOptGoodnessOfFit, RooRealMPFE as friends
- Add protected pure virtual method setTreeBranchStatus()
that can be used by the optimizer to disable reading
of the tree branch associated with the RooAbsArg
o RooAbsBinning
- Add description
o RooAbsCategory
- Add operator==()
- Implement setTreeBranchStatus()
o RooAbsCollection
- Add addClone(RooAbsCollection&,...) to add a list of clones
o RooAbsData
- Add pure virtual methods for new caching mechanism:
* cacheClone() returns a clone of the dataset with cache
* resetCache() clears the existing cache
* setArgStatus() disables reading of given args from tree
o New class RooAbsGoodnessOfFit
- Abstract base class for goodness-of-fit variables.
A goodness-of-fit is any quantity calculated from a PDF
and a dataset. This class orgamizes parallelization over multiple
CPUs and calculation of GOFs from simulatenous PDFs.
o New class RooAbsOptGoodnessOfFit
- Abstract base class for goodness-of-fit variables
that calculate the PDF value at each data point in the
given dataset. It implements various optimizations:
caching of constant terms, elimination of unused variables etc.
o RooAbsPdf
- Deploy new normalization integral manager RooNormManager
to cache multiple normalization integrals for a PDF.
This greatly increases the efficiency for certain situations
where PDFs are alternatingly called with 2 or more different
normalization choices
- Reimplement fitTo() in terms of RooNLLVar and RooMinuit.
- Reimplement plotNLLOn() in terms of RooNLLVar and plotOn()
- Migrate plotNLLContours to RooMinuit
- Remove obsolete method fitContext
o RooAbsReal
- Add operator==()
- Implement setTreeBranchStatus()
- Fix memory leak in createProjection()
o RooAbsString
- Implement setTreeBranchStatus()
o RooAddModel
- Eliminate getNormSpecial() construction that was originally
introduced to efficiently handle calls with 2 alternating
projection/normalization configurations originating from
RooConvolutedPdf. This is now handled by RooNormManager.
o RooAddPdf
- Reimplement caching of coefficient projection list and
supplemental normalization list using RooNormListManager.
(Also supports caching of multiple configurations now)
o RooArgSet
- Implement addClone(RooAbsCollection&,...)
o RooBanner
- Add description
o RooBinning
- Add description
o New class RooChi2Var
- Implementation of simple Chi^2 of RooAbsOptGoodnessOfFit
for a RooDataHist and a RooAbsPdf.
Chi^2 is calculated from PDF value at the bin center.
Poisson errors are used if no user defined errors are present
o RooConvolutedPdf
- Reimplement normalization integral management using
RooNormListManager
- Deprecate use of RooResolutionModel::getNormSpecial. No longer needed.
o RooCustomizer
- Fix memory leak
o RooDataHist
- Add lo/hi Error associated with each bin. Default implementation
returns poisson errors. Error is return by weightError().
- New set() function allows user to override poisson errors
o RooDataSet
- Fix copy ctor for weighted datasets
- Implement cacheClone()
o RooDirItem
- Add description
o RooDouble
- Add description
o RooExtendPdf
- Follow changes in normalization management of RooAbsPdf
o Removed class RooFitContext
- Replaced by RooMinuit/RooNLLVar
o RooFitResult
- Change terminology NLL -> FCN (fits are no longer NLL necessarily)
- Store and report accuracy code of minuit error matrix
- Minor tweaking of parameter dumps with mixed symmetric/asymmetric
errors
o RooGenericPdf
- Follow changes in RooAbsPdf normalization management
o RooIntegratorConfig
- Add description
o RooLinTransBinning
- Add description
o RooLinkedListElem
- Add description
o RooLinkedListIter
- Add description
o New class RooMPSentinel
- New class to keep track of server processes started for
parallelized goodness-of-fit calculations. On linux
hosts, these processes don't exit when the parent process
exits. This class sends termination signals when this
singleton class is deleted
o RooMath
- Activate CERF disk caching by default
o New class RooMinuit
- New seamless interface between RooFit objects and MINUIT
Class propagates information forth and back between RooAbsArg
objects and minuits internal memory buffer (e.g. parameter
values, errors, step sizes, constant status)
- This class minimizes any RooAbsReal function (doesn't need to
be a NLL or Chi2)
o Removed class RooNLLBinding
- Obsolete after introduction of RooNLLVar
o New class RooNLLVar
- Implementation for NLL of RooAbsOptGoodnessOfFit
o RooNameSet
- Fix memory leak
o New class RooNormManager
- New manager class for normalization/projection integrals for PDFs
This class matches RooArgSet pointer pairs to the integration
and normalization sets to previously registered integrals.
Multiple pointer pairs can point to the same integral (e.g.
pointer to different RooArgSets with the same contents) and
multiple integrals can be cached. This class doesn't create
the normalization integrals. It merely indicates if it has
one or not, and leaves it up to the owning class to create
and register new normalizations
o New class RooNormListManager
- Similar to RooNormManager, except that RooArgLists of normalization
integrals are caches instead of single integrals
o RooNormSetCache
- Rework functionality. This class, used by RooNorm(List)Manager
manages multiple redundant RooArgSet pointer pairs that represent
the same projection/normalization configuration
o RooProdPdf
- Almost complete rewrite in terms of RooNormListManager
o RooRealConstant
- Minor const changes
o RooRealIntegral
- Streamline iterator use: Create various interator in ctor
and reuse them in evaluate() instead of creating and deleting
them on the fly
o New class RooRealMPFE
- Front end for MultiProcessor calculations. Class RooRealMPFE
takes a RooAbsReal as argument and calculates it in separate
process. Calculations can be started asynchronously with
the calculate() call. The rest of the interface (and behaviour)
is identical to that of the original RooAbsReal.
o RooResolutionModel
- Deprecate getNormSpecial - superceded by RooNormManager
o RooSetProxy
- Implement addClone(const RooAbsCollection&,...)
o Removed class RooSimFitContext
- Obsolete - replaced by RooMinuit/RooNLLVar
o RooSimGenContext
- Fix memory leak
o RooSimultaneous
- remove obsolete fitContext() method
o RooTreeData
- Reimplement caching. Cached functions are now stored in
a separate tree in the dataset. Main benefit of the new
implementation is that caches can efficiently be reset
and refilled on the fly
o makedocs
- Add stanzas for new tutorial macros
Revision
4355 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 12 19:06:22 2002 UTC (12 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3860 byte(s)
Diff to
previous 4152
o RooAbsData
- Add virtual member isWeighted()
o RooTreeData
- Modify printToStream to print out both weighted and unweighted
number of events if dataset is weighted
o RooDataSet
- Overload numEntries() to return the sum of the weights if
the dataset is weighted and the argument is kTRUE
- Overload isWeighted()
o RooDataSet
- Overload isWeighted()
Revision
4147 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 7 06:22:24 2002 UTC (12 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3677 byte(s)
Diff to
previous 4044
Non-uniform binning retrofitting
---------------------------------
o RooAbsArg, RooAbsCategory, RooAbsCategoryLValue,
RooAbsReal, RooAbsRealLValue
- Remove references to bin iterators
o RooAbsBinIter,RooRealFixedBinIter,RooCatBinIter
- Remove (now obsolete)
o RooAbsBinning
- New abstract base class for binning specifications.
o RooAbsData
- Modify plotOn() method to take optional RooAbsBinning
pointer
o RooAbsLValue
- Change getFitBinWidth to take bin number to accomodate
non-uniform bin widths
o RooAbsRealLValue
- Remove all fitBinXXX methods()
- Add createHistogram methods that take (arrays of) RooAbsBinning
objects as binning specifiers
- Add getBinning() method that exports the current binning object
- Re-implement getFitMin/Max/Bins using the binning object
o RooAbsString
- Remove obsolete plotBin methods
o RooBinning
- Implementation of RooAbsBinning with arbitrary binning.
Add new boundaries with addBoundary() or addBoundaryPair()
methods
o RooDataHist
- Precalculate bin volume per bin, instead of as a single variable
to reflect the effects of non-uniform binning
- Upgrade ctor from TH1 to allow import of non-uniformly binned
THx objects
- Add correctForBinsSize option to weight(<coord>) function.
- Upgrade weight interpolation functions to handle non-uniform
grids
- Add new binVolume() member function to export the current bins
volume (works like weight())
o RooDouble
- Auxiliary class for RooBinning that inherits from TObject,
is sortable and stores a Double_t as value
o RooErrorVar
- Reimplement fit limits and binning in terms of a RooAbsBinning object
o RooHist
- Bug fix in addPoint : forgot to multiply y value with
bin width correction factor
o RooHistPdf
- Change to use RooDataHists new weight function that applies
bin volume correction internally instead of in RooHistPdfs
analyticalIntegral. (Necessary when bin volume is not uniform)
o RooLinTransBinning
- Implementation of RooAbsBinning that present a linear transformation
of another RooAbsBinning
o RooLinearVar
- Reimplement fit limits and binning in terms of a
RooLinTransBinning object
o RooMath
- Add interpolation routine that points that are not
uniformly distributed
o RooPlot
- Add bin width correction factor to number of events
in updateFitRangeNorm() to account for the difference
in the nominal bin width and the average bin width
of the histogram
o RooRealVar
- Reimplement fit limits and binning in terms of a RooAbsBinning
object
- Add setBinning() method to change the current binning
o RooTreeData
- Modify plotOn() methods to take an optional RooAbsBinning
object that specifies the desired binning.
o RooUniformBinning
- Implementation of RooAbsBinning that efficiently represents
a uniform binning
RooSimPdfBuilder upgrade
------------------------
o RooCustomizer
- Allow splitting of branch nodes in addition to leaf nodes.
(This makes sense when pre-instantiated specializations
are provided by the caller)
o RooSimPdfBuilder
- Add addSpecializations() method for user to supplied
pre-instantiated split-node specializations
- Allow branches to be split in addition to parameters
Miscellaenous
-------------
o RooFitContext
- Modify fit glue function to call the internal version
of RooFitContext::nLogLikelihood
o RooMCStudy
- Fix range checking algorithm in fitResult() and genData()
o RooBanner
- Prints banner when RooFitCore library is loaded
Revision
4044 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Feb 20 19:46:21 2002 UTC (12 years, 11 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3387 byte(s)
Diff to
previous 3909
o RooAbsData
- Add virtual split() method to split dataset in one iteration into
N sub-datasets, each corresponding to the state of the splitting
RooAbsCategory
- Add virtual emptyClone() method to create an empty clone of a dataset
o RooTreeData
- Implement split method
o RooDataSet,RooDataHist
- Implement emptyClone() methods
o RooSimFitContext
- Use RooAbsData::split to build datasets for all sub contexts
at once, instead of making N iterations.
Revision
3271 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 22 01:07:11 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3156 byte(s)
Diff to
previous 3212
o RooDataHist
- Add to memory gDirectory on construction (via RooDirItem)
o RooDataSet
- Add to memory gDirectory instead of default gDirectory on construction
(via RooDirItem)
o RooTreeData
- Add moment(), meanVar(), rmsVar(), statOn() utility functions
(Code mostly copied from RFT implementation)
o RooDirItem
- New base class for objects to be listed in gDirectory
o RooFitResult
- Fix filling of correlation matrix when nPar>16
- Make persistable via RooDirItem
- Add accessors to correlation matrix element by name
o RooFitContext
- Construct RooFitResult with a name and title
Revision
3212 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Nov 14 18:42:38 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3101 byte(s)
Diff to
previous 3073
o RooAICRegistry
- Tighten conditions for reuse of slots (loose conditions
caused problems for certain projections)
o RooAbsCollection
- Add equals() method to check if two collections have similar
contents
o RooAbsPdf
- Add isDirectGenSafe() method. This code is transplanted from
RooGenContext and determines if a PDF depends via more than
one path on a given dependent. It is put here so that certain
classes (RooAddModel) can override the default implementation
o RooAbsReal
- Add getVal(const RooArgSet&) that forwards to getVal(const RooArgSet*)
o RooAddModel
- Add getGenerator(),initGenerator(),generateEvent() implementing
distributed direct generation if all components support
direct generation of the given set of dependents.
- Overload isDirectGenSafe() as forwarder function to its components
- Fix memory leak in syncNormalization when used as regular PDF
o RooConvolutedPdf
- Minor modifications to verbose messaging
o RooDataHist
- add get(const RooArgSet& coord) to retrieve the bin center
coordinates of the bin enclosing the supplied coordinates
o RooGenContext
- Use RooAbsPdf::isDirectGenSafe() to determine which dependents
are safe for direct generation
o RooSimGenContext
- Fix generation with derived index category from prototype
o RooSimultaneous
- In genContext(), fix algorithm to detect when specialized
RooSimGenContext is appropriate
o RooTruthModel
- Fix analytical integrals with tau=0
Revision
3073 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 19 22:19:50 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3038 byte(s)
Diff to
previous 3015
Fix persistence of RooLinkedList, RooDataSet
--------------------------------------------
o RooAbsArg
- Remove assert in default ctor(). Once put there
to trap streamer based cloning
o RooAbsCollection
- Follow minor interface changes in RooLinkedList
o RooAbsData
- Make _cachedVars not persisted
o RooLinkedList
- Make custom streamer that sequentually
read/writes contained elements to stream
- Inherit from TObject to facilitate persistence
o RooFitCore_LinkDef.hh
- Added to declare that RooLinkedList has a custom streamer
o RooLinkedListElem
- Declare as transient class (not used in RooLinkedList persistence)
o RooTreeData
- Add transient flag that determines if object was constructed
from default ctor (i.e. an object retrieved from persistence)
If set get() will on first use reconnect all args in _vars
as branches to the tree
Revision
3015 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 12 01:48:47 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 3059 byte(s)
Diff to
previous 2969
New optimized generator contexts for RooAdd/Prod/SimPdf
-------------------------------------------------------
o RooAbsPdf,RooProdPdf,RooAddPdf,RooSimultaneous
- Introduce protected virtual function genContext()
which returns the appropriate generator context
for that PDF:
RooAbsPdf --> RooGenContext
RooProdPdf --> RooProdGenContext
RooAddPdf --> RooAddGenContext
RooSimultaneous --> RooSimGenContext
o RooAbsGenContext
- New abstract generator context
o RooGenContext
- Make inherit from RooAbsContext
o RooAddGenContext
- New optimized generator context for RooAddPdf
that generates the components separately
o RooSimGenContext
- New optimized generator context for RooSimultaneous
that generates the components separately
o RooProdGenContext
- New optimized generator context for RooProdPdf
that generates the dependents of each components
separately and then merges them
Dataset enhancements
-------------------
o RooDataHist
- Add constructor from TH1,TH2,TH3
- Add interpolation order to weight(RooArgSet& coord,...)
function that optionally performs nth order
interpolation of the weight distribution in the
real dimensions of the dataset.
(Currently supports up to 2 real dimensions)
o RooHistPdf
- Add option to ctor to optionally interpolate
histogram contents in real dimensions
o RooDataSet
- Introduce merge() methods that adds the columns
of one or more datasets (of equal length)
Miscellaneous (fixes Remedy #5603)
-------------
o RooRealVar
- Fix output format in writeToStream(). One ')' too many
- Read '+/-' as 3 tokens due to change in parsing rules
o RooArgSet
- Change punctuation rules of parser in readFromStream
so that it doesn't break up variable names with
funny characters
Revision
2882 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 27 18:22:31 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 2628 byte(s)
Diff to
previous 2798
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
2798 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 17 18:48:17 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 2424 byte(s)
Diff to
previous 2792
Generalize RooArgSet to RooAbsCollection and introduce RooArgList
and corresponding proxy. Introduce RooArgList where appropriate
as replacement of a TList of proxies, eliminate all use of TList
inherited functions in RooArgSet/List.
Some optimizations implemented following profiling studies
Various fixes for compilation with Solaris CC 5.0
o RooAbsArg
- Change signature of server management function to use RooAbsCollection
instead of RooArgSet
- Add proxy management support for new RooListProxy class
o RooAbsPdf
- Disable use of RooNameSets as optimization attempt. It appears
to cost more time than it saves
o RooAbsProxy, RooArgProxy, RooAbsReal, RooAcceptReject,
RooDataHist, RooFormula, RooFormulaVar, RooGenCategory,
RooGenContext, RooGenericPdf, RooPlot, RooRealIntegral,
RooResolutionModel, RooSetProxy, RooSuperCategory, RooTreeData
- Follow RooAbsArg member function signature changes
o RooAddPdf, RooConvolutedPdf, RooFitContext, RooSimFitContext,
RooFitResult, RooPdfCustomizer, RooProdPdf,
- Change implementation from using TList to using RooArgList
o RooAbsCollection
- New abstract base class for collections of RooAbsArgs. This
class contains mostly code from the former RooArgSet implementation
o RooArgSet
- Re-implement as derived class of RooAbsCollection. A RooArgSet
cannot contain duplicates (as before), but also doesn't give
random access (by index) to its member elements
o RooArgList
- New implementation of RooAbsCollection that allows duplicates
in the list, allows sorting and lookup by index.
o RooListProxy
- Proxy version of RooArgList, similar to RooSetProxy. To be used
as data member of RooAbsArg implementation to hold external
RooAbsArg references.
Revision
2792 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 12 01:25:44 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 2377 byte(s)
Diff to
previous 2788
Completion of binned fit implementation.
o RooTable,Roo1DTable
- Modify to hold non-integer values
o RooTreeData,RooDataSet
- Move plotOn(),createHistogram(),table(),printToStream methods
from RooDataSet to RooTreeData. Modify functions as appropriate
to be weight-aware. Function verified to work properly for
both binned and unbinned data sets
o RooDataHist
- Implement the reduceEng() while drives the various
reduce() methods.
- Add new add(RooAbsData) and new ctor from RooAbsData
to fill binned data sets from unbinned data sets or
other binned data sets
o RooFitContext
- Minor fixes to make nLogLikelihood() work properly if there
are zero-weighted entries in a dataset
Revision
2788 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Tue Sep 11 00:30:33 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/inc/RooDataHist.h
File length: 2215 byte(s)
Reorganization of RooData* classes to introduce binned data sets
o RooAbsData
- Add new reduce() method to create subsets (either by cut
or listed columns) of abstract data sets.
o RooTreeData
- New abstract base class for data sets that implement their
data storage in a TTree (RooDataSet and RooDataHist currently)
Derives from RooAbsData.
o RooDataHist
- New binned data set class. Basic functionality is implemented,
but class is not fully functional yet.
o RooDataSet
- Make inherit from RooTreeData instead of directly RooAbsData.
Move many tree management function, including caching into
RooTreeData
o RooAbsArg,RooAbsPdf,RooFitContext,RooSimFitContext,RooSimultaneous
RooAcceptReject
- Change function prototypes to use RooAbsData(,*,&) instead
of RooDataSet
- Change use of some TTree inherited methods (GetEntries() etc)
to new RooAbsData abstract methods
o RooFormulaVar
- Suppress unnecessary error message
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.
