Log of /trunk/roofit/roofitcore/src/RooDataSet.cxx
Parent Directory
Revision
47038 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 5 15:36:18 2012 UTC (2 years, 2 months ago) by
wouter
File length: 67885 byte(s)
Diff to
previous 46156
Import last set changes from 534 patch branch
-----------------------------------------
*** r47035 ***
o RooCachedReal
- Bug fix: attach parameters of function clone to those of tracker
to retain connection with original parameters
o RooNameSet
- Implement operator<() and operator()= to allow use as key in stl::map
o RooAbsCachedReal
- Expose source clone in CacheElem as contents to facilitate correct link
redirection on cache content
- Set cached source clone and cached datahist to ADirty mode to speed up
scanning of cache when recalculating
o RooAbsAnaConv, RooTruthModel, RooResolutionModel
- Add interface to allow resolution model to return GenContext, needed
for special pdfs with custom efficiency handling
o RooAddGenContext
- Make coefficient interpretation used in GenContext not forcibly override
any existing custom choices to allow user to override default choice
with his own
*** r46916 ***
o RooWorkspace
- Increment all string buffers from 1024 to 10k
*** r46696 ***
o RooVectorDataStore
- Fix stress test failure (check _wgtVar before using it in loadValues()
*** r46691 ***
Support changes of weight variable (was no longer possible with last fix)
o RooGlobalFunc
- Add optional argument to WeightVar() that when true signifies that
given column should be reinterpreted as weight when used in combination
with the Import() of an already weighted datasets
o RooDataSet, RooVectorDataStore
- Implement support of new Import() option
*** r46666 ***
o RooDataHist
- Set importDensity to false for all constructor forms that import TH1s
(to be consistent with Import() setting)
*** r46611 ***
o RooAddPdf
- Increase size of _coefCache to 100 elements in default ctor
*** r46603 ***
o RooVectorDataStore
- In loadValues() add special handling for cases where weight name
in source and target dataset are not identical
o RooRealSumPdf
- Add flag to optionally truncate negative values to zero
o RooMinuit, RooMinimizer
- Add option to generate error status when FCN exceeds 1e30
*** r46575 ***
* RooFit Fixes from LHCb
*** r46573 ***
o RooBanner
- Increment version tag to 3.55
*** r46571 ***
o RooFitResult
- Disable default filling of legacy correlation matrix to save memory and CPU.
It wil still be filled on-demand when it is accessed
Revision
46156 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Sep 25 08:40:08 2012 UTC (2 years, 3 months ago) by
wouter
File length: 67552 byte(s)
Diff to
previous 44507
*** Speedup of caching of parameterized integrals ***
o RooAbsCachedReal
- Add interface to activate option of RooAbsCachedReal to keep clone of source object in cache for faster operation
(the downside of this is that future structural changes of the source object will not be detected)
o RooCachedReal
- Implement source cloning and persistence (based on code originally in RooAbsReal::fillDataHist)
o RooAbsPdf
- in syncNormalization() activate source caching feature for parameterized normalization integrals
*** Improve robustness of level-2 likelihood optimization 'cache-and-track' ***
o RooVectorDataStore
- in cachArgs() detect cache-and-track object labeled with a CATCondSet or CATNormSet string label
and reconstitute the corresponding set of conditional observables / normalization observables
from the RooNameSet transcript in the label. Fill initial content of cache-and-track elements
with these labels with the appropriate normalization set and associate the set with the RealVector
element that is used for future cache updates.
- In recalculateCache() pick up custom normalization set for conditional product terms as specified
in cacheArgs
o RooAbsOptTestStatistic
- in optimizeConstantTerms() check for non-default normalization specifications of RooProdPdf components
and if found, transcribe the specification to the component object in a CATCondSet or CATNormSet label
so that the cache-and-track optimizer can evaluate these according to the RooProdPdf specs.
o RooProdPdf
- Make findPdfNSet() public so that RooAbsOptTestStatistic can use it.
o RooNameSet
- Add content() method as accessor to the payload.
*** Miscellaneous ***
o RooAbsGenContext
- Fix compiler warning
o RooDataSet
- In ctor import weight variable of imported dataset if no weight variable is specified
(fixes Savannah #95641)
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: 67275 byte(s)
Diff to
previous 43190
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
43190 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 1 12:09:43 2012 UTC (2 years, 10 months ago) by
wouter
File length: 67253 byte(s)
Diff to
previous 43042
Import last set changes from 532 patch branch
-----------------------------------------
Fix 2 related bugs
- Handling of pdfs with conditional observables in the likelihood
- Make pdf integrals that are cached and interpolated also work
when one of the pdf observables is conditional
o RooCachedReal
- Propagate OperMode ADirty to function being cached
o RooAbsCachedReal
- Propagate OperMode ADirty to RooHistFunc that implements cache
o RooVectorDataStore
- NOCacheAndTrack will also disable caching of constant terms
o RooAbsAnaConv
- Declare original resolution model as NOCacheAndTrack to prevent
superfluous cache calculations
o RooAbsReal
- In createIntObj() set caching wrapper to ADirty if the original integral
is auto-determined to be so
o RooAbsTestStatistic
- Add debug option NCPU=-1, which amounts to NCPU=1, but run the the MP interface
o RooNormSetCache
- Fix bug in copy ctor
o RooRealIntegral
- Fix bug in autoSelectDirtyMode() - only consider value servers, not sterile servers
o RooAbsTestStatistic
- Mark conditional observables in pdf, rather than in dataset, as that is what the new
vector-data-store uses
--------
o RooVectorDataStore
- In recalculateCache() only remove projected observables if they are defined
(is more efficient when this feature is not used)
-------
o RooParamHistFunc/RooHistConstraint
- New classes representing a flexible histogram shape, and class representing a product of Poisson
constraints on each of these bins
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: 67242 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: 66505 byte(s)
Diff to
previous 41676
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
41676 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 1 15:44:30 2011 UTC (3 years, 2 months ago) by
wouter
File length: 66339 byte(s)
Diff to
previous 41536
*** Miscellaneous speed improvements ***
o PiecewiseInterpolation
- Import changes from Max baak (new interpolation options)
- Deploy fast iterators
o RooGaussian
- Bug fix in analytical integral over 'mean' parameter (Lorenzo Moneta)
o RooBernstein
- Deploy fast iterators
o RooProdPdf
- Reorganize code for improved speed
o RooDataHist
- Add support for vector-based data storage
o RooGenContext
- Improve generation speed by putting internal pdf clone to ADirty mode
o RooRealBinding
- Minimize number of calls to min() and max() for efficiency reasons
o RooAbsRealLValue
- In randomize() Minimize number of calls to min() and max() for efficiency reasons
o RooDataSet
- Make addFast() even faster by disable state propagation
o RooAbsGenContext
- Disable state propagation in output dataset for efficiency reasons
- Call initGenerator() only on the first generation sequence
o RooVectorDataStore
- Add support for native vs current buffers, to support the functioning
of addColumn(s)() and cacheArgs() when the datastore is attached
to a pdf in RooAbsOptTestStatistics
o RooAbsCategoryLValue
- Support change in RooAbsCategory to operate nominally by index rather than by label
o RooXYChi2Var
- Change code to support new pdf/data attachment scheme in RooAbsOptTestStatistics
where only the store buffers are reattached and the variable objects themselves
o RooFFTConvPdf
- Bug fix in getActualObservables() - functionality of setCacheObs() is now restored
o RooAbsReal
- Small adjustments in getVal() to make it faster in most cases
o RooAbsCollection
- Add datamember to keep track contents is exclusively RooRealVars. For those that
do implement a faster version of assignFast()
o RooAbsData
- Add methods attachBuffers() and resetBuffers() - forwarded to datastore - that
facilite new 'fast-attach' methods used in RooAbsOptTestStatistic
o RooCompositeDataStore
- Fix copy constructors so that they clone and own the subsidiary datasets
- Operate index by value rather than by string label for efficiency reasons
o RooRealVar
- Bug fix in attachToVStore() to properly handle RRVs with StoreError tags
o RooAbsPdf
- Adjustments in getVal() to make it faster for most cases
- Modify generate(GenSpec*) to initialize specInit flag that
triggers one-time call of initGenerator()
- Modify generate() to not repeatedly call initGenerator() for the same gencontext
o RooAbsArg
- Deploy fast iterators in more places
- Add various new inline methods performing multiple ops (e.g retrieving and
clearing one or more dirty flags) for improbed RooAbsReal/RooAbsPdf::getVal()
operations
o RooBanner
- Increment version tag to 3.48
o RooRealIntegral
- Add overloaded getVal() method that also checks for shapeDirty flag,
which was removed from RooAbsReal::getVal() as it is not needed for
any class other than RooRealIntegral
o RooAddGenContext
- Disable state propagation in output dataset for efficiency reasons
- Replace ROOT container classes with STL versions for efficiency reasons
o RooMultiCatIter
- Adjust code to new RooCatType behaviour that by default only tracks the
integer representation of type
o RooProdGenContext
- Replace ROOT container classes with STL versions for efficiency reasons
o RooTreeDataStore
- Adjust code so that it works with the new fast-attach mechanism used
in RooAbsOptTestStatistic
o RooRealProxy
- In lvptr() remove explicit check for lvalue
o RooSimGenContext
- Disable state propagation in output dataset for efficiency reasons
- Replace ROOT container classes with STL versions for efficiency reasons
- In createDataSet() create a prototype dataset in the first call, and
clone that for subsequent calls rather than calling the expensive named
argument constructor each time
o RooTrace
- Add (dummy) method callgrind_zero() and callgrind_dump() as hook functions
to facilitate improved callgrind profiling
o RooAbsCategory
- Adjust class so that it works with the integer representation of types only
and lookup associated string label on the fly, whenever it is requested
o RooFormular
- Eliminate overloaded getVal() as its functionality is now provided in
RooAbsReal::getVal()
o RooAbsOptTestStatistic
- Implement new fast-attach mechanisms for pdf and datasets: only readjust the
buffer pointers of the dataset to the pdf observables, rather than reattaching
the pdf to the dataset observables. This results in a _much_ faster
operation of setData() and no longer entangles the test statistics with observables
of datasets that may be deleted during the lifetime of the test statistic
o RooSimultaneous
- Overload fillDataHist() with new version with correct normalization (from Scott Snyder)
o RooCategory
- Adjust getLabel() so that it retries labels associated with the current index on the fly
o RooCatType
- Make label contents 'transient', i.e. it is not copied on assignment for faster
category operations. RooAbsCategory will load the associated labels on demand from now on.
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: 66317 byte(s)
Diff to
previous 40388
*** 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
40388 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jul 28 11:22:02 2011 UTC (3 years, 5 months ago) by
wouter
File length: 64068 byte(s)
Diff to
previous 39919
o RooProdPdf
- Speed up calculate() by deploying iterators instead of calling at(i)
o RooDataSet
- Increase size of string buffers related to Import() from 1024 to 10240
Revision
39817 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 18 12:49:41 2011 UTC (3 years, 7 months ago) by
wouter
File length: 63931 byte(s)
Diff to
previous 39400
o RooDataSet
- Introduce pool-based memory allocation scheme
- In ctor for composite datasets with Link() ensure that
order of observables is preserved to allow use of assignFast()
o RooRealSumPdf
- Use getNorm() in expectedEvents() rather than createIntegral()
o RooAbsCollection
- Do no allocate hash tables by default
- Introduce contents claim counter to counter 'foreign' ownership
claims of contents (needed for RooAbsOptTestStatistic::setData()
support)
- If collection is owning, only delete contents if claim count is also zero
- In snapshot() raise hash table threshold from 100 to 1000
o RooRefCountedList
- Disable hash tables by default
o RooStudyPackage
- Make study package own clone of incoming workspace
- Implement copy ctor
o RooAbsTestStatistic
- Implement 'master' setData() method. Forward to setDataSlave()
of self for monolithic likelihoods or forward data components
to likelihood components in case node is SimMaster. If data
is not fast-splittable, execute slow split.
o RooAbsData
- Implement 'live check' to be able to conclude if a given dataset
pointer points to a live or dead object
- Claim contents of _vars through new claim mechanism. Release
in dtor, allow _vars to delete contents if claim count is zero
- Add concept of owned component datasets to support fast-splitting
of dataset
- Add method canSplitFast() that indicate if fast split is available
(only possible if dataset was created as composite)
- Add method getSimData() that retrieves pointer to component
RooDataSet representation for a given index state
o RooObjCacheManager
- Add static mechanism that allows to deleted cached observables lists used for
cache optimization triggers to be deleted on a sterilize() action. This
is useful on toy studies with setData() operation, that would otherwise
collect very large lists of observable clones during the toy cycle.
o RooAbsPdf
- Set contraint term to ADirty to avoid synchronization problems when using
setData() in the likelihood
o RooAbsArg
- In clone operations set hash table threshold at 1000 nodes
- In getObservables() use pass-by-value iterators rather than heap iterators
to making this faster. Also make getObservables() non-virtual, as it is in
fact not overloaded in any subclass (anymore). Also remove looping over
branch nodes to call getObservablesHook() as no class implements method
anymore.
o RooAddition
- Implement a setData() method that forwards to its components. Allows transparent
operation of setData() on likelihood objects with constraint terms
o RooLinkedList
- Add method that returns iterator by value (simply forwards to similar implementation
in RooLinkedList)
o RooSimGenContext
- Move calculation of fraction table from ctor to dedicated updateFraction() method
- Before each generation sequence call updateFractions() so that multi-generation
sequence are robust against parameter changes between calls
- In createDataSet() always make a composite dataset if the index is present, as this
allows faster use in toymc operations
o RooAbsOptTestStatistic
- Initialize all variables in default ctor
- In dtor and ctor handle ownership of dataset observables, on which we put a claim
(i.e. we need to delete contents if the test statistics survives the dataset)
- Reimplement existing setData() as setDataSlave(), and add claim management on
dataset observables. When attached new data to function, request that object caches
clear full content in sterilize() operation to avoid buildup of cache objects in
long toy runs.
- In setData() adjust event count of test statistics, for correct functioning of extended
terms after update
o RooArgSet
- In ctor for list and a single object, only add object if not already in list
(is already checked, but new procedure preserves order of list elements in case
object was already present)
o LinkDef
- Add list<RooAbsData*> and map<string,RooAbsData*> to support streaming of composite datasets
o RooAbsStudy
- Implement clone method to support polymorphic array cloning
o RooAbsReal
- Add interface method setData()
o RooProfileLL
- When storing coordinates of absolute minimum, store only those that are non-constant.
Otherwise option to restart each minimization from known absmin may alter constant
parameters
Revision
39400 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 26 12:38:07 2011 UTC (3 years, 8 months ago) by
wouter
File length: 60893 byte(s)
Diff to
previous 37128
o RooDataSet
- Add support is ctor for new argument OwnLinked() that will cause
dataset to take ownership of linked component datasets
o RooAbsGenContext
- Add new virtual method createDataSet() to create the output dataset
of the generation exercise
- In generate() use createDataSet() instead of creating a RooDataSet directly
o RooAbsData
- Add concept of owned component datasets and add interface method addOwnedComponent()
o RooGlobalFunc
- Add named argument OwnLinked()
o RooSimGenContext
- Overload method createDataSet(). For cases where the component of the RooSimultaneous
implement different subsets of the total set of observables, create and empty dataset
tailored to the observables of each component and join these in a composite dataset
that owns the components. If all
Revision
37128 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Nov 30 22:24:50 2010 UTC (4 years, 1 month ago) by
wouter
File length: 60559 byte(s)
Diff to
previous 36274
o RooPoisson
- Fix in handling of open-ended integrals
o RooDataHist
- Add support for Import(map<string,RooDataHist*>) and Import(map<string,TH1*>).
o RooDataSet
- Add support for Import(map<string,RooDataSet*>) and Link(map<string,RooDataSet*>)
o RooCmdConfig
- Add handling of non-prefixed recursive named arguments
o RooCmdArg
- Add no-prefix flag for recursive arguments
o RooNLLVar
- When SumW2Error() is active, also apply weights squared in extended term
o RooGlobalFunc
- Add new Import(),Link() commands
o RooWorkspace
- Fix importClassCode() following a convention change in TClass
- In genobj() first check if search result is non-null before dereferencing it
o RooAbsArg
- Make isDerived() only return always false if the server list is empty _AND_ if the proxy list is empty.
This fixes the initializion behavior of pdfs without explicit parameters
o RooBanner
- Increment version tag to 3.15
Revision
34064 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 22 15:05:19 2010 UTC (4 years, 7 months ago) by
wouter
File length: 59944 byte(s)
Diff to
previous 33204
Import roofit/roofit(core) changes from dev/roostats branch to trunk
=== r34062 ===
o RooProdPdf
- Fix compilation error on Windows
- Fix memory leak
- Fix some shadowing problems
o RooDataHist
- Fix memory leak
o RooFactoryWSTool
- Add syntax checker routine to factory front-end. At present
this counts only of all pairs of (),[],{} match.
- Add factory syntax 'set::name(a,b,c)' as factory syntax for
RooWorkspace::defineSet("name","a,b,c") ;
o RooAddPdf
- Fix memory leak
o RooAbsNumGenerator, RooAcceptReject, RooFoamGenerator
- Fix uninitialized pointer problem spotted by valgrind
o RooRealMPFE
- Fix gcc 4.4 warnings by checking return values of all read(),write()
and pipe() calls.
o RooAbsPdf
- Fix variable shadowing issue
o RooRealIntegral
- Fix memory leak
o RooTreeDataStore
- Fix memory leak
o RooSimultaneous
- Fix variable shadowing issue
o RooGlobalFunc, LinkDef2
- Include fix from Kyle/Axel to solve include guard issue in macros
for namespace RooFit
=== r34020 ===
Update to RooRealSumPdf where normalization had memory leak
=== r33961 ===
o RooAbsReal
- Add new method setEvalErrorLoggingMode() that takes three options
PrintErrors (default), CountErrors (new) and CollectErrors (supports
structured printing during minimization
o RooRealMPFE, RooMinimizerFCN, RooMinimizer, RooMinuit
- Follow changes in RooAbsReal
o RooAbsPdf
- Make getLogVal() return log(0) when probability is zero, rather than zero,
to support operation of (non-log) likelihood functions
=== r33945 ===
o RooNumRunningInt, RooCachedPdf, RooCachedReal
- Use aggregateCacheUniqueSuffix() advertised by content to
distinguish objects with identical structure that have
different non-parametric content (such as likelihood functions)
o RooAbsCachedPdf, RooAbsCachedReal
- Allow addition of additional suffix to name of object cached
in expensive object store
o RooAbsReal
- Introduce virtual function cacheUniqueSuffix() that allow function
objects that have non-parametric content that can cause two instance
of an object with the same parameter to behave differently (e.g. likelihoods that
have different datasets but the same pdf) to advertise a string suffix
that can be attached to the index name in the expensive object cache to
distinguish different instances
- Introduct method aggregateCacheUniqueSuffix() that concatenates all suffixes
produced by any branch node into a single string
o RooAbsOptTestStatistic
- Advertise dataset pointer as unique cache suffix
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple n
=== r33943 ===
o RooProdPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooMsgService
- Add concept of debug workspace and debug code to facilitate
debugging of complex problems
o RooGenContext
- Force use of Accept/Reject sampler for problems with observables where
the range depends on other observables as Foam cannot handle these
o RooDataSet
- Bug fix in handling of weights in append() operation
o RooAbsGenContext
- Add support for handling of explicit normalization range(s)
o RooAbsReal
- Bug fix in createIntegral(), avoid use of strtok() due to possible recursive use
o RooAddPdf
- Large scale adjustment to code to be able to handle pdfs where
the normalization range of its observables is defined by
multiple ranges rather than a single range
o RooAbsPdf
- Add support for definition of multiple normalization ranges, with setNormRange()
as user front end
o RooAbsArg
- Fix bug in link state management: a state change to ADirty must be propagated to
all clients.
- Add maximum level argument to printComponentTree()
o RooRealIntegral
- Fine tuning of debug-level print messages
- Fix memory leak
o RooAddGenContext
- Add support for handling of multiple normalization ranges
o RooRangeBoolean
- New RooAbsReal implementation that returns 1 or 0, depending on another observable
having a value in a predefined range
o RooAbsIntegrator
- Fine tuning of debug-level printouts
o RooTreeDataStore
- Multiple bug fixes in handling of weighted data
o RooAbsOptTestStatistic
- Small changes to support operation with multiple normalization ranges
o RooArgSet
- Add utility method isInRange() that is forwarded to content
o RooGenProdProj
- Add new operation mode that does not factorize, which is needed for certain cases
with multiple normalization ranges
=== r33758, r33720 ===
o RooPoisson
- Fixes in internal generation code
o RooLogNormal, RooGamma, LinkDef1
- New classes contributed by Gregory Schott
Revision
33204 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Apr 26 09:44:11 2010 UTC (4 years, 8 months ago) by
wouter
File length: 60474 byte(s)
Diff to
previous 31847
o RooDataSet
- Fix bug in ctor that ignored WeightVar(const RooAbsArg&) argument
o RooAbsReal
- Fix bug in findRoot that incorrectly return status of BrentRoot finder instead of found minimum
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: 59881 byte(s)
Diff to
previous 30333
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
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: 53826 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
26044 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 31 16:45:22 2008 UTC (6 years, 2 months ago) by
wouter
File length: 44970 byte(s)
Diff to
previous 25432
(Fixes inferred from valgrinding of expanded stressRooFit test suite)
o RooParamBinning
- Fix initialization of _owner in default ctor
o RooAbsRealLValue
- Fix small memory leak in createHistogram()
o RooDataSet
- Fix small memory leak in constructor
o RooCurve
- Fix leaking of array of sampling hints in addPoints()
o RooAbsReal
- Fix small leak in plotAsymOn()
- Fix double ownership problem in createIntRI()
o RooProduct
- Fix two small memory leaks
o RooAbsTestStatistics
- Downgrade initSimMode message from ERROR to INFO
o RooAbsPdf
- Add Warning() modifier to plotOn() to set MINUIT SET NOWarn option
- Fix small memory leak in fitTo() when using constraints
- Fix glitch in generate() in extended mode when nPoisson=0
- Fix small memory leak in plotOn() when using ranges
o RooRealIntegral
- Fix small memory leak in constructor
o RooPolyVar
- Add destructor that deletes internal iterator
o RooMinuit
- Add interface to suppress MINUIT warnings
o RooGlobalFunc
- Define Warnings() named argument
o RooArgSet
- Add protection to pool allocation scheme in case pool size is not
exactly N times object size
o RooSimultaneous
- Fix small memory leak
Revision
25432 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Sep 17 08:53:00 2008 UTC (6 years, 4 months ago) by
wouter
File length: 44951 byte(s)
Diff to
previous 25184
o RooTreeData
- Add argument to addColumn() to make automatic adjustment of ranges optional
- In moment() avoid infinite recursion possibility
o RooDataSet
- Follow interface change in addColumn()
o RooMCStudy
- Add pull variables to fitParDataSet without automatic range adjustment
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: 44918 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: 36390 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: 35508 byte(s)
Diff to
previous 23538
o RooConvCoefVar RooDataWeightedAverage RooEllipse RooClassFactory RooConstVar RooDataHist RooDataSet
RooCmdConfig RooConvIntegrandBinding RooCacheManager RooDirItem RooEffGenContext RooCustomizer RooDataHistSliceIter
RooConstraintSum RooCurve RooErrorVar RooEfficiency RooDouble RooEffProd RooDLLSignificanceMCSModule RooCmdArg
- Upgrade inline documention: make sure that every member function has some descriptive comments, every
data member has a descriptive comment, make sure that each class has a description.
- Fix class description header so that it is correctly identified by THtml
Revision
23538 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 24 21:02:00 2008 UTC (6 years, 9 months ago) by
wouter
File length: 30492 byte(s)
Diff to
previous 23134
Import changes from development branch
==== Date: Wed Feb 20 22:33:28 2008 =====
o RooRealSumPdf
- Do _not_ use normalization of RooAbsPdf input components
in numerator of RooRealSumPdf expression since it is
already explicitly occurring in denominator of RooRealSumPdf.
(Fixes wrong normalization reported by Tristan)
o RooObjCacheManager
- Register owner of cache with each cache elememt to
facilitate callbacks
o RooAbsCacheElement
- Add storage for pointer to owner of cache and
supply setOwner() function
o RooAbsPdf
- Use RooObjCacheManager callback mechanism to zero
'last used normalization' pointer in RooAbsPdf
when the cache-owned object pointed is about
to be deleted.
o RooAbsArg
- Make crc32 function static
o RooWorkspace
- Add CodeRepo nested class that allows to store C++ code
of RooAbsArg derived classes that are not in ROOT distribution
but are contained in workspace. When reading any missing
class, code is compiled on the fly allowing for transparent
reading of workspace object from file. Code is found in
location pointed to from TClass objects. Additional search
path for declaration and implementation files can be provided
to be able to handle non-trivial cases.
- Add WSDir nested class that represents information contained
in workspace as read-only TDirectory for easy interactive use.
Directory representation is created using makeDir() member function.
o LinkDef3
- Add nested classes in RooWorkspace
===== Date: Wed Mar 26 23:04:26 2008 =====
o RooProdPdf
- Fix typo in ctor documentaion
- Improve error message in expectedEvents() when no extendable p.d.f.s are found
- Implement getConstraints() function to retrieve constraint p.d.f terms from product
expression given set of observables and set of parameters to be constrained.
o RooMsgService
- Add PROGRESS message level between INFO and WARNING
- Add globalKill level for messages to be able to quickly eliminate all messages below
a given level without interfering with the stream structore of RooMsgService
o RooPrintable
- Implement new printing interface with more details control over items printed trhough contents enum
(multiple ORable options) and style of printing (inline, single line, (verbose) multiline) with style
enum (exclusive options).
- Introduce generic virtual functions for printing of name,title,value,arguments,
and extras of each object.
- Each class can overload the default contents used for all printing
uses (inline,verbose,standard) etc as well as the default printing style invoked by Print()
o RooPlot,RooGenContext, RooAbsRealLValue,RooDataSet,RooNameSet,RooCustomizer, RooAbsGenContext, RooAddModel,
RooFitResult,RooCurve,RooAbsAnaConv,RooHist,RooAbsReal,RooAbsCollection,RooAddPdf,RooTable,RooAbsData,
RooMappedCategory,RooFormula,RooFormulaVar,RooCatType,RooRealVar,RooAbsArg,RooAbsPdf,RooPlotable,RooRealIntegral,
RooAbsBinning,Roo1DTable,RooAddGenContext,RooGenericPdf,RooResolutionMode,RooAbsHiddenReal,RooMultiCategory,
RooAbsString,RooSetProxy,RooProdGenContext,RooConvGenContext,RooGenCategory,RooGrid,RooSimGenContext,
RooThresholdCategory,RooAcceptReject,RooSuperCategory,RooEllipse,RooNumIntConfig,RooAbsCategory,RooListProxy,
RooLinearVar,RooTreeData,RooTreeData
- Update to new RooPrintable interface
o RooGenContext,RooAbsGenContext,RooAddGenContext,RooProdGenContext,RooConvGenContext,RooSimGenContext
- Implement attach() function to simplify management of changing parameters during lifetime of context
o RooAbsRealLValue
- Eliminate inFitRange() warning message as it is gives too many false warnings when used with
parameterized ranges
o RooCustomizer
- Make owning of contents optional to simplify release of created components
o RooAbsReal
- Implement new evaluation error logging mechanism. Rather than passing zero p.d.f values, push error message with
details on a static stack (if logging is enabled by e.g. RooMinuit).
- Augment functionality of createIntegral: explicitly allow integration over ranges with bounds parameterized in
in terms of other integrated observables. Integrals of this type are automatically recognized and cast
as recursive integrals in case of >1-D integrals to integrate over requested phase space.
- Add createIntObj() helper function for above functionaliy.
- Eliminate a lot of commented out debug code from createPlotProjection()
- Modify fillHistogram(): when plot observables are cloned, explicitly interconnect clones again to facilitate
proper plotting of N-D integrals with entangled parameterized ranges
- Add ScaleFactor() argument to fillHistogram to control use of histogram density correction scale factor in Z-scale
of filled histogram
o RooProduction
- Fix bug for persistence
o RooRealMPFE
- Extend client/server protocol with message to retrieve RooAbsReal evaluation error log from server side and
merge with error log on client side
o RooRealVar
- Introduced concept of non-shared alternative binnings(ranges) required to accommodate RooParamBinning ranges
that cannot be shared across instances because of their client/server connection to other objects in p.d.f
expression trees. Modify setBinning to automatically recognize non-shareable binnings and divert those to
non-shared alternative binning container.
- Add setRange([const char*,] RooAbsReal&,RooAbsReal&) methods to simplify creation of parameterized ranges.
o RooAbsArg
- Introduce concept of owned components with addOwnedComponents() interface to be able to make any RooAbsArg
object own any number of others. This can be used to simplify the memory management of object trees
- Introduce prohibitServerRedirect mode that will trigger fatal assert if any server redirect is attempted
to thus configured object. Useful as debugging tool to track faulty copy constructors that leave clone
object tree unintentionally connected to the original object tree.
- Migrate fixed--name-field management tool from RooAbsReal to RooAbsArg. Used to accomplish regular
formatting in RooAbsCollection::printStream.
- Add concept of transient boolean attributes that are not tranferred on copy construction. Mostly useful
for debugging.
- Extend leafNodeServerList and treeNodeServerList to distinguish to types of leaf-nodes: strict leaf modes
in the sense of the client-server tree structure and 'physical' leaf nodes that do not recurse into
nodes that have isDerived()==kFalse. The latter corresponds to the original concept of leaf nodes / variables,
which the former mode, a new addition, explicitly exposes any shape servers contained in parameterized
ranges of variables.
- Fix logic error in recursiveServerRedirect: do not recurse into nodes that are in the replacement list themselves.
- Fix bug in printCompactTree(): value/shape clients were not always properly indicated.
- Add getAllConstraints() method that finds all RooProdPdfs in expression trees and harvest constraints from all
of these from the getConstraint() method
o RooAbsPdf
- Implement new evaluation error logging mechanism for negative p.d.f values and zero normalization integrals
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to fitTo() method.
The Constrain() method retrieves any constraints p.d.f. on parameters multiplied in any RooProdPdf in the normal
p.d.f expression and adds those to the likelihood that is minimized. Only constraints on the listed parameters
will be picked up. Multiple constraints per parameter may exist. The ExternalConstrains() argument implements
similar functionality except that provided external constraint p.d.f.s are added rather than internal constraints.
- Fix potentially fatal bug in print statement in getContext()
- Add new method createCdf() to create a cumulative distribution function from given p.d.f. Given a set of observables x,
the returned c.d.f is implemented in terms of a RooRealIntegral of p.d.f(x') over a parameterized range from [ 0 - x ].
o Roo1DIntegrator
- Improve error message
o RooRealIntegral
- Fix bug in calculation of shape dependencies on observables.
- Add handling of dependencies of integral value on values of objects representing parameterized ranges of
integrated observables.
o RooMCStudy
- Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to constructor.
In addition to passing these arguments to the fitTo() call of the fit stage, modify event generation as
follows: instead of sampling events from 'static' generator p.d.f, sample value of constrained parameters
from joint constraints p.d.f and sample observables at those parameter settings. Save the generator parameters
for each toy as these change per toy. Change the pull calculation such that it uses the per-event truth values
rather than the per-study truth value if constraints are used.
o RooAddition
- Fix bug in evaluate() related to persistence
o RooMinuit
- Enable/disable new evaluation error logging mechanism prior to and just after each MINUIT call.
- Print logged error messages, if any, in glue function
o RooProjectedPdf
- Fix important bug: normalization set should always include integration set for each configuration
o RooGlobalFunc
- Add definition of Scaling(),Constrain() and ExternalConstraints() helper functions
o RooUniformBinning
- Remove dedicated print function as it output is identical to that of the generic print function in RooAbsBinningx
o RooAbsBinning
- Add virtual methods isParameterized(),lowBound() and highBound() to be to detect and analyze parameterized binnings
through abstract interface
- Add isShareable() method to be able to separate shareable and non-shareable binnings in RooRealVar.
- Add insertHook() and removeHook() function to allow connection of possible proxies present in binning to
owning RooAbsArg.
o RooWorkspace
- Improve code import facility by introducing a class->file mapping step in the CodeStore to correctly handle cases where
multiple classes are defined in a single file.
- Add check that TClass interface actually yields file names.
- Only require default constructor to be present for non-abstract classes. It should be there for abstract classes as
well but current TClass::HasDefaultConstructor() method will not tell us.
o RooTreeData
- Improve renameVariable() method to not only rename the RooAbsArg branch buffer but also any TTree branches involved as well.
While the tree branch names are generally invisible to the user, having branch names that are different from branch buffer names
may cause branch naming conflicts in merge() that are not detectable as branch buffer naming conflicts.
o RooParamBinning
- New class implementing binning with low and high points defined by external RooAbsReal objects
o RooConstrainSum
- Helper class for RooAbsPdf to represent likelihood of collection of constraint p.d.f.s.
==== Date: Fri Mar 28 10:04:57 2008 =====
o RooRecursiveFraction
- Helper function for RooAddPdf that calculates recursive fraction
f1*(1-f2)*(1-f3) from a given set of plain fractions
o RooAddPdf
- Add flag to ctor to optionally interpret fractions as recursive fractions.
If activated it constructs the recursive fractions using RooRecursiveFraction
from the original fractions
o LinkDef3.h, Module.mk
- Add new class RooRecursiveFraction
==== Date: Tue Apr 1 22:42:19 2008 ====
o RooDataWeightedAverage
- New implementation of RooAbsOptTestStatistics that calculates data weighted
average of any RooAbsReal. This class serves as successor of RooDataProjBinding
that no longer complies with new optimization scheme.
o RooRealBinding
- Implement name() function for more useful error messaging in integration
o RooChi2Var,RooNLLVar
- Follow changes in base class
o RooAbsReal
- In plotOn() support binning flag in ProjWData(). Reimplement data-weighted projections
using new RooDataWeightedAverage class instead of RooDataProjBinding which does not
work with new generic function optimization scheme.
- Add support for NumCPU() argument
in plotOn() to facilitate multi-processor calculation of projections. Extend NumCPU()
argument to pass interleaving option in MP splitting mode of RooAbsTestStatistic
- Move fixAddCoefNormalization() and fixAddCoefRange() from RooAbsPdf to RooAbsReal
o RooAbsTestStatistic
- Generalize functionality: allow RooAbsReals as input arguments instead of RooAbsPdfs only.
Also add virtual globalNormalization() function that allows to apply a global normalization
term after combinedValue() operation to facilitate functionality of RooDataWeightedAverage.
- Add option to split data in multiprocessor mode in interleave mode instead of in bulk mode.
Interleave mode is useful for parallel processing of histogram data where bulk partitions
may not contain equal amount of non-zero data points leading to non-optimal load balancing
between processes.
o RooAbsPdf
- Move fixAddCoefRange() and fixAddCoefNormalization to RooAbsReal to support operation of
new generalized RooAbsTestStatistic
o RooIntegrator1D
- Use name() of RooAbsFunc() to clarify warning and error messages.
o RooRealIntegral
- Rename _operMode to _intOperMode to avoid shadowing of equally named data member in RooAbsArg
- Fix bug in recursive printing
o RooSetProxy
- Fix bug in print()
o RooGlobalFunc
- Modify ProjWData() and NumCPU() helper functions with extra optional argument
o RooAbsOptTestStatistic
- Follow changes in RooAbsTestStatistic
o RooAbsFunc
- Add virtual name() function to facilitate better error and warning messages from integrators
=== Date: Tue Apr 15 17:57:32 2008 ===
o RooMsgService
- Add option to prefix streamed messages with process ID to simplify
debugging of parallel fits
o RooAbsProxy
- Add optional addContents flag to print()
o RooArgProxy, RooSetProxy, RooListProxy
- Implement addContents flag in print()
o RooAbsReal
- Reimplement stack of logged error messages in terms of custom EvalError class.
A separate list<EvalError> is now kept for each object that reports an error.
In addition to the given error message a record is constructed of the proxy
values at the time of reporting.
- In printEvalErrors() add option to restrict number of reported items per node.
If number is zero, only number of errors per node is shown (without details)
o RooRealMPFE
- Adjust ReportErrors message to changes EvalError implementation in RooAbsReal.
- Make sure to synchronize remote error logging state with state of parent process
before each evaluate()
o RooRealVar
- Move printing of error from printValue() to printExtras()
o RooNLLVar
- Fix bug in setting of interleave parameter of base class in certain ctors
o RooAbsPdf
- Improve passing of eval error messsages by make separate messages for NaN
and negative values and including details in the error message
- Add PrintEvalError(Int_t nErr) option to fitTo() to control new eval error
message control system
- Int printValue show both value (raw from evaluate()) as well as most recently
used normalization value (if available)
o RooMinuit
- Interface new eval error logging control by adding setPrintEvalErrors(Int_t numEvalErrors)
=== Date: Thu Apr 24 15:11:59 2008 ===
o Various classes
- Fix all -Wshadow compiler warnings
=== Date: Thu Apr 24 16:32:21 2008 ===
o RooMsgService
- Use TSystem::GetPid() rather than getpid() for portability
o RooAbsReal
- Make nested class EvalError public
o RooWorkspace
- Fix windows compiler warning
========================================
o RooBanner
- Increment version tag to 2.40
Revision
21631 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jan 10 20:03:35 2008 UTC (7 years ago) by
wouter
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 30475 byte(s)
Diff to
previous 21286
***********************************************************************
* NOTE: THE FOLLOWING FILES MUST BE REMOVED BY HAND AFTER THIS COMMIT *
* WHEN UPDATING AN EXISTING RELEASE AREA *
* *
* include/RooNormManager.h *
* include/RooNormListManager.h *
* roofitcore/src/RooNormManager.o *
* roofitcore/src/RooNormManager.d *
* roofitcore/src/RooNormListManager.o *
* roofitcore/src/RooNormListManager.d *
* *
***********************************************************************
o RooNormListManager, RooNormManager
- Removed, now obsolete. Replacement is RooObjCacheManager
o RooNumber
- Add non-inlined accessor function infinity() to replace
static double inifinity to fix Windows linked problems
o RooStreamParser, RooCurve, RooRangeBinning, RooNumConvolution
RooHistError, RooTreeData, RooRealVar, RooBinning, RooErrorVar
- Follow migration of RooNumber::infinity()
o RooPlot
- Fix SetTitle()
o RooDataSet
- Initialize wgtVar ptr in default ctor
o RooAbsReal
- Redesign scheme to import non-double TTree branches
to RooAbsReal buffer to fix gcc warnings on
strict aliasing rules for type-punned pointers.
o RooAbsPdf
- Make globalSelectComp() non-inline to avoid
Windows linking problems.
o RooResolutionModel
- Fix crash in use of resolution models when completely
const-optimized by deleting _norm pointer on a
serverRedirect.
o RooAbsCategory
- Redesign scheme to import non-integer TTree branches
to RooAbsReal buffer to fix gcc warnings on
strict aliasing rules for type-punned pointers.
o LinkDef2.h, Module.mk
- Remove classes RooNormManager, RooNormListManager
o RooBanner
- Increment version tag to 2.31
Revision
21286 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Dec 10 10:26:28 2007 UTC (7 years, 1 month ago) by
brun
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 30462 byte(s)
Diff to
previous 21212
From Wouter:
o RooAbsSelfCachedPdf, RooAbsCacheElement, RooFFTConvPdf,
RooAbsCachedPdf, RooProfileLL, RooProjectedPdf, RooAbsCache
- Include forgotten RooFit.h header to fix Solaris compilation
problems (Savannah #32026)
o RooCacheManager
- Add multiple-inclusion guards around templateClassImp
to solve Solaris compilation problem (Savannah #32026)
o RooDataSet
- Change message level of information message in RooDataSet::read
from its mistaken ERROR level to INFO level (reported by Jim Smith)
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/src/RooDataSet.cxx
File length: 30462 byte(s)
Diff to
previous 21064
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/src/RooDataSet.cxx
File length: 29491 byte(s)
Diff to
previous 19826
o RooAbsCache
- New abstract base class for cache objects associated with RooAbsArgs.
Caches register themselves with the owning RooAbsArg and propagate
all necessary state changes and meta information to objects in the cache
o RooCacheManager
- Concrete template implementation of RooAbsCache with an interface
and functionality styled after RooNormListManager. The template class
provide no special handling for cache contents that includes RooAbsArg
objects and does not forward hook calls. It is thus mostly intended
to cache basic types indexed on a normalization/integration configuration
o RooObjCacheManager
- Class derived from RooCacheManager<RooAbsCacheElement> that implements
all proper call forwarding and handling of state and other meta information
to RooAbsArg objects embedded in the cache elements. To facilitate this
functionality the RooAbsCacheElement defines a pure virtual method
containedArgs() that must be implemented to expose its contents to
the cache manager. The default behavior on a serverRedirect hook is
to sterilize the cache. OperMode changes are not forwarded by default
to the cache contents as cached objects do not necessarily have the
same operation mode (e.g. if the cache contains an integral of its owner).
Any calls to optimizeCacheMode(), printCompactTreeHook(), and findConstantNodes()
are forwarded. Moreover, optimizeCacheMode() calls are remembered and
any objects inserted in the cache after such a call was received will be
optimized upon insertion in the cache
o RooAbsCacheElement
- Abstract base class for objects to be managed by RooObjCacheManager. Each
object must in addition to its payload implement the containedArgs()
member function that exposes the RooAbsArg object content to the manager
for processing. The argument passed to containedArgs() indicates the use
case for the returned list of objects, allowing the cache payload to
return different lists depending upon use. This is for most applications
not required.
o RooAbsCachedPdf
- Abstract base class derived from RooAbsPdf for p.d.f.s that implement
value caching in a grid over the entire domain of the observables.
The base class implements the overall caching logistics and manages
the RooDataHists and RooHistPdfs that respresent the cached contents.
Derived classes must inputBaseName() defined a unique name prefix for
all cache objects, actualObservales() and actualParameters() to
determined the actual observables and parameters given a set of
available observables and fillCacheObject() which should fill the
RooDataHist cache for a given obs/params configuration with the
p.d.fs values.
o RooAbsSelfCachedPdf
- Abstract base class derived from RooAbsCachedPdf that implements
all of the required logistics in RooCachedPdf and only require
derived classes from RooAbsSelfCachedPdf to implement evaluate().
Any class derived from RooAbsPdf can thus be trivially switched
to derived from RooAbsSelfCachedPdf and gain the caching functionality.
o RooCachedPdf
- Concrete class derived from RooAbsCachedPdf that implements
the caching of an externally provided p.d.f in the constructor.
o RooFFTConvPdf
- Concrete class derived from RooAbsCachedPdf that implement generic
numeric convolution of two input p.d.f.s using FFT technique
and convolution theorem. Actual FFTs are calculated by FFTW
through TVirtualFFT interface in ROOT. Present implementation only supports
convolution in one dimension, but this will be extended later
as there are no fundamental limitations in RooAbsCachedPdf nor FFTW.
o RooHistPdf
- Moved from RooFit to RooFitCore because it is used by caching classes
o RooProdPdf
- Use new RooObjCacheManager to store partial objects
- Fix memory leak (already patched in 15.0.14h)
o RooDataHist
- Use new RooCacheManager template to cache partial bin volumes
- Add new set(),setAllWeights() method to update current weight and all weights
respectively, for use in cached p.d.f.s
- Add sliceIterator() that iterates over all bins in a lower dimensional
slice of the dataset
o RooDataHistSliceIter
- Class derived from TIterator that implements the iteration
over a slice in a reduced number of dimensions in a RooDataHist
o RooMsgService
- Speed up processing of debug streams in cases where no debug streams are active
- add macros series oocoutX and oocxcoutX that allow to associate message with
a different object than *this
o RooRealBinding
- Interface new setValue method that allows value to be set outside default
domain, but inside given alternate named range. For use in numeric integrator
bindings
o RooAbsRealLValue
- Add new inRange() method with range name specifier to check against chosen
range instead of default range
o RooCmdConfig
- Fix dangling return pointer problem in decodeStringOnTheFly() method
o RooNameSet
- Fix bug in refoll()
o RooChi2Var, RooNLLVar
- Add processing of AddCoefRange() named argument
o RooConvCoefVar
- Hold p.d.f in proxy without value/shape state propagation to obtain
correct dependency of RooConvCoefVar through separate set proxy
with parameters that do have state propagation
- In getAnalyticalIntegral() ask for integration coefficient specific
to coefficient (following interface change in RooAbsAnaConv)
o RooEfficiency
- Follow interface change in RooCategoryProxy
o RooAbsAnaConvPdf
- Use new RooObjCacheManager to hold normalization and coefficient representations
- Extend getCoefAnalyticalIntegral() interface so that each coefficient
can have a separate integration configuration
- Modify makeCoefVars() such that it constructs the RooConvCoefVars with
actual dependents for each coefficients, rather than inserting dependencies
of any of the coefficients in each coefficient. This logic requires support
from the implementation class that is interface through a new member function
coefVars()
o RooAbsReal
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Remove superfluous _norm[] token in name returned by integralNameSuffix() if
no normalization set is supplied.
- Add a fillDataHist() method that fills a given RooDataHist with a sampling
of the given function. Added for support of caching p.d.f.s
- Downgrading warning on non-dependent projection variables in plotOn() to
a debug level message
- Remove function optimizeDirty(),doConstOpt(),undoConstOpt(),findCacheableBranches()
findUnusedDatasetVariables() and findRedundantCacheServers() as part of reorganization
of optimization functionality.
o RooAbsCollection
- Use iterator semantics instead of vector semantics to process RooLinkedList
contents in assignment operator
- Add utility function contentsString() returning stl string with names
of contents
o RooAddPdf
- Rewrite cache management using new RooObjCacheManager that holds projection
integrals, range integrals and supplemental normalization lists
o RooAbsOptGoodnessOfFit
- Improve handling of normalization ranges and reference ranges for test statistics
containing RooAddPdfs. New named argument in fitTo() and RooNllVar::ctor() pass
reference range for fractions in RooAddPdf components that do not have an explicit
fixed definition already. Name all normalization ranges explicitly after the
subrange to which the're applied to avoid name clashes and conflicts if multiple
normalization ranges are involved.
- Rewrite informational messages through RooMsgService
- Implement new constOptimizeTestStatistic() function that signals all test statistic
components of a RooAbsArg expression tree to perform their constant term optimization
- Implement new optimizeCaching() driver function that changes default lazy-evaluation-with-caching
scheme to test statistic scheme where only parameters objects propagate state changes and
where all components that depend directly or indirectly on observables have lazy evaluation
disabled. Changes to p.d.f objects are delegated to RooAbsPdf::optimizeCacheMode(). Changes
to dataset are delegated to RooAbsData::optimizeReadingWithCaching()
- Implement new optimizeConstantTerms() function that is back end for constOptimizeTestStatistic
implementation.
o RooAICRegistry, RooNormSetCache
- Remove tracking of allocation cycles of RooArgSets as this scheme is superseded by
memory pool mechanism for RooArgSet allocation
o RooMappedCategory
- Follow interface change in RooCategoryProxy.
o RooRealMPFE
- Follow reorganization of optimization functionality: implement new constOptimizeTestStatistic
function for forwarding to slave processes.
o RooRealVar
- Add new setVal() function with range name to facilite setting of values that are outside
default range, but inside specified alternate range. Needed for numeric integration and
certain RooAddPdf coefficient projection.
o RooAbsArg
- Make state management functions public [is/set][Value/ShapeDirty](), setOperMode90
- Add static _flipAClean boolean to support setACleanAdirty() static method.
- Implement mechanism for registration of cache objects with base class RooAbsCache.
Forward all calls to operModeHook(), redirectServersHook(), optimizeCacheMode()
and printCompactTreeHook() to all caches for further processing
- Define constOptimize() function and provide default implementation that forwards
to all servers
- Implement optimizeCacheMode() function that puts expression tree in optimized
caching for test-statistics operations (only cache/lazy evaluate nodes that
do not (indirectly) depend on observables
- Implement findConstantNodes() function that identifies all nodes that depend
exclusively on constant observables and >0 observables that are eligible
for precalculation and caching in test statistics operations by
RooAbsOptTestStatistic::optimizeConstantTerms()
- Define constOptimizeTestStatistics that signal an expression tree that any
embedded test statistic objects should perform their constant term optimization.
Default implementation in RooAbsArg forwards call to all servers.
o RooAbsPdf
- Use new RooObjCacheManager to manage normalization integrals cache.
- Process new SumCoefRange() option in fitTo() that sets the coeffient
interpretation range for all embedded RooAddPdf objects of which
the interpretation range was not explicitly set
- Extend interface of fixAddCoefNormalizationSet(): add extra argument
that controls if AddCoef normalization set are forcibly overruled
for objects that already have an explicit range setting.
o RooRealIntegral
- Add some informational messaging through RooMsgService, rewrite existing ones
- Speed up numeric summations by precreating the involved RooSuperCategory
in the ctor rather than in evaluate().
- Fix bug in dependency insertion: explicitly require servers to be value
server to avoid pulling in fake dependents.
- Remove obsolete data members
- Implement new setACleanADirty() function that atomically flips state of
all AClean objects to ADirty for the duration of the integration step.
Replaces the much more expensive prepareACleanFunc() that did this
only for the objects involved.
- Process factorizing terms in integral only if the list is not empty
- Process Jacobian terms in integral only if the list is not empty
o RooAddGenContext
- Adapt to cache management chanches in RooAddPdf
o RooNumIntFactory
- Use STL classes for internal memory management
o RooSetProxyy
- Implement operator new() and operator() delete as required because
RooArgSet implements them
o RooAbsGoodnessOfFit
- Store and forward AddCoefRange information for embedded RooAddPdf objects
- Implement constOptimizeTestStatistic() and forward to components
o RooErrorVar
- Follow inRange() interface change in RooAbsRealLValue
o RooConvGenContext
- Adapt code to make it work with both RooAbsAnaConv objects and
the newly introduced RooFFTConvPdf
o RooMinuit
- Follow reorganization of optimization functionality
o RooProjectedPdf
- Store projection using new RooObjCacheManager
o RooGlobalFunc
- Add RooFit::SumCoefRange() named argument for RooAbsPdf::fitTo()
and RooNLLVar::ctor() and RooChi2Var::ctor()
o RooClassFactory
- Extend existing makePdf(),makeFunction and makeClass() functions
to also accept RooAbsCategory arguments, to accept an optional string
inserted as the return value expression inserted in the
evaluate() method of the class created, as well as as option string
specifying one or more analytical integrations of the given function
expression that will be advertised in the generated getAnalyticalIntegral()
code and implemented in the generated analyticalIntegral() code
- Add makeAndCompileFunction() and makeAndCompilePdf methods that
generate the code and immediate compile it through ROOTs ACliC interface.
These functions have a simpler interface because the list of arguments
of the function to be created can be specified as a const RooArgSet&
rather than a string with a list of names, thus making it easier
for on-the-fly definition of compiled objects.
- Add defineFunction() and definePdf() methods define and compile
a function/pdf using the above functions and immediately instantiate
an object of the given type passing the specified RooArgSet arguments
to the constructor of the object. These functions make a compiled
equivalent of RooFormulaVar based on the TFormula interpreter, i.e.
RooAbsReal* f = new RooFormulaVar("f","D(1-2w)",RooArgSet(D,w)) ;
becomes
RooAbsReal* f = RooClassFactory::defineFunction("f","D(1-2w)",RooArgSet(D,w)) ;
o RooAbsCategory
- Add Boolean data member treeVar that indicates is value buffer is also
branch buffer of a tree. This information is already present in the RooAbsReal
but is relatively expensive to retrieve and is always needed in the inner
loop of data set operations. This extra member significantly speeds up operations
- Construct explit clean name for TBranch name if node is cached, equivalent
to what is done in RooAbsReal. Needed because new constOptimizer can also
cache RooAbsCategory objects
o RooArgSet
- Implement operator new() and operator delete() to implement memory pool scheme
for RooArgSets. The goal of this implementation is to insure that two RooArgSet
pointers are _never_ the same. This allows to RooNormSet cache manager to safely
and quickly index integration and normalization configurations by evaluating
the contents of a RooArgSet only the first time it sees it.
o RooSimultaneous
- Implement caching of partial integrals using new RooObjCacheManager
- Following interface change in RooCategoryProxy ;
o RooAbsData
- Defined pure virtual methods optimizeReadingWithCache() and allClientsCached()
o RooTreeData
- Implement optimizeReadingWithCache() which determines given a p.d.f to be
evaluated and a list of the nodes that are cached for it, which observables
in the dataset are no longer required because they are either not an observable
of the p.d.f, or they exclusively feed nodes that are cached. Reading of these
observables is disabled through SetBranchStatus().
- Move allClientsCached() utility function here from RooAbsReal.
o RooCategoryProxy
- Remove const char*() conversion operator in favor of a const char* label() method
to remove possibly ambiguities in C++ math expressions involving category proxies.
o LinkDef3.h
- Add newly defined classes
Revision
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/src/RooDataSet.cxx
File length: 29370 byte(s)
Diff to
previous 12082
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
12082 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 20 15:45:21 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 29335 byte(s)
Diff to
previous 12063
o RooBanner
- Update version number and copyright
o Many files
- Change <iostream> to "Riostream" to support compilation on platforms
that do not have iostream classes in namespace std
o RooAbsAnaConvPdf
- Fix bug in range integration in getAnalyticalIntegralWN()
- Change getCoefAnalyticalIntegral() signature to include rangeName in argument list
o RooAbsArg
- Add methods getObservables()/getParameters with const RooAbsData& argument
o RooAbsPdf
- Add support for Range(Double_t, Double_t) to specify fit range in fitTo()
- Migrate getMaxVal()/maxVal() to RooAbsReal [Gerhard]
- Fix bug in normalization of PDF projections over limited range: account for both
fraction of data in range and fraction of projection in range (calculation of latter
deferred to RooAbsReal::plotOn)
o RooAbsReal
- Migrate getMaxVal()/maxVal() from RooAbsReal [Gerhard]
- Add code in plotOn() to support normalization of PDF projections plotted in limited range
o RooAbsRealLValue, RooRealVar, RooErrorVar, RooLinearVar
- Change getBinning() so that it only creates a new binning on the fly if a newly added boolean argument
is true. Otherwise, return default binning
o RooAdaptiveGaussKronrodIntegrator1D, RooGaussKronrodIntegrator1D
- Declare prototypes for glue functions
o RooArgSet
- Fix readFromStream() and writeToStream() so that they are consistent with each other again for
both regular and scientific notation mode.
- Fix processing of include directives inside files in readFromFile()
- Suppress warning messages about ignored lines in files unless verbose flag is set. Add verbosity control
flag to readFromFile().
o RooCategory
- Support concept of ranges for categories as well through new member functions setRange(),addToRange(),
clearRange(),hasRange(),isInRange() and isStateInRange(). Ranges are named TLists containing a non-owned
subset of the possible RooCatTypes.
o RooCategoryProxy
- Make lvptr() const since it is.
o RooConvCoefVar
- Pass rangeName in getAnalyticalIntegral() to getCoefAnalyticalIntegral()
o RooPlotable, RooCurve, RooHist, RooEllipse
- Implement getFitRangeNEvt(Double_t, Double_t) that returns the number of events in the given sub-range.
o RooDataHist
- Fix bug using RooAbsData::plotOn --> using RooTreeData::plotOn
o RooGlobalFunc
- Add adjustNorm boolean argument to named argumentss Range()
o RooMultiCatIter
- Require that input is RooAbsCategoryLValue rather than RooAbsCategory.
o RooPlot
- Keep track of object that generated normalization event count in addition to event count itself.
This allows to later on calculate an event count in a limited range through getFitRangeNEvt(Double_t, Double_t)
o RooRealIntegral
- Support ranges in category summation in integration code.
o RooSimPdfBuilder
- Fix bug in unitarity constraint split of parameter in partial build: adjust formula for remainder fraction
so that it only uses the states that are actually built.
- Improve error handling
o RooSuperCategory
- Implement hasRange() and isInRange() functionality inherited from RooAbsRealLValue
o RooClassFactory
- New class that automatically generates code for PDFs and functions given a name and a list of argument names
o RooEffProd
- New class that implement product of PDF and efficiency function. Main feature is efficient implementation
of event generator in case input PDF has 'smart' event generator
o RooEffGenContext
- Generator context associated with RooEffProd
o Module.mk
- ROOT make file module needed to compile RooFit as part of ROOT
o make_roofit_installkit
- Script to package RooFit source as ROOT module for compilation with ROOT system
Revision
12063 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Jun 16 09:31:32 2005 UTC (9 years, 7 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 29450 byte(s)
Diff to
previous 11619
o RooFit.hh
- New global header file for compiler patches. Currently contains
single patch for SunOS imported from BaBar.hh
o All .cc files
- Include RooFit.hh as first header file
o RooAbsData
- Make all plotOn() methods public
o RooAbsProxy
- Include pragma to switch of VC++ warning C4355
"'this' : used in base member initializer list'"
which would otherwise be triggered on each proxy initialization.
(each proxy constructor _expects_ a base class ptr so the warning
is misleading)
o RooAdaptiveGaussKronrodIntegrator1D, RooDataHist, RooGaussKronrodIntegrator1D,
RooGraphSpring, RooMCIntegrator, RooPolyVar, RooTreeData
- Change pow --> TMath::power() to eliminate windows compiler warnings
o RooEllipse
- Change constant M_PI to TMath::Pi()
o RooGlobalFunc
- Change RooConst --> RooFit::RooConst as functions has been moved into namespace
o RooMath
- Add erf() and erfc() forwarder functions to TMath::Erf() and TMath::Erfc()
o RooRealConstant
- Move RooConst() function into namespace RooFit
o RooSimultaneous
- Remove one default parameter from implementation version of plotOn() to resolve
overloading ambiguity reported by AIX compiler
o RooTreeData
- Make nested struct PlotOpt public to avoid CINT access problems
o RooTruthModel
- Add explicit cast to fabs() of proxy as it gives warning in Windows C++
Revision
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/src/RooDataSet.cxx
File length: 29261 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/src/RooDataSet.cxx
File length: 28521 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/src/RooDataSet.cxx
File length: 28346 byte(s)
Diff to
previous 10648
o RooNameReg
- Registry for unique string name IDs. Converts a 'const char*' string into
a unique 'const TNamed*' and back. General purpose utility to to map
string identifiers to unique 32-bit numbers
o RooAbsReal
- In getAnalyticalIntegral(WN) and analyticalIntegral(WN) add extra argument
const char* rangeName to identify range over which integration should
be performed
o All RooAbsReal derived classes
- Modify getAnalyticalIntegral(WN) and analyticalIntegral(WN) to follow
change in RooAbsReal. Pass rangeName argument to min() and max() functions
of RooRealProxy to retrieve requested range instead of default range
o RooAbsArg
- Add virtual inRange(const char* rangeName) member function.
o RooAbsCategoryLValue
- Name change get/setFitBin() --> get.setBin(), numFitBins() --> numBins()
getFitBinWidth --> getBinWidth
o RooAbsCollection
- Add printLatex() method for formatted LaTeX printing of lists.
Supports named arguments Columns() to change number of columns,
Format() to change printing format, OutputFile() for printing
directly to file and Sibling() to print along side on or more other lists.
o RooAbsData
- Sanitize plotOn() arrangement: just keep version with RooCmdArg arguments
- Add optional rangeName argument to fillHistogram
o RooAbsGenContext
- Pass normalization set to expectedEvents() to support calculation of
fractional intergrals in extended term (e.g. in RooExtendedPdf)
o RooAbsLValue
- Name change: setFitBin(),getFitBin(),numFitBins(),getFitBinWidth() -->
setBin(),getBin(),numBins(),getBinWidth()
o RooAbsOptGoodnessOfFit
- Follow name changes in RooAbs(Real)Lvalue
o RooAbsPdf
- Modernize syncNormalization by using createIntegral internally
- Add getNormObj() function that returns const RooRealIntegral*
pointer to specified normalization integral. Takes optional
rangeName argument for calculation of fractional integrals.
- Sanitize plotOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Change expectedEvents() and extendedTerm() function signature to
take normalization set argument that can be used to calculated
normalization-dependent fractional integrals (e.g. in RooExtendedPdf)
- Migrate named argument global helper functions for plotOn() to RooGlobalFunc.cc
o RooAbsReal
- Modify createIntegral() method to take optional rangeName argument.
- Sanitize plotOn() and plotAsymOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Migrate named argument global helper functions for plotOn() to RooGlobalFunc.cc
- Add Name() feature to plotOn() to give chosen name to resulting RooCurve
- Add ProjectionRange() feature to plotOn() -- Project PDF only over limited
range as specified by range name to show finite width slices
in projection dimensions
- Add Invisible() feature to plotOn() which stores curve invisibly in
RooPlot.
- Add AddTo() feature to plotOn() which adds curve to existing curve
in Rooplot.
o RooAbsRealValue
- Name change get/set/hasFitMin/Max() --> get/set/hasMin/Max() etc.
o RooAcceptReject
- Follow changes in RooAbsRealLValue
o All numeric integrator engines
- Add "#include RooArgSet.hh" to compensate for removal of stray include in RooCmdConfig.hh
o RooAddPdf
- Add feature to fix interpretation of fractional coefficients in particular reference range
that can be different from default range
o RooChi2Var
- Migrate named argument global helper functions for constructor to RooGlobalFunc.cc
o RooCmdConfig
- Modify defineObject() to also be able to process arrays of objects
- Add process() method with 8 RooCmdArg arguments
- Modify getString() so that it can optionally return an empty string as a null pointer
o RooConvGenContext,RooConvIntegrandBinding
- Follow name changes in RooAbsRealLValue
o RooCurve
- Add constructor that takes two existing curves and two weights. New curve is construction
for OR set of points that define both input curves. Points on one curve that do not exist
on the other are calculate using interpolation.
o RooDataHist, RooDataSet
- Sanitize plotOn() functions
- Follow name changes in RooAbsRealLValue
o RooErrorVar
- Follow name changes in RooAbsRealLValue
o RooExtendPdf
- Completely rewrite using newly introduced fractional integral technology. Change
constructor to take optional const char* rangeName argument to denote restricted
range for expectedEvents() interpretation.
o RooFitResult
- Follow name changes in RooAbsRealLValue
o RooFormula
- Add new interface to make it work with ROOT version 4 as well as ROOT version 3
o RooGenProdProj
- Make it work with optional restricted integration ranges as well
o RooHist
- Add constructor that constructs RooHist from two existing RooHists. Both input
RooHist must have identical structure. In Poisson mode error is recalculated for
total number of events in each bin. In SumW2 mode errors of input RooHists are
combined.
o RooMCStudy,RooMinuit,RooNLLVar
- Follow changes in RooAbsRealLValue and RooAbsPdf::expectedEvents().
o RooNormManager,RooNormListManager,RooNormSetCache
- Make managers aware of range names that are associated with integral definitions.
o RooPlot
- Add optional argument to addPlotable(),addObject(),addTH1() functions to add
given object invisibly.
- Modify updateFitRangeNorm() to optionally refresh the normalization event count
even if it has already been set
- Add getObject() method that identifies object by index rather than by name
- Add internal RooPlot::DrawOpt class that conversion ROOT draw options and
RooPlot options from and to a const char* string.
o RooProdPdf
- Make it work with integrals over restricted ranges
o RooRealAnalytic, RooRealBinding
- Take optional rangeName argument in constructor that modifies output
of getMin() and getMax() functions
o RooRealIntegral
- Take optional rangeName argument in constructor and pass it to analytical integrals
and numeric integrators.
o RooRealProxy
- Modify min() and max() functions to take optional rangeName argument
o RooRealVar
- Follow name changes in RooAbsRealLValue
- Implement getFit*() functions for backward compatibility.
- Augment format() with extra LaTeX formatting options used
in RooAbsCollection::printLatex()
o RooTObjWrap
- Modify so that it can also store lists of objects in addition to single objects
o RooTreeData
- Sanitize plotOn() and plotAsymOn(). Only keep version with RooCmdArgs public.
Move implementation version in protected interface. Replace
way too long list of arguments with new internal
helper class RooAbsPdf::plotOpt, whose constructor sets all
the default options.
- Add Name() feature to plotOn() to give resulting RooHist chosen name
- Add XErrorSize() feature to plotOn() to explicitly control size of X error bars
- Add Invisible() feature to plotOn() to be able to store RooHist invisible to RooPlot
- Add AddTo() feature to plotOn() to be able to add RooHist to an existing RooHist
in RooPlot
- Add RefreshNorm() feature to plotOn() which causes normalization event count in RooPlot
to be refreshed with event count from this plot operation
- Add optional rangeName argument to fillHistogram()
o RooGlobalFunc
- Move all global helper functions that create RooCmdArg named arguments here
- Additionally create short-hand helper functions C(), L() and S() respectively
that create a RooConst, a RooArgList and a RooArgSet. These shorthand functions
are stored in namespace RooFitShortHand and thus not by default available
in the global namespace
Revision
10648 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 29 20:24:44 2004 UTC (10 years, 1 month ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 28364 byte(s)
Diff to
previous 10638
o All Classs
- Remove '#include BaBar/BaBar.hh' that was erroneously
introduced by the BaBar IOstream migration utilities
o Several class
- Initializion order changes, removal of unused variables,
addition of missing return statements to make all code
compile cleanly with '-Wall -Wno-parentheses'
o RooAbsFunc
- Make resetNumCall() const
o RooAbsIntegrator
- Add calculate() method that wrape integral() between
profiling code the track the number of integrand
function calls
o RooIntegrator1D,RooImproperIntegrator1D,RooSegmentedIntegrator1D,
RooSegmentedIntegrator2D,RooMCIntegrator
- Change interface to take RooNumIntConfig class instead
of now deprecated RooIntegratorConfig class
- Add member function that advertise capability of the integrator:
canIntegrate1D,2D,ND,OpenEnded()
o RooAbsReal
- Change normalization integral management classes
(createIntegral(), (set)defaultIntegratorConfig(),
(set)specialIntegratorConfig()) to work with new
RooNumIntConfig class.
o RooArgSet
- Add new convenience functions get/setRealValue(),
get/setCatLabel/Index(), get/setStringValue() to
manage common content of RooArgSet.
o RooConvCoefVar, RooConvGenContext
- Support class name change RooConvolutedPdf -> RooAbsAnaConfPdf
o RooCustomizer
- Add function setCloneBrancSet() that allows to specify
an external set that takes ownership of the cloned branch
nodes so that customized objects can live beyond the lifetime
of the RooCustomizer instance
o RooImproperIntegrator1D
- Add code to handle limit scenario changes (closed to open ended
and vice versa) on the fly
o RooIntegrator1D
- Add fixSteps option to terminate integral calculation after
fixed number of steps w/o extrapolation. This is more robust
for certain types of integrals
o RooRealIntegral
- Change interface to take RooNumIntConfig class instead of
RooIntegratorConfig class
- Delegate instantiation of numeric integration engines to
new class RooNumIntFactory
o RooNumIntConfig
- New class to store configuration of numeric integator engines.
This class has a brief common section with common properties
like absolute and relative precision convergence criteria,
and a section with implementation specific details for each
engine in the form of a RooArgSet. The default settings for
each existing engine are automatically added to the defaultConfig()
instance during run-time initialization
o RooNumIntFactory
- Factory class for numeric integration engines. Each existing
integrator engine automatically registers with the factory
stating its capabilities (1D,2D,ND / Open-ended). The
createIntegrator() function instantiates an integrator
appropriate for a given problem. In case more than one
integration engine can solve the given problem the (user
changable) information in the RooNumIntConfig passed along
with the call is used.
o RooGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,43, and 87 point rules in succession
until the desired accuracy is reached. Open-ended integrals are
automatically handled through a x -> 1/x coordinate transformation
o RooAdaptiveGaussKronrodIntegrator1D
- New integrator engine based on Gaussian quadrature techniques.
This implementation, taken from GSL 1.5 implements the Gauss-Kronrod
techniques where the error on the integral is take from the difference
between the Gauss and Kronrod techniques. These techniques share common
sampling points allowing to calculate the error without additional cost.
This integrator applies the 10,21,31,41,51 or 61 point rule and
recursively subdivides the integration domain until the desired accuracy
is reached. For integrands with integrable singulaties the Wynn epsilon
rule can be selected to speed up the converges of these integrals. Open
ended integrals are automatically handles through a x -> 1/x
coordinate transformation
o RooNumConvPdf
- New operator PDF class that implements numeric convolution of
any two PDFs. The calculation of the convolution integrand
is implemented in the auxiliary class RooConvIntegrandBinding,
which in turn can be integrated with any 1-D numeric integration
engine. The default integration method for convolution integrals
is the adaptive Gauss-Kronrod method, which appears to give the
most stable results. By default the integration is performed
from -inf to +inf, but can optionally be restricted to a sliding
window using the setConvolutionWindow class, useful for relatively
narrow resolution PDFs.
o RooAbsAnaConvPdf
- New name of RooConvolutedPdf to clearly distinguish its functionality
from RooNumConvPdf
Revision
6614 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 14 02:58:40 2003 UTC (11 years, 8 months ago) by
wverkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 28251 byte(s)
Diff to
previous 6406
o RooRealIntegral
- Interface segmented integrators (1D and 2D)
o All others
- Various fixes (mostly initialization orders in ctor,
unused variables) to achive clean complication
on Linux with '-Wall -Wno-parentheses'
o LICENSE
- Update copyright notice
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/src/RooDataSet.cxx
File length: 28272 byte(s)
Diff to
previous 5212
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
5174 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 27816 byte(s)
Diff to
previous 4542
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/src/RooDataSet.cxx
File length: 26572 byte(s)
Diff to
previous 4326
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
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/src/RooDataSet.cxx
File length: 25835 byte(s)
Diff to
previous 3833
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
3604 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jan 8 02:18:05 2002 UTC (13 years ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23369 byte(s)
Diff to
previous 3271
o RooTreeData,RooDataSet,RooDataHist
- Fix branch initialization for freshly unpersisted datasets
from ROOT I/O
o RooStreamParser
- Fix in putBackToken()
o RooRealVar
- Fix in configuration parsing in readFromStream()
o RooExtendPdf
- Fix typo in extended term calculation
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/src/RooDataSet.cxx
File length: 23288 byte(s)
Diff to
previous 3252
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
3240 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Nov 19 07:24:00 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23517 byte(s)
Diff to
previous 3220
o RooAbsArg
- Improved verboseDirty messaging a bit
o RooAbsCategoryLValue
- fix assignment operator (OSF compiler warnings)
- move RooAbsCategory& assignment operator here from RooCategory
o RooAbsPdf
- Improve verboseEval messaging a bit
- Add virtual fitContext() method that returns fit context
appropriate for top-level PDF
- Change fitTo() to use new fitContext method
- Add fitTo() method with added const RooArgSet& to specify
dependents to be projected with datat
o RooAbsReal
- Deprecate plot range / bins related functions
- Move frame() to RooAbsRealLValue
o RooAbsRealLValue
- Fix assignment operators (OSF compiler warnings)
- Add frame() method from RooAbsReal that passes the fit range/bins
to the RooPlot. Checks that ranges is not zero of open ended
- Add new frame() method that takes range and number of bins to
supercede the default (taken from fitrange/bins)
o RooAddModel
- Some fixes to normalization propagation when used as regular PDF
o RooArgList, RooArgSet
- Declare constructors with name (const char*) and from TCollection&
as 'explicit' to avoid funny implicit conversions (i.e. giving
a quoted string where a const RooArgSet& is expected would be ok...)
o RooCategory
- Move assignment operator from RooAbsCategory to RooAbsCategoryLValue
o RooDataHist
- Deprecate plotBins/Range propagation
o RooDataSet
- Force uniqe name of each THx created with createHistogram() by
adding static counter to name. (Without THx objects with the
same name supercede each other)
o RooErrorHandler
- include stdlib (OSF compiler warning)
o RooErrorVar
- Make inherit from RooAbsRealLValue instead of RooAbsReal.
Add methods and datamembers for fitRange/Bins
o RooFitContext
- Add support for dependent intergration via projection
- Change nLogLikelihood to take extended status from argument
instead of from _extendMode datamember
- Improve dirty state optimizer to only declare branches
as 'always dirty' that actually depend on the the dataset
variable
o RooHistError
- Remove default value of last arg in implementation
asymmetry ctor (Solaris compiler error)
- Change name of BinomialSum data members from _n,_N
to _n1,_N1 to work around bizarre Solaris compiler bug
o RooHistPdf
- Fix overzealous getAnalyticalIntegal()
o RooLinearVar
- Deprecate plotRange/Bins forwarding
o RooLinkedList
- Add optional hashtable lookup (off by default)
o RooHashTable
- Simple hash table implementation
o RooLinkedListIter
- Fix assignment operator (OSF compiler warning)
o RooMCStudy
- Changes due to plotRanges/Bins deprecation
o RooPlot
- Add ctor from RooAbsReal with alternate range and bins
- Add nameOf() utility function to access element properties
by index
o RooRealIntegral
- Implement dependent integration via projection
(i.e. simply treat those dependents as parameters)
o RooRealVar
- Deprecate plotRange/Bins interface
- Modify readFromStream/writeToStream to no longer read/write
plot ranges tokens (existing tokens will be ignored with
a warning message). Also change prefix of fitRange token
from F to L in preparation of renaming fitRange to limits.
readFromStream() currently still accepts F without warning
o RooResolutionModel
- Fix normalization behaviour when used as a regular PDF
o RooSimFitContext
- Add support for dependents normalized via projection
- Allow mixed extended/regular components in extended mode
o RooSimultaneous
- Change condition for extendability from having only extendable
PDFs to having any extendable PDF
- Deprecate custom fitTo()
- Overload fitContext() to return specialized RooSimFitContext
o RooStringVar
- Fix assignment operator (OSF compiler warnings)
o RooTruthModel
- Fix return values of evaluate/analyticalIntegral() (Solaris compiler
warnings)
o RooPolyVar
- New RooAbsReal derived class implementing a polynomial function
with RooAbsReals as coefficients
Revision
3220 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Nov 16 01:48:24 2001 UTC (13 years, 2 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23422 byte(s)
Diff to
previous 3150
RooHistError:
- add support for calculating binomial confidence intervals
RooHist:
- make Poisson errors default for normal histogram objects
- add ctor taking two TH1 objects for creating asymmetry plots with
binomial errors (not wired to RooAbsReal::plotAsymOn() yet)
Revision
3150 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Nov 1 22:52:22 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23455 byte(s)
Diff to
previous 3124
o RooAbsPdf
- In getVal() without normalization change to use
evalTracePdf instead of evalTrace (obsolete)
o RooAbsReal
- Change signature of static method createHistogram()
to take non-const RooArgList& as argument to avoid
overloading ambiguity with non-static createHistogram()
with RooAbsReal& in same slot.
- Fix asymmetry plotting. Relative normalization of positive
and negative component of functions asymmetry was not
properly accounted for
o RooAbsString
- Change internal storage mechanismg from char[1024]
to a heap based char array. Length can be specified in ctor
o RooArgSet
- Support input file sectioning in readFromFile()
o RooCustomizer
- Minor adjustment in verbose output
o RooDataSet
- In read(). wllow space in addition to ',' as separator between
file names
o RooFormula
- In DefinedVariable(), check that for objects of type 'cat::state'
the given state is actually defined in cat.
o RooSimPdfBuilder
- Use new custom string length of RooStringVar in various places
o RooStreamParser
- Change code to handle string tokens of more than 1024 chars
- Fixes in EOF detection logic
Revision
3124 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Oct 27 22:28:23 2001 UTC (13 years, 2 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23452 byte(s)
Diff to
previous 3076
A large number of small fixes and improvements
o Roo1DTable
- Modify Print() behaviour. Standard print will
only show non-empty fields, verbose shows all fields
o RooAbsArg
- Change getParameters so that it can accept 0 as
dataset pointer (implies no dependents)
o RooAbsPdf
- Follow plotOn() changes in RooAbsReal
o RooAbsReal
- Add optional const RooArgSet* projData argument to
plotOn(). Projected dependents that appears in this
dataset, if specified, will be projection via summation
over data instead of integration.
- Add clipInvalid option to bindVars() and propagate to
RooRealBinding
- Modify cleanBranchName() to truncate 'clean names'
(which are used for the TTree branch) to 63 chars
as cannot handle such cases (SEGV). In case name
is longer than 63 chars, truncate name at 46 chars
and suffix with _crc followed by hex representation
of CRC32 checksum of the full name.
- Add crc32() method to calculate the checksum of a string
o RooAddModel,RooAddPdf
- Do not evaluate PDF components multiplied by a zero coefficient
o RooAddPdf
- Fix DIV0 in analyticalIntegral if number of expected events
for all PDFs combined totals zero
o RooArgSet
- Add ability to readFromStream and readFromFile to optionally
flag read arguments with a user specified attribute
(Mostly useful to determine which elements have _not_ been read)
o RooConvolutedPdf
- Change declareBasis() signature from a RooArgSet& to a RooArgList&
to correctly handle cases where the names of parameters are identical
(e.g. tau=zero and dm=zero for prompt background models)
- Expand logic in RooGenContext. Add additional requirement for
use of optimized generator context: both the physics pdf and
the resolution model must support direct generation of the
convolution variable.
(Still have to fix RooAddModel/Pdf for cases where all components
can do direct generation)
o RooCurve
- Deploy RooRealBinding::clipInvalid feature to zero plotted functions
outside the validity range of their dependents
- Add extra points at (xlo,0) and (xhi,0) to obtain correct filling
pattern when using the 'F' draw option.
o RooCustomizer
- Add warnings for multiple split or replace rules on the same leaf
o RooDataSet
- Make read() take a const RooArgList& instead of a RooArgList&
and immediately make temporary copy for internal use.
- All constructors with string based cut: add default empty cut.
o RooFitContext
- Ctor: Compare limits on dependents in PDF and dataset if limits
of PDF are smaller and fully contained in those of the dataset,
adjust the dataset ranges in the internal copy and reject events
outside the PDF limits. If PDF ranges are not identical or fully
contained in dataset limits, give error message and abort.
- In fit() fix handling of parameters handed to TMinuit: set pmin/pmax
to the parameter value for constant parameters. For floating parameters
with open limits and without error, use 1/10 of the plot range
instead of 1/10 of the fit range.
o RooFormula,RooFormulaVar
- Change RooArgSet to RooArgList to pass formula parameters.
This allows construction of formulas with ordinal references
for list of parameters with multiple occurrences of the same
variable.
o RooRealBinding
- Add clipInvalid option, specified in ctor. If set, loadValues()
will first check if the values to be loaded are in the limits
of the bound objects dependents. If not the values are not loaded
and an invalid flag is set. If the invalid flag is set operator()
will return 0.
o RooRealVar
- Add various 'named parameter' functions on a trial basis
o RooSimFitContext
- Gracefully handle RooSimultaneous PDFs with missing PDFs.
o RooSimGenContext
- Forgot to set index state in theEvent RooArgSet when generating
the index category
- Remove forced normalization of index state in evaluate()
- Remove dummy plotOn() method and specialized plotOn() with data
method as projection over the index state can now be handled
the regular plotOn method. Overload RooAbsPdf::plotOn to
force caller to specify projection dataset for the index category
if projection over the index category is requested
o RooTable
- Remove print(), add default Print(Option_t *), and reimplement
printing via inheritance from RooPrintable
o RooTreeData
- In loadValues(RooTreeData*) explicitly check isValid() of
each element of _vars after copying. If any is invalid,
reject the event.
- In table() change simple clone of tableVar to deep clone.
Implement use of optional cut string (accidentally omitted sofar)
o RooTruthModel
- Add highly trivial direct generator for the convolution variable
o RooDataProjBinding
- New lightweight binding between an RooAbsReal and a dataset
that returns the projection of the real over the dataset
via summation. If the dataset only contains category variables
an supercategory of all the datasets categories is created
and the data is summed (with appropriate weights) over the
supercategory states instead of over every event.
Revision
3076 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sun Oct 21 22:57:02 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23371 byte(s)
Diff to
previous 3067
Fix some outstanding problems with datasets
o RooDataSet
- Keep track of gDirectory to which RooDataSet was added,
remove from that directory in dtor
o RooFitContext
- Fix normalization set problem when trimming data variables
- Make optimization messages a bit less verbose
o RooTrace
- Take out obsolete code (memory padding etc), modernize
the rest using RooLinkedList
o RooTreeData
- Add special and more efficient version loadValues for RooTreeData
in addition to existing version for a generic TTree
- Fix cache copying problem in protected ctor designed to copy
cache.
Revision
3067 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Oct 19 06:56:53 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23087 byte(s)
Diff to
previous 3015
o RooAbsArg
- Introduce static variable and function nameFieldLength()
that controls size of the name field when printing
in standard print mode. Default(0) makes field fit
name of object
- Introduce universal value assignment via virtual
operator=() to Double_t, Int_t, const char*.
Default implementation in RooAbsArg results in user
error message.
- Extend createFundamental() to optionally take a new name
as argument
- Add new pure virtual fillTreeBranch() method in which
subclasses must implement a method to fill their branches
in the given tree with their current value
o RooAbsCategory,RooAbsReal,RooAbsString
- Implement fillTreeBranch()
- Adjust createFundamental()
o RooAbsCollection
- Fix replace() to find correct replacement candidate if >1
object exists in list with name of variable to be replaced
- In printToStream() adjust RooAbsArg::nameFieldLength()
to size of longest argName contained in list
o RooAbsData
- Fix default ctor to instantiate unpersisted data members
o RooArgList
- Add operator[] taking index as argument, returning a
RooAbsArg&. If index is out of range, a softAbort() is
generated
o RooArgSet
- Add operator[] taking arg name as argument, returning a
RooAbsArg&. If index is out of range, a softAbort() is
generated
o RooErrorHandler
- New lightweight class implementing softAssert()
and softAbort() that will terminate processing
but not kill the root session.
o RooCustomizer
- Make inherit from RooPrintable and implement Print() method
o RooDataSet
- Add self to gDirectory() in every ctor to facilitate persistence.
Remove internal ttree from gDirectory to avoid unnecessary entries.
o RooFormula
- Disable conditional compilation pending investigation of some
obscure problems
o RooRealVar
- Add static functions printScientific() and printSigDigits()
that control formatting in print() and writeToStream().
- Augment format() to be able to print both value and error
with specified precision (instead of always using the precision
from the error when its printed)
o RooStreamParser
- Process continuation line sequences '\\' in readLine()
o RooStringVar
- Implement operator=(const char*)
o RooTreeData
- Change cacheArg() and cacheArgs() to use new column adding
technique implemented via fillTreeBranch()
- Change addColumn() and to use new column adding
technique implemented via fillTreeBranch().
Add new addColumns() member to do multiple columns at once.
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/src/RooDataSet.cxx
File length: 22828 byte(s)
Diff to
previous 3012
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
3012 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Oct 11 01:28:51 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 20711 byte(s)
Diff to
previous 2995
o RooAbsArg
- Extend dependsOn() methods with optional ignoreVar
RooAbsArg argument, which will be ignored in the
dependency determination.
o RooAbsCollection
- Introduce safeDeleteList() method that attempts
to delete the contents of the list in a safer order:
Iteratively, objects without any client in the list are deleted.
This effectively deletes a tree structure contained in the
list top down.
- Use safeDelete() in dtor and removeAl() methods of owning
collections
- Fix remove() member that assumed that every object has
a unique name. If matchByName is set, all objects that
match the given name will be deleted
o RooDataSet
- Introduce write(const char* filename) method that writes
the dataset out as an ascii file.
o RooErrorVar
- New auxiliary class that represents the error of a RooRealVar
as separate variable. This class allows to recycle existing
technology for calculations involving a RRVs error, such
as calculating the pull
o RooFitContext
- Store MINUIT final status in RooFitResult
o RooFormula
- Elaborate 'Formula doesn't compile error with offending construction
o RooMath
- Export interpolate() function as public
o RooMCStudy
- Reimplementation of most of RFTs RooMCStudy class
o RooRealIntegral
- Minor modification is storage of function normalization argset
o RooRealVar
- add errorVar() method that instantiates a RooErrorVar representing
the error of this RooRealVar
- Overload RooAbsRealLValue::attachToTree() to also attach
the error as a TBranch, resulting in persistence of the error
- Overload copyCache() to copy the error from another RooRealVar
o RooTreeData
- Cleanup header
Revision
2995 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Oct 8 05:20:24 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 20042 byte(s)
Diff to
previous 2969
Documentation update
--------------------
o Most classes
- Update inline documentation
o RooHtml
- Add MakeIndexNew() method that can create sub-index files
by topic. Similar to THtml::MakeIndex(), but topic is taken
from tag in file instead of subdirectory name
- Add MakeIndexOfTopics() method that creates master
index of index files by topic.
o All classes
- Provisionally assign one of the following topic tags to each class
PDF - Probability Density functions
REAL - Real valued functions
CAT - Discrete valued functions
PLOT - Plotting and tabulating
CONT - Container classes
MISC - Miscellaneous
USER - Other user classes
AUX - Auxiliary classes for internal use
o makedocs
- Modify to make new sub-index files and index of topics file.
(Description of topic tags is defined here)
Revision
2967 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Oct 3 21:54:00 2001 UTC (13 years, 3 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 12779 byte(s)
Diff to
previous 2798
Documentation update
--------------------
o RooAbsCollection, RooArgSet, RooArgList
- Update inline documentation
Misc small fixes
----------------
o RooAbsCollection
- Change name of _isCopy to _ownCont and change message
in printToStream accordingly
o RooArgSet
- Deprecate compact mode of readFromStream()/writeToStream()
as order of set can no longer be used to assign ascii fields
- Add readFromFile() and writeToFile() wrapper functions
around readFromStream()/writeToStream() for users convenience
o RooArgList
- Introduce readFromStream()/writeToStream(), compact mode only.
o RooDataSet
- Change read() method to take an ArgList instead of an ArgSet
as only the former can be used to match the fields of an ascii file.
Actual reading of file is now done by RooArgList::readFromStream()
in compact mode. Mapping to RooDataSets internal RooArgSet (which
potentially has a different order) is done by
RooAbsCollection::operator=()
Revision
2798 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 17 18:48:17 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 12645 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/src/RooDataSet.cxx
File length: 12647 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]
Modified
Tue Sep 11 00:30:33 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 17789 byte(s)
Diff to
previous 2787
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
Revision
2787 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Sep 10 18:51:18 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 28702 byte(s)
Diff to
previous 2779
o RooDataSet
- Gerhard pointed out one could only cut on variables in the destination
data set in a refining copy constructor. This is now fixed by attaching
the cut formula to the source set instead of the destination set.
In the process I eliminated the loadValues() with a string cut. Now
the ctor always needs to pass a RooFormulaVar ptr to loadValues()
Revision
2779 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Sep 6 20:49:16 2001 UTC (13 years, 4 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 28515 byte(s)
Diff to
previous 2765
Fix (hopefully all) outstanding problems in HEAD induced RooArgSet
changes
o RooAbsArg
- Modify error logic in findNewServer() to not assert if name
changing server change finds no new servers
o RooAddModel
- Change debugging print statements in ::convolution to show
RooAddModel as class instead of RooResolutionModel.
(convolution originally copied from RooResolutionModel)
o RooArgSet
- In removeAll() change Clear() to _list.Clear(). The former
didn't clear the list but went unnoticed because TObject apparently
has a Clear() member as well. Confusing...
o RooConvolutedPdf
- Improve error messaging in case a convolution integral cannot be
constructed
o RooDataSet
- Change RooArgSet::add() to RooArgSet::addOwned() in addColumn()
o RooResolutionModel
- Expand error messaging in convolution()
Revision
2742 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 24 17:28:40 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 25095 byte(s)
Diff to
previous 2735
RooArgSet:
- fix 2 stupid bugs that I introduced in the list->set migration
RooAbsData:
- initialize all data members in copy ctor (I had to guess the
right value for some of them)
- replace GetName() with other.GetName() in copy ctor (caused
occasional crash)
RooAbsData,RooDataSet:
- clean up memory management for AbsData::_vars by using addClone()
instead of add() and letting the _vars dtor handle the Delete().
Revision
2735 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 23:43:43 2001 UTC (13 years, 5 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 25178 byte(s)
Diff to
previous 2724
The following changes enforce set semantics in the public use of
RooArgSet's by removing the public TList interface.
RooArgSet:
- change base class from TList to TObject
- add protected data member THashList _list
- add inline createIterator() to export _list.MakeIterator()
- add inline getSize() to export _list.GetSize()
RooAbsArg,RooAbsData,RooAbsPdf,RooAcceptReject,RooConvolutedPdf,
RooCurve,RooFitContext,RooFitResult,RooFormula,RooFormulaVar,
RooGenContext,RooGenericPdf,RooLinearVar,RooMultiCatIter,
RooNameSet,RooPdfCustomizer,RooRealBinding,RooRealIntegral,
RooSetProxy,RooSuperCategory,RooDataSet:
- replace RooArgSet::MakeIterator() with createIterator(), etc.
RooAbsArg,RooArgProxy,RooSetProxy:
- move a block of duplicated code in RooAbsArg::redirectServers()
RooSetProxy::changePointer() and RooArgProxy::changePointer() into
a new RooAbsArg::findNewServer() member fn.
*** Outstanding problems now resolved by temporary cheater member
*** functions added to RooArgSet:
- RooConvolutedPdf uses RooSetProxy::At() and ::IndexOf()
- RooFitContext uses RooArgSet::At() and ::Sort()
- RooFitResult uses RooArgSet::IndexOf() and ::At()
- RooMultiCatIter uses RooArgSet::getCollection()
- RooPdfCustomizer uses RooArgSet::Sort()
- RooRealBinding uses At()
- RooSimFitContext uses RooArgSet::At() and IndexOf()
Revision
2724 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 23 01:21:48 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 25172 byte(s)
Diff to
previous 2705
o All RooAbsReal derived classes
- Changes signature of evaluate(const RooArgSet*) to evaluate()
o RooGenericPdf,RooSimultaneous
- Adapt to use _lastDataSet instead of argset passed via evaluate
o RooFormulaVar
- PDF dependents will be used unnormalized (following evaluate
signature change)
o RooAbsLValue
- New abstract lvalue class defining interface for setPlotBin()
needed for binned datasets
o RooAbsReal,RooAbsCategory,RooAbsString
- Implement setPlotBin() method
o RooAbsReal
- Change copyCache and attachToTree to be aware of 'Float_t'
branches in data sets
o RooDataSet
- Add constructor from TTree with RooFormulaVar cut specification
o RooAbs*
Inline documentation improved
Revision
2705 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Aug 18 02:13:11 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 24562 byte(s)
Diff to
previous 2696
o RooAbsData,RooDataSet
- Constructor: Move cloning of varList and checking for fundamentalness
from RooDataSet::initialize to RooAbsData::ctor
o RooFitResult
- New container class holding output of each fit: constant parameters,
initial and final value of floating parameters, edm, minNLL,
global correlations and correlation matrix. Special accessor
function give easy name-based access to corr-matrix elements or
rows
o RooAbsPdf,RooSimultaneous
- Change in signature from
'Int_t fitTo(const RooDataSet* data, Option_t*, Double* minVal)'
to
'const RooFitResult* fitTo(const RooDataSet* data, Option_t*)'
o RooFitContext
- Split data member _paramList in _constParamList and _floatParamList.
Only floating parameters are now passed to MINUIT.
- Change in signature from
'Int_t fit(Option_t*, Double* minVal)'
to
'const RooFitResult* fit(Option_t*)'
- new option "r" controls if RooFitResult is created (null ptr
returned otherwise)
o RooSimFitContext
- Follow changes in RooFitContext
Revision
2695 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 17 00:35:57 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 24894 byte(s)
Diff to
previous 2665
Groundwork for binned fits
o RooAbsData
- New abstract base class common to RooDataSet and yet to
introduced RooDataHist, which will hold N-dimensional
histograms to be fitted
o RooDataSet
- Make class inherit from RooAbsData
o RooAbsArg
- Add abstract createPlotBinIter() and getPlotBin() methods
o RooAbsReal
- Implement createPlotBinIter() and getPlotBin() methods
- Add getPlotBinCenter(ibin), getPlotBinLow(ibin) and
getPlotBinHigh(ibin) methods
- Add plotBinWidth data member and code to update it each
time if plotMin/Max/Bins changes.
o RooAbsCategory
- Implement createPlotBinIter() and getPlotBin() methods
o RooAbsString
- Implement dummy creatPlotBinIter() and getPlotBin() methods
o RooAbsBinIter
- New abstract base class for AbsArg bin iterators
o RooRealFixedBinTer
- New implementation of plotBin iterator for RooAbsReal
objects with a fixed grid binning.
o RooCatBinIter
- New implementation of plotBin iterator for RooAbsCategory
objects
Revision
2665 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Aug 10 22:22:54 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 25715 byte(s)
Diff to
previous 2655
o RooDataSet
- Make RDS contain a ptr to a TTree instead of a TTree
so that we can explicitly control the deletion order
of the TTree and its branches
o RooTrace
- Add option to do memory tracing without padding objects
o RooConvolutedPdf,RooResolutionModel
- Add bool's to keep track of basis function ownership and
make each object delete the basis functions it created/cloned
o RooFitContext
- Fix bug in dataset ownership logic: if dataset is not owned,
but dataset is optimized, the new optimized data set is
owned by the context regardless of the way it was constructed
o RooAddModel
- Do not clone components in RooAddModel::Clone() as this is
already taken care of in a tree clone operation
Revision
2655 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 9 01:02:15 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 25580 byte(s)
Diff to
previous 2626
o Many classes
- Simplify use of TString as this is suspected to cause spurious
TString memory errors
o Many classes
- Fix about a dozen of memory leaks reported by GC (mostly iterators)
o RooArgProxy,RooSetProxy
- Change order of multiple inheritance to put TObject (or derived)
first. This fixes vtable/vptr mishap on Solaris
o RooAbsArg
- Introduce dynamic_cast<> in changeNormSet() to cast the TObject
from the proxy list into a RooAbsProxy (needed in conjuction
with above change)
o Several classes
- Make destructor virtual, fix Clone() function signature to match
that of TObject
Revision
2626 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 25243 byte(s)
Diff to
previous 2619
o RooTrace
- New memory tracing utility (singleton class)
o RooAbsArg,RooDataSet,RooArgSet
- Install hooks for RooTrace in ctors and dtors
o RooThreshEntry
- Fix bug in copy ctor
o RooAbsReal,RooAbsPdf
- Move analytical integration support
(getAnalyticalIntegral,analyticalIntegral,
forceAnalyticalInt,selfNormalized) from RooAbsPdf to RooAbsReal
so that every RooAbsReal can be integrated
o All RooAbsReal derived classes
- Change signature of evaluate(),getVal(),traceEval(),checkDependents()
from X(const RooDataSet* dset) X(const RooArgSet* nset)
o RooAbsPdf
- Manage normalization caching with a RooArgSet listing the dependents
instead of a RooDataSet containing this list
- Remove obsolete nLogLikelihood function (now in RooFitContext)
o RooAbsArg
- rename setProxyDataSet to setProxyNormSet
- add getParameters(),dependentOverlaps() that
take a 'const RooArgSet*'
o Roo*Proxy
- rename changeDataSet() to changeNormSet()
o RooConvolutedPdf
- Replace dummy data set for convolution normalization by an RooArgSet
o RooDataSet
- Remove inheritance from TTree, make it contain a TTree instead.
Forward all relevant TTree member functions. Add correct Clone()
function (now possible due to inheritance change)
o Various classes
- Fix const handling to eliminate Linux2 compiler warnings
Revision
2619 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Aug 1 01:24:08 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 24815 byte(s)
Diff to
previous 2612
o RooAbsPdf
- Hold in addition to _lastDataSet a RooNameSet with the names
of the members of that dataset. If (_lastDataSet != dset) in
syncNormalization, first check if contents of _lastDataSet
is different from dset before redoing the normalization.
If >1 RooConvolutedPdf share a RooResolutionModel, the resolution
model will receive syncNormalization calls for the dummy data
sets contained in all RooConvolutedPdf. All these sets contain
most likely the same set of variables and a recalculation is
thus not necessary.
We cannot use _lastDataSet->get() to get the name list of the
previously used data set because that dataset might no longer
exist
o RooAddModel,RooAddPdf,RooProdPdf,RooSimultaneous
- Change signature of selfNormalized(const RooArgSet* depList)
to selfNormalized(). Partial self-normalization is an ill-defined
concept at this level. The original reason for introducing this
(RooConvolutedPdf objects insisting on handling integrals delegated
to their convolution integrals) has meanwhile been replace with the
forcedAnalyticalInt() method
Revision
2612 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jul 31 05:54:23 2001 UTC (13 years, 5 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 24698 byte(s)
Diff to
previous 2487
o All RooAbsArg derived classes
- Change clone() to clone(const char* newname=0) to facilitate cloning with alternate names.
o RooAbsArg
- Add another layer to link management: operMode. If operMode=auto, all behaves
as before. If operMode=AClean, the arg assumes the cache is always clean and
getValueDirty() will always return false. If operMode=ADirty, the arg assumes
the cache is always dirty and isValueDirty will always return true.
The ADirty and AClean modes are used by the optimizer in the fit context
to shut down link management (and save time) for cases where the arg is
always dirty after a dirty state propagation from one of the dependents.
The AClean mode is used similarly for args that are cached in the dataset
The setOperMode() member is protected as care should be taken in switching modes.
It is the callers responsability to ensure that the claimed state (especially
in case of AClean) is indeed correct.
- Split setValueDirty(Bool_t flag) in setValueDirty() and clearValueDirty().
The latter is trivial and can be inlined to save time.
- redirectServers() now has an optional nameChange flag that allows to reconnect
to servers with different names. If the option is enabled, a link will be reconnected
to the server with a 'ORIGNAME:<servername>' attribute instead of a server with <servername>
This feature is used by RooPdfCustomizer.
- Added recursive printDirty() member that listed dirty state of arg and all its servers.
- Add sorting capability by implementing IsSortable() and CompareTo() members.
Sorting will result in alphabetical ordering by object name.
o RooAbsCategory
- Change tree attachement: store both label and index fields in tree instead of
just the index field. Looking up the corresponding label turns out to be rather
expensive, especially if many state are defined.
- The postTreeLoadHook() mechanism that formerly implemented the index lookup
has been abandoned completely (save 1 virtual function call per data set load).
o RooAbsPdf
- Change function call structure of eval tracing a bit to reduce the number
of calls per trace from virtual calls to 1 concrete call.
- In syncNormalization, if the data sets are different, first check if they
also have a different contents before processing the change. (Save multiple
identical normalization calculations for cases were a resolution model is
shared by >1 RooConvolutedPdf. (WVE Caveat: this has some problems: code will
die if cached data set is deleted before pdf. Will fix this soon)
Install pre- and postSyncNormalizationHook functions that can be used to customize
the call. Used by RooConvolutedPdf to create/update dummy data sets used to
push down partial integrations to the convolution integrals.
- Move nLogLikelihood to RooFitContext
o RooAbsReal
- in attachToTree(), mangle name of object in tree to exclude math symbols that
are interpreted by root in certain circumstances
o RooAddModel
- Store coef and proxy iterators in class instead of creating them on the fly each
time in evaluate()
- Release ownership of proxied resolution models in the copy constructor. If the
AddModel is copied, the proxied components will be owned by the list created
by RooArgSet::snapshot().
- Include name of AddModel owner in component resolution model to avoid multiple
identically named object in certain PDF configurations
- Export 'master list' of combined normalization leaf node servers of all components.
The convolutedPdf needs this for it's own dependency calculation
o RooArgSet
- Add silent option to remove()
o RooCatType
- Store name in char[] instead of in TNamed::fName (a TString) so that
the name can be attached to a Tree. (A TString is not a TObject)
o RooConvolutedPdf
- Push integration of all dependents that do not overlap with the coefficients
to the convolution integrals, instead of just the convolution variable
o RooDataSet
- Add new constructor that allows to specify the cut as a RooFormulaVar object
instead of a string. This allows to cut on function arguments that are not
part of the data set
- Allow to switch off dirty state propagation after a row-load operation
(can be used in certain optimization scenarios)
o RooFitContext
- Add option to not clone either dataset or pdf on construction
- Remove non-RooRealVar parameters from master parameter list to prevent that
MINUIT chokes on them
- Sort minuit parameter list alphabetically
- Add cache optimization option, which shuts down all link management for the
all pdf value components (not normalization). This can save a significant amount
of time, especially for very complex PDFs as the number dirty propagations scales
with the square of the number of nodes. Use newly introduces AClean and ADirty
modes to ensure proper evaluation of PDF nodes
- Add option to execute migrad with 'strategy 0', which skips the evaluation of
the error matrix. (Saves time if you do that later with HESSE anyway)
- Move nLoglikelihood() function from RooAbsPdf to here.
- Improve readability of messages in fitting in log-mode: print on screen only value
and name of parameters that change instead of dumping all their values all the time.
The old format has been retained in the log file, to allow automated processing of such files.
o RooFormulaVar
- Also update _origList on a serverRedirect
- Export ok() function of RooFormula (indicates if expression compiled ok)
o RooMath
- Add fast, interpolated, complex error function. Upon first use separate lookup tables
are filled for the im and re part of the complex error function. New functions will
do a 2nd or 3rd order 2D interpolation (depending on z) of the lookup table for either
the re part, the im part or both. Precision is better that 1e-6 in ~99% of covered
phase space. Imprecise regions are in problematic part of cErf where giant fluctuations
occur. Typical likelihood calculated with interpolated cErf agrees in the first 10
significant digits. Interpolation function is ~3.5 times faster than original CWERF
implementation, when only 1 component (im/re) of cErf is needed (most cases).
Interpolation function taken from Numerical Recipes and further optimized for
fixed grid assumption
o RooMappedCategory
- Clone also MapCatEntries in RooMappedCategory copy ctor
o RooProdPdf
- Store coef and proxy iterators in class, instead of instantiating them on the fly
in evaluate()
- Add optional cutoff parameter. If running PDF product goes below cutoff, product
calculation is terminated (default value=0, very small values like 1e-15 can be
benificial in case of wide window calculations a Gaussian + something flattish)
o RooRealIntegral
- Allow and perform integration over variables that input function doesn't depend
on (multiply integral by product of ranges of such variables)
o RooResolutionModel
- In convolution(): append name of owner to convolution, to avoid non-identical
convolutions with the same name in certain PDF configurations
- Forward redirectServers to basis function
o RooSimultaneous
- Overload fitTo() to create a RooSimFitContext instead of a RooFitContext
which allows certain additional optimizations specific to RooSimultaneous
- Normalize by the number of registered PDFs instead of the number of types
defined by the index category (allows to to partial fits)
o RooStreamParser
- Take '}' and ';' out of the default punctuation list so that RooSuperCategory
state names do not get broken up into multiple tokens
o RooThresholdCategory
- New category class that applies a series of thresholds on a RooRealVar to
define its state.
o RooThreshEntry
- Support class for RooThresholdCategory
o RooPdfCustomizer
- Utility class that serves a factory to build multiple PDFs from a single prototype
that have slightly different leaf nodes.
The class takes a proto type and a master index category in the constructor.
A series of splitting rules determines how given leaf nodes are to be 'split'
over the master index category or a subset of the master index (in case the master
index is a RooSuperCategory)
The instiated 'split' leaf nodes are put in an argset referenced in the constructor.
and the owner of the argset is responsible for deleting them (or passing them on
to another RooPdfCustomizer). The instantiated branch nodes are owned by the customizer.
o RooSimFitContext
- Specialized fit context, derived from RooFitContext, that optimizes the likelihood
calculation in case the top level pdf is a RooSimultaneous. The original data
set is broken into pieces, corresponding to a single state of the RooSimultaneous
index category and those data subsets are combined with the corresponding PDF branches
of the RooSimultaneous to form an array of regular RooFitContexts. The total likelihood
is calculated as the sum of the likelihoods from the array of fit contexts.
The NLL output from each subcontext is cached and only recalculated if a parameter
that the PDF of that subcontexts depends on, is changed.
This form of calculation is very efficient for fits where the correlation matrix has
a block diagonal form. The CPU time in RooSimFitContext scales (approximately) with
the number of elements in the block diagonal elements instead of with the total number
of elements.
o Nearly all classes
- A large number of minor bugs has been fixed and many functions
that are called very frequently have been inlined, made non-virtual or
have been eliminated, following the result of repeated profiler studies.
Revision
2423 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon Jun 18 21:04:21 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 23216 byte(s)
Diff to
previous 2415
o RooAbsArg
- Small change in verbose dirty printing
- Export iterators for value and shape client lists
o RooDataSet
- Add new constructor from RooDataSet that preserves cache.
This ctor is needed for data trimming by RooFitContext
o RooFitContext
- Add data set optimization: trim all unneccesary branches from
data set own by fit context. These are a) RooAbsArgs that
the PDF doesn't depend on, b) RooAbsArg that exclusively serve
cached PDFs.
Revision
2405 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Jun 12 19:06:27 2001 UTC (13 years, 7 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 22642 byte(s)
Diff to
previous 2222
o RooAbsArg
Make client list iterators used in setValueDirty()/ShapeDirty()
data members of RooAbsArg. (Fixes memory leak observed by John Back)
o RooAbsReal
Allow optional scale factor in plotOn()
o RooFormula
Pass dataset pointer in eval() and forward it to DefinedValue()
where real arguments are evaluated
o RooFormulaVar
- Forward data set argument in evaluate() to RooFormula
- evaluate() formula in ctor if RFV has no servers
(i.e. constant string expression), because for these
cases evaluate() gets never called as non-server
RooAbsArg are never dirty by construction.
- Add constructor that allows a title different from the formula expression
Revision
2167 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri May 11 06:30:01 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 21181 byte(s)
Diff to
previous 2166
o RooAbsArg
- In destructor, only print out warnings about live clients
that get cut off in verboseDirty() mode.
For automatically declared RooAbsArg this error condition
never occurs, but for client/server links in lists, the
order of deletion doesn't take these link directions into account.
o RooCategory
- Disallow defineType("") with a semicolon in the name.
This would confuse the reverse mapping of
RooSuperCategory::setIndex()/setLabel()
o RooArgSet
- Make default clone/copy ctor not copy the contents of the
list (Some core classes changed that used this feature)
- Extend snapshot function to ::snapshot(Bool_t deepCopy)
which allows to make both shallow (only list contents copied)
and deep snapshots (also all dependents of list contents
copied and added to list)
- Modify replace() to use AddBefore();Remove() instead
of Remove();Add() so that a replace call doesn't interfere
with an iterator over the RooArgSet
o RooRealIntegral
- Change dependent type checking from RooRealVar/RooCategory
to RooAbsRealLValue/RooAbsCategoryLValue
o RooSuperCategory
- Add MakeIterator() function which returns a RooMultiCatIter
on the super categories servers.
- Implement setIndex/setLabel(), which decodes the composite super
label into labels of the input categories
- Make use of new RooSetProxy which proxies the RooArgSet list
of input categories
- Enhance verbose printing
o RooGenCategory
- Port/rewrite from RooFitTools. User method scanned for all states
and translated into a
'SuperCategory type-index -> GenCategory type-index'
map (int-to-int via a simple array), making the class substantially
faster. The mapping is revised upon a shapeDirty() which is
propagated from all the input categories
o RooAbsCategory
- New abstract common base for RooArgProxy and RooSetProxy
o RooSetProxuy
- Proxies a RooArgSet. Essential service provided: upon a
redirectServers the list contents is replaced with the
new pointers from the redirection list.
Revision
2166 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri May 11 00:45:49 2001 UTC (13 years, 8 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 21180 byte(s)
Diff to
previous 2165
RooAbsReal:
- add frame() method which returns an empty RooPlot* for this object
- rename plot(RooPlot*) to plotOn(RooPlot*) for more readable macros
- remove plot(RooRealVar&) method: use y.plotOn(x.frame()) instead
RooDataSet:
- rename plot(RooPlot*) to plotOn(RooPlot*) for more readable macros
- remove plot(RooAbsReal&) method: use data.plotOn(y.frame()) instead
- plotOn() uses RooPlot::addPlotable() instead of addHistogram()
RooPlot:
- remove origPrint() method (assuming it was only for debugging)
- remove addHistogram(): use addPlotable() instead
- change signature and behavior of addObject(): object is no longer cloned
- add new method addTH1() for 1D ROOT histograms
Revision
2164 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 10 18:58:48 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 21084 byte(s)
Diff to
previous 2158
*** Changes to allow a dataset to cache of derived objects ***
o RooAbsReal, RooAbsCategory and RooAbsString
Now each implements a protected method attachToTree, which allows to
connect the cache of any RooAbsArg to a TTree column
All other implementations (RooRealVar etc) removed
o Most classes
Type-blind assignment RooAbsArg* <...>::operator(const RooAbsArg*)
has been replaced by RooAbsArg::copyCache(RooAbsArg *), which is
needed for data set copy operations.
A new method RooAbsArg::syncCache(RooDataSet *)
can be used force to update the cache before a copyCache call.
o RooDataSet
- Holds a list of _cacheVars in addition to _vars, which are not
owned by the data set, but are updated nevertheless.
The cache list is not copied in a Clone() or copy operation.
- New methods cacheArg(RooAbsArg&) and cacheArgs(RooArgSet&)
register derived objects for caching in the dataset.
The values for these derived objects for each row of the tree
will be calculated and stored as a new column in the tree.
The cache of the derived object is attached to that tree column.
On a RooDataSet:get() row-load call, a setDirty(kTRUE) is called
for each cached (and uncached) object to propagate a value change
to the cached objects clients. Then immediately a setDirty(kFALSE)
is performed on the cached objects, to impose that the tree-loaded
value of the cache is correct and doesn't need to be recalculated.
o RooFitContext
- Optimizer not uses cacheArgs instead of addColumn, which
is integration-safe and can now be used on any derived object
with constant parameters
o RooAbsPdf
- Another iteration in the structure of getVal.
To make data set attachement work, the normalized value is
now stored in the cache instead of the raw value.
*** Cleanup of assignment operator ***
o RooAbsRealLValue/RooAbsCategoryLValue
- Implements assignment to Double_t/(Int_t,const char*)
o RooRealVar/RooCategory
- Implemements assignment to RooRealVar/RooCategory
o All other assignment operators deprecated
- No more assignment of derived types to each other
(conceptually unclear)
Revision
2158 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 10 00:16:09 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 18757 byte(s)
Diff to
previous 2114
o RooAbsArg
- Small change in 'Standard' printing logic
- isXXXDirty() will always return kFALSE if isDerived is kFALSE
o RooAbsCategory
- Absorb caching/evaluation code of RooDerivedCategory
- Add defineType(const char*) (without index code)
- Add clearTypes() ;
o RooDerivedCategory
- Retired
o RooAbsCategoryLValue
- New abstract base class for LValue categories
(e.g. RooCategory, RooSuperCategory)
o RooCategory:
- Add methods that publicize the defineType/clearType
members of RooAbsCategory
- Implement getIndex()/Label() that bypasses caching mechanism
o RooMappedCategory
- Complete rewrite using wildcard regular expression mapping
of labels. Hard-coded number mapping deprecated
o RooMapCatEntry
- New auxiliary class for RooMappedCategory
o RooSuperCategory
- New, functionality similar to version in RooFitTools,
but rewritten from scratch
o RooAbsReal
- Absorb caching/evaluation code of RooDerivedReal
- Absorb analytical integration support code of RooDerivedReal
- Absorb range checking code from RooRealVar
o RooAbsRealLValue
- New abstract base class for LValue reals
(.e.g RooRealVar, RooUnblind*)
o RooDerivedReal
- Retired
o RooRealVar
- Implement concrete getVal() that bypasses caching mechanism
o RooProdPdf
- New, functionality similar to version in RooFitTools,
but rewritten from scratch
Revision
2114 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu May 3 02:15:56 2001 UTC (13 years, 8 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 18806 byte(s)
Diff to
previous 2112
o (Most classes)
Merge X(const x&) and X(const char*, const X&) copy constructors
into a single X(const& X, const char*=0)
o RooAbsArg
- Add 'depth-aware' client-server management functions
recursiveRedirectServers(...)
treeNodeServerList(...)
leafNodeServerList(...)
branchNodeServerList(...)
overlaps(...)
dependsOn(...) (now recursive)
- Add/move parameter/dependent interpretation to RooAbsArg
getParameters(...)
getDependents(...)
dependentOverlaps(...)
checkDependents(...)
- Change Clone() to Clone(const char*) and make it call
a pure virtual clone().
o RooAbsPdf
- First implementation
- Actual fitting implemented in RooFitContext
- Incorporates normalization technology from
RooNormFunction (now retired)
- Separate getValNorm() dropped in favour of
getVal(const RooDataSet* =0)
- getVal(...) provides all owned proxies with
the correct data set (which they need for their
value cast operators that don't take an RDS)
o RooFitContext
- First implementation
- Owns a clone of a dataset and a PDF and ties them
together with a redirectServers
- Caches indexed parameter list for fast Minuit lookup
- global Optimizer function seeks out PDF components
that only have constant parameters and add these
as precalculated columns to the data set clone
(redirectServers edits PDF tree to point to cache)
o RooDataSet
- Implement addColumn(RooAbsReal) that adds a column
of precalculated values given function for each
row of the data set
o RooAbsReal
- Change getVal() to getVal(const RooDataSet* set=0)
to allow dynamic normalization for PDFs.
o RooArgProxy and dependents
- Cache last data set used, for use in getVal(...) call in
value cast operator.
o RooRealProxy
- add min()/max() functions that get out the integration limits
if the underlying real is a RooRealVar. (Needed by RooAbsPdf
analytical integration implementations)
o (Most classes)
- A large number of minor fixes have been applied to make
the Solaris 5.7 compiler happy
Revision
2112 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed May 2 18:09:00 2001 UTC (13 years, 8 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 17807 byte(s)
Diff to
previous 2033
RooHistError:
- new singleton utility class for calculating histogram error bars
RooPrintable:
- lessVerbose() maps Shape & Verbose to Standard
RooAbsArg:
- use writeToStream() for Standard printToStream()
- fix iterator memory leaks in dependsOn() and printToStream()
- copy ctor with name arg uses other object's name if strlen(name)==0
so that the Clone(const char *name= "") operator can use this copy ctor
(maybe we don't need copy ctors w/o name args any more?)
RooAbsArg,RooAbsReal,RooRealVar,RooAbsCategory:
- remove dedicated Standard printToStream()
RooAbsReal:
- implement plot() methods
- add binding method using f(x) syntax (see RooRealFunc1D)
RooRealVar:
- change default fit range in ctors to (-INF,+INF)
- change Clone() signature to match TObject::Clone()
RooFormula:
- multiply-inherit from RooPrintable & implement printToStream,Print
- make actualDependents() const
RooRealFormula:
- standardize printToStream()
- change Clone() signature to match TObject::Clone()
RooCurve:
- new class for smooth 1-dim curve (analog of RooHist)
RooPlotable:
- abstract interface for plotable objects (RooHist,RooCurve)
RooAbsFunc1D:
- abstract interface for evaluating real-valued func of one real var
and performing numerical algorithms on it (1D numerical integrator
should go in here...)
RooRealFunc1D:
- implementation of AbsFunc1D that binds an AbsReal with a RealVar
*** Things to discuss with Wouter:
- remove name from ArgSet ctors? (or make it optional?)
- add optional plot range & unit to some DerivedReal ctors, eg, RealFormula?
- RealFormula: arg is added to list of actual dependents each time it appears
(eg, "1+x*x" -> x is listed twice as a dependent)
- there an overloading ambiguity between:
TObject *Clone();
TObject *Clone(const char *name= "") const;
- do we need copy ctors that don't take a name arg?
- const cast errors in RooAbsIntegrator and RooRealIntegral
- should dependsOn() be recursive by default?
Revision
2033 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Apr 21 02:42:44 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 17754 byte(s)
Diff to
previous 2032
o Implement concept of dynamic parameter/dependent distinction
in RooNormFunction. Every function that needs this information
has to supply a RooDataSet* to define what are the dependents
Several changes propagate into RooRealIntegrator.
Revision
2032 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Apr 21 01:13:11 2001 UTC (13 years, 9 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 17800 byte(s)
Diff to
previous 2002
RooPlot:
- standardize printToStream() / Print()
- implement GetBinContent() method to avoid missing virtual func warning
- _plotVar is now a clone and renamed to _plotVarClone
- move responsibility for creating a RooHist from a TH1 into a RooHist ctor
- add member fns to rearrange drawing order, and change line/fill/marker
style attributes or Draw() options.
RooDataSet:
- comment out noisy line: data->_vars.writeToStream(cout,kTRUE);
- rename Plot() to createHistogram() and add optional histName parameter
- add extra const's in plotting member fns
RooHist:
- multiply-inherit from RooPrintable and standardize printToStream/Print
RooAbsReal:
- replace sprintf() with TString operations in createHistogram()
RooList:
- add new class based on TList to get access to some protected members and
improve support for working with the drawing options associated with a
list element.
Revision
2002 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 18 20:38:03 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 17201 byte(s)
Diff to
previous 1985
o Add RooMultiCatIter, which iterators over all permutations
of states of a list of RooCategories
o Implement summing part of RooRealIntegral, using RooMultiCatIter
o Add RooNormFunction, an autonormalizing function, which defines,
in addition to the inherited getVal(), getNorm() and getValNorm().
o Miscellaneous fixes to make shape/value dirty propagation work
correctly for integrals and normalized functions.
Revision
1985 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Apr 14 00:43:20 2001 UTC (13 years, 9 months ago) by
davidk
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 17163 byte(s)
Diff to
previous 1981
RooCatType:
- multiply-inherit from RooPrintable and standardize printToStream()
- remove Int_t() and Int_t&() cast operators
- operator==(const RooCatType&) requires index and label to match (was just index before)
RooAbsCategory:
- add lookupType(const RooCatType&) which was being faked using RooCatType::Int_t() before
- delegate equality tests in lookupType() methods to RooCatType::operator==() methods
- delegate printing of RooCatType's to RooCatType::printToStream()
RooMappedCategory:
- standardize printToStream()
- change a!=b into !(a==b) for RooCatType a,b (op!= was being faked by RooCatType::Int_t())
- add setShapeDirty() in addMap()
RooAbsArg:
- use AbsArg::printToStream(OneLine) to print client,server info in printToStream(Verbose)
RooPlot:
- add getPlotVar() member fn
RooDataSet:
- add const plot(RooAbsReal&) and plot(RooPlot*) methods to eventually replace Plot()
- make Plot() const and remove the unused options argument
- const_cast our ArgSet in Plot() so we can call redirectServers()
RooFormula:
- make ctor ArgSet argument const to allow DataSet::plot() to be const
Revision
1981 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Apr 13 00:43:57 2001 UTC (13 years, 9 months ago) by
david
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 16274 byte(s)
Diff to
previous 1969
RooRealVar:
- remove Double_t() and Double_t&() cast operators (let's at least try...)
- add inline methods to set/get infinite limits (one-sided limits are ok)
- replace hasFitLimits() with hasFitMax() and hasFitMin() for one-sided limits
- update writeToStream() to output +INF and -INF *** parser needs to be updated ***
- update printToStram() to output +INF and -INF
- fix typos in setFitMin()/Max()
RooAbsCategory:
- standardize printToStream()
- swap order of args to defineType() for backwards compatibility with RFT
RooDataSet:
- update usage of RooAbsCategory::defineType()
Revision
1952 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Apr 11 00:54:37 2001 UTC (13 years, 9 months ago) by
davidk
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 16068 byte(s)
Diff to
previous 1900
RooPrintable:
- new class that defines printToStream() virtual method and provides
helper functions for converting Option_t -> PrintOption and one-line
printing
- subclasses should always call oneLinePrint() in printToStream() to
generate a standard first line (and only line in case of
PrintOption=OneLine)
RooDataSet,RooPlot,RooArgSet:
- multiple-inherit from RooPrintable
- standardize implementations of printToStream() and Print()
RooPlot:
- change base class from TH1F to TH1
RooPlotWithErrors:
- rename to RooHist
RooDataSet:
- add default options for read()
Revision
1900 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Apr 5 01:49:11 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 15779 byte(s)
Diff to
previous 1863
o Implement custom Clone() for all RooAbsArg derivatives
which uses the copy constructor. The TObject Clone()
uses the Streamer() functions that have unintended side
effects on the bidirectional link lists in RooAbsArg
o Fix RooFormula/RooRealFormula so that it is properly
clonable / copyable
o Add options RooAbsArg::addServer(), that allow to mask
value or shape dirty state information from the server
(This will allow RooPDF classes to distinguish between
parameters, which require value state propagation, and
dependents, which require shape state propagation)
Revision
1863 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 29 01:06:45 2001 UTC (13 years, 9 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 15756 byte(s)
Diff to
previous 1852
o Add blinding support
- RooDataSet can now read mixed blind/unblind data, if the
blinding string (if present) is always the same.
The data set dynamically adds a 'blindState' category to
it's internal variable list which indicates if a given event
is blinded or not.
- Imported RooFitTools/RooBlind as RooBlindTools
- Created two unblinder engines RooUnblindCPDeltaTVar and
RooUnblindCPAsymVar. To perform blinding to do
RooRealVar deltat(...)
RooCategory tag(...)
RooCategory blindStat(...) // All these should come from a RooDataSet
RooUnblindCPDeltaTVar deltat_ub("deltat_ub","DeltaT unblind",
"Blinding String",deltat,tag,blindsStat)
OR
RooRealVar sin2b(...)
RooUnblindCPAsymVar sin2b_ub("sin2b_ub","Sin2Beta unblind",
"Blinding String",sin2b)
Then feed deltat_ub and sin2b_ub in the PDF.
the print() and read/write methods of the unblinders show some
configuration information, but don't reveal the unblinded value
The getVal() of the unblinders is 'protected' and can only be
accessed by RooDataSet
o Some cleanup in dirty flag propagation code
o Optional indexing category in RooDataSet::read that tells from which file
a given event is coming. A dummy category should be appended to the varlist
and it's name should be given as the last argyment in the RooDataSet ctor.
If the filespec is "fileA,fileB,fileC", for each file a new index type
is created with values 0,1,2 etc.. and labels ('file000','file001' etc).
One can also explicitly assign index labels to each file using the
following file spec string: "fileA:Dstar,fileB:Dstar,fileC:Jpsi".
In this example fileA and fileB will have index label Dstar (value 0)
and file C has label "Jpsi" (value 1)
Finally it is also possible to predefine label types in the index
category. RooDataSet::read will use the existing label/values defined
and assign new ones where undefined.
o Fix type in RooAbsArg::Print()
Revision
1852 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Tue Mar 27 01:20:20 2001 UTC (13 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 12848 byte(s)
Diff to
previous 1846
o Add RooProxy classes for use in PDFs
o Enhance RooStreamParser
- Configurable definition of punctuation
- new atEOL() member can tell if there is an EOL
between the last read token and the next token to be read
- Read quoted string always as a single token
- readString() will strip quotes if present (readToken() doesn't)
o Add RooAbsString, RooStringVar classes,
analogous too RooAbsReal/RooRealVar
Revision
1846 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 22 15:31:25 2001 UTC (13 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 12855 byte(s)
Diff to
previous 1839
o Extend RooFormula to understand RooCategory labels '<catName>:<catLabel>'
so you can e.g. do (tagCat==tagCat::Kaon)
o Transplant and rework most advanced reading options from RFT/RooVarList
to RFC/RooArgSet
- Nested if statements
if (conditional)
else if (conditional)
else
endif
Conditionals are evaluated by a RooFormula object that can use the
entire arglist as variables
- Recursive include statements
include <filepath>
- Some useful other commands for configuration file use
echo "message" -> Print message while processing
abort -> Force termination of read with error status
Handling of errors in the input file format is fairly exhaustive.
o Some reworking of the RooStreamParser in the way newlines are handled.
Some of the clients of RSP have been changed accordingly.
Main new feature is a RSP::atEOL() member that determines if there is
a newline between the last read token and the next token to be read.
o Temporarily made RooAbsArg::Print/printToStream non-const as the
implementation in some subclasses call a non-const getVal()
This problem must be fixed for good in all classes soon.
Revision
1839 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Wed Mar 21 15:14:21 2001 UTC (13 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 12852 byte(s)
Diff to
previous 1833
o Finish RooMappedCategory::writeToStream()
o Check and fix validity checking in *::readFromStream()
o RooDataSet::read now uses RooArgSet::readFromStream
o Change event selection in RooDataSet::Plot,RooDataSet::RooDataSet(tree)
to use RooFormula instead of TTreeFormula
o Add interface to RooAbsCategory in RooFormula
Revision
1833 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Mar 17 03:47:39 2001 UTC (13 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 13715 byte(s)
Diff to
previous 1832
o Add RooTable objects (RooAbsReal->THxF, RooAbsCategory->RooTable)
o RooAbsCategory::createTable added (analoguous to RooRealVar::createHisto)
o RooDataSet::Table function added to fill table from data set
o Some bug fixes in RooAbsCategory loading in RooDataSets
o Some work on non-compact reading/writing of RooRealVars
Revision
1827 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Fri Mar 16 07:59:12 2001 UTC (13 years, 10 months ago) by
verkerke
Original Path:
trunk/roofitcore/src/RooDataSet.cxx
File length: 12553 byte(s)
Diff to
previous 1826
o Make naming convention of member functions more uniform
o RooAbsArg: Add 'Shape' dirty state management
o Roo*Value: Distinguish between integration and plotting limits
o Roo*Value: Disentangle meaning of limits and constant-ness
o Add tracing to RooAbs{Value,Index} evaluation
o redirectServers & traceEval have global trace function and
hooks for additional subclass tracing
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.
