Log of /trunk/roofit/roofitcore/src/RooNumRunningInt.cxx
Parent Directory
Revision
44507 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 4 12:30:41 2012 UTC (2 years, 7 months ago) by
axel
File length: 9254 byte(s)
Diff to
previous 31258
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
31258 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 17 22:41:06 2009 UTC (5 years, 2 months ago) by
wouter
File length: 9232 byte(s)
Diff to
previous 25184
o RooAbsDataStore
- Add pure virtual interface for handling of event weights
o RooCompositeDataStore
- Implement forwarder function for weights handling
- Keep track of 'current' in data member to allow forwarding
of calls to 'current' dataset
o RooDataHist
- Export pointers to weights and errors array to RooTreeDataStore
o RooDataSet
- Adjust to store weight variable in RooTreeDataStore
- Modify Link() argument in ctor to take both RooDataHist and RooDataSet objects
- Migrate all handling of weights to RooTreeDataStore
- Deprecate support for changing name of weight variable after construction,
it is incompatible with the new dataset organization structure.
o RooEffProd
- Fix bug in persistency
o RooGlobalFunc
- Change argument of Link() from RooDataSet to RooAbsData
o RooHistPdf
- Fix two bugs in handling of partial integrals:
1) Correctly fill analVars argument with observables actually
integrated internally in getAnalyticalIntegralWN().
2) Transfer values of pdf observable to histogram observables in
analyticalIntegralWN() so that correct slice position is taken
into account in integral calculation
o RooNumRunningInt
- Fix array overflow bug
o RooTreeDataStore
- Add data members that can optionally hold externaly arrays of weights,
and add methods to support manipulation of these
- Implement handling of event weights, either from a weight variable,
or from an external weights array
o RooNDKeysPdf
- Bug fix in gauss()
o RooStepFunction
- Step function defined by external input functions
for return values and boundaries (contribution bu T. Dupree)
o RooMultiBinomial
- New pdf that implements multiple binominals defined from
N external categories and associated efficiency functions
(contribution by T. Dupree)
o RooBanner
- Increment version tag to v3.11
o RooRealIntegral
- Fix small memory leak
o roostats/MarkovChain
- Follow change in RooDataSet
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: 9230 byte(s)
Diff to
previous 24285
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
24285 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 16 15:05:15 2008 UTC (6 years, 7 months ago) by
wouter
File length: 9235 byte(s)
Diff to
previous 24280
o RooProdPdf RooParamBinning RooMsgService RooStreamParser RooPlot
RooRealBinding RooSharedPropertiesList RooPullVar RooNameSet RooNumCdf
RooThreshEntry RooNumber RooSegmentedIntegrator1D RooRangeBinning
RooRealSumPdf RooProduct RooRefCountList RooSharedProperties RooTable
RooRecursiveFraction RooNormSetCache RooNumConvPdf RooProfileLL
RooObjCacheManager RooQuasiRandomGenerator RooRealMPFE RooRealVar
RooNLLVar RooPlotable RooRealIntegral RooStringVar RooRealConstant
RooNumIntFactory RooMultiCatIter RooNumRunningInt RooMPSentinel
RooResolutionModel RooTruthModel RooMultiCategory RooPolyVar
RooSetProxy RooNumConvolution RooRealVarSharedProperties
RooProdGenContext RooMinuit RooProjectedPdf RooNameReg RooPrintable
RooRandom RooRandomizeParamMCSModule RooUniformBinning RooRealProxy
RooSimGenContext RooThresholdCategory RooSuperCategory RooTrace
RooNumIntConfig RooSegmentedIntegrator2D RooRealAnalytic RooSentinel
RooSimultaneous RooTreeData
- Update of function member documentation.
Revision
24280 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sun Jun 15 20:57:45 2008 UTC (6 years, 7 months ago) by
wouter
File length: 7581 byte(s)
Diff to
previous 24119
o RooMCIntegrator RooMCStudy RooMinuit RooMsgService RooMultiCategory RooMultiCatIter RooNameReg RooNameSet RooNLLVar
RooNormSetCache RooNumber RooNumCdf RooNumConvolution RooNumConvPdf RooNumIntConfig RooNumIntFactory RooNumRunningInt
RooObjCacheManager RooParamBinning RooPlot RooPlotable RooPolyVar RooPrintable RooProdGenContext RooProdPdf RooProduct
RooProfileLL RooProjectedPdf RooPullVar RooQuasiRandomGenerator RooRandom RooRandomizeParamMCSModule RooRangeBinning
RooRealAnalytic RooRealBinding RooRealConstant RooRealIntegral RooRealMPFE RooRealProxy RooRealSumPdf RooRealVar
RooRealVarSharedProperties RooRecursiveFraction RooRefCountList RooResolutionModel RooScaledFunc RooSegmentedIntegrator1D
RooSegmentedIntegrator2D RooSentinel RooSetPair RooSetProxy RooSharedProperties RooSharedPropertiesList RooSimGenContext
RooSimPdfBuilder RooSimultaneous RooSimWSTool RooStreamParser RooStringVar RooSuperCategory RooTable RooThreshEntry
RooThresholdCategory RooTObjWrap RooTrace RooTreeData RooTruthModel RooUniformBinning RooWorkspace
- Upgrade inline documention: make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
- Updating of data, function member documentation _not_ done yet
Revision
24119 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by
wouter
File length: 5633 byte(s)
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
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.