[root] / trunk / roofit / roofitcore / inc / RooAbsCachedPdf.h Repository:
ViewVC logotype

Log of /trunk/roofit/roofitcore/inc/RooAbsCachedPdf.h

Parent Directory Parent Directory


Links to HEAD: (view) (download) (as text) (annotate)
Sticky Revision:

Revision 41862 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 10 09:44:32 2011 UTC (3 years, 2 months ago) by wouter
File length: 4879 byte(s)
Diff to previous 33802
   o PiecewiseInterpolation, RooAbsCachedReal, RooAbsCachedPdf

     - Follow adjustment in RooCacheManager


   o RooConvCoefVar, RooEffProd, RooResolutionModel, RooErrorVar, RooProjectedPdf, RooAbsHiddenReal

     - Migrate to getValV


   o RooProdPdf

     - Follow adjustment in RooCacheManager     
     - Migrate to getValV


   o RooVectorDataStore

     - Various small fixes

     - Allow storage of non-constant 'track-and-change' cache entries.
       These are cached PDF nodes that are not constant, but need
       to be recalculated when selected parameters change. A 
       RooChangeTracker data member is added to the vectors to
       do this dependency checking, and recalculation (as needed)
       is performed in method recalculateCache() to be called from
       the test stat before looping of the data.
       

   o RooAbsReal

     - Introduce new non-virtual inline getVal() methods that handles
       clean-cache state cases and delegates all other cases to a 
       virtual method getValV() that corresponds to the original
       getVal() method


     - Add 'ignore' more to eval error logging protocal


   o RooAddPdf

     - Follow adjustment in RooCacheManager 
     - Optimize control structure in evaluate() to be more efficient
       (move conditional outside loop)

   o RooAbsTestStatistic

     - Add extra argument to constOptimizeTestStatistic to control
       activation of track-and-change optimization

   o RooRealMPFE

     - Migrate to getValV()

     - Add support for new track-and-change option argument in 
       transmission of const optimization request to servers
       

   o RooRealVar

     - Exploit new _fast flag of RooAbsReal to choose non-virtual
       handling of getVal()

     - Migrate to getValV() [ but still dummy ]

     - Small fix in attachToVStore()


   o RooNLLVar

      - Add data member tracking first use

      - After first use, trigger wiring of all caches in RooCacheManagers
        to speed up trivial cache selection decisions (i.e those where
        only a single cache entry exists)

      - Add call to RooAbsDataStore::recalculateCache() to implement
        track-and-change update prior to likelihood loop


   o RooConstVar

      - Migrate to getValV()


   o RooAbsArg

     - Eliminate flipACLean() protocol since no longer used

     - Simplify method opermode() now that flipAClean is abandoned.

     - In findConstantNodes() add support for change tracking
       and include nodes with "ChangeTracking" atttribute in
       list of constants. Mark all truly constant expressions
       with attribute "ConstantExpression"

     - Add extra argument to constOptimizeTestStatistic to control
       activation of track-and-change optimization  

     - In printCompactTree() also print valueDirty state when in Auto mode


     - Add method wireAllCaches() which propagates cache wiring request
       to all registered cache nodes on all branches nodes

     - Add transient data member with namereg pointer to string with
       current object name. Overload SetName() and SetName() and title
       to clear pointer whenever name changes.


   o RooAbsPdf

     - Migrate to getValV(). Eliminate handling of clean-cache cases
       as this is now done in RooAbsReal::getVal()

     - Disable use of RooAbsPdf::raiseEvalError() protocol as this
       is now communicated through RooAbsReal::logEvalError()


   o RooRealIntegral

     - Migrate to getValV()

     - Use setInhibitDirty() instead of flipAClean() in evaluate()
       when performing numeric integrations


   o RooTreeDataStore

     - In cachArgs() add code to select only cache items with
       label "ConstantExpression" as tree store is unable to
       cache track-and-change items

   o RooAbsCategory

     - When printing also show index associated to label


   o RooAbsOptTestStatistic

     - Add extra argument to constOptimizeTestStatistic to control
       activation of track-and-change optimization

     - In optimizeConstantTerms() when trackChanges option is active
       request change tracking for all component nodes of RooAddPdf
       and RooRealSumPdf, unless these components are RooProdPdf/RooProducts
       respectively in which case the components of these products are tracked
       
   o RooRealProxy

     - Use _fast attribute of RooAbsArg to directly return value cache
       of RooAbsReals if that is allowed


   o RooAbsCache

     - Add virtual method wireCache()


   o RooCacheManager

     - Add new method getObj() that takes isetRangeName as 'const char*'
       instead of 'const TNamed *' to be able to eliminate the conversion
       when in wired mode

     - Implement cache wiring - If at moment of the request only a single
       cached entry exists - always return that one from here one.


   o RooAbsDataStore

     - Implement virtual method calculateCache()

Revision 33802 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Jun 9 14:34:02 2010 UTC (4 years, 7 months ago) by wouter
File length: 4878 byte(s)
Diff to previous 28259
 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

Revision 28259 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 16 16:21:16 2009 UTC (5 years, 9 months ago) by wouter
File length: 4810 byte(s)
Diff to previous 25184
  Update roofit/roofitcore and roofit/roofit with
  RooFit v2.98 code from dev/roostats branch

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: 4648 byte(s)
Diff to previous 24247

   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 24247 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jun 12 14:54:32 2008 UTC (6 years, 7 months ago) by wouter
File length: 4646 byte(s)
Diff to previous 24175
   o RooAbsSelfCachedPdf RooAbsCacheElement RooAbsProxy RooAbsSelfCachedReal RooAbsRealLValue 
     RooAbsCachedReal RooAbsGenContext RooAbsCategoryLValue RooAbsAnaConvPdf RooAbsReal 
     RooAbsCollection RooAICRegistry RooAbsCachedPdf RooAbsTestStatistic RooAbsData RooAbsLValue 
     RooAbsFunc RooAbsPdf RooAbsArg RooAbsBinning Roo1DTable RooEffProd RooAbsRootFinder RooAbsHiddenReal 
     RooAbsString RooAbsIntegrator RooMinuit RooAbsCache RooAbsCategory RooAbsOptTestStatistic RooAbsMCStudyModule

     - 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

     - Remove a couple of obsolete member function

Revision 24175 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 6 20:53:56 2008 UTC (6 years, 7 months ago) by wouter
File length: 4131 byte(s)
Diff to previous 24119
  
  o RooAbsCachedReal,RooAbsCachedPdf,RooLinearMorph,RooNumRunningInt

    - Fix Solaris compiler errors related to access of nested classes
      to protected section of encapsulating class

  o RooAbsCachedPdf

    - Fix -Wshadow warning

Revision 24119 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by wouter
File length: 4103 byte(s)
Diff to previous 23134
   o RooAbsSelfCachedPdf

     - Follow changes in RooAbsCachedPdf 


   o RooCachedPdf

     - Add option to override default choice of cache observables
       (the normalization observables) with a specific set of variables
       to make it possible to also cache p.d.f values for all values
       of given parameters as well.

     - Forward analytical integration capabilities to actual cache p.d.f

     - Forward calls on preferred observable order to cached p.d.f


   o RooDataHist
       
     - Add option to bin dataset in alternate binning configuration, as 
       specified by binning name in constructor.

     - Add feature to weight() function to enforce special boundaries
       when interpolating a histogram representing a cumulative distribution function. 
       If so, lower-side bounds are forced to zero and upper-side bounds are
       forced to 1.0 instead of the default mirroring strategy


   o RooMsgService

     - Add new topic NumericIntegration

     - Show PROGRESS level messages by default


   o RooAbsSelfCachedReal

     - New base class for self-caching RooAbsReal objects analoguous
       to RooAbsSelfCachedPdf


   o RooCachedReal

     - New class to cache arbitrary RooAbsReal function objects,
       analogous to RooAbsCachedPdf


   o RooRealBinding

     - Add feature to save and restore values of input variables,
       used by RooRealIntegral to restore observable values after numeric
       integration to original values.


   o RooLinearMorph

     - New operator p.d.f class implementing using the algorithm described
       by Alex Read in NUM A 425 (1999) 357-369 'Linear interpolation of histograms'.
       This class implements a generalization for continuous p.d.f 


   o RooAbsRealLValue

     - Following changes in RooAbsLValue

 
   o RooHistFunc

     - Real-valued function modeled by external RooDataHist object, analoguous to RooHistPdf,
       but without normalization support and allowing negative histogram values


   o RooAbsCachedReal

     - New abstract base class for caching functions, analoguous to RooAbsCachedPdf.
       

   o RooFracRemainder

     - New dedicated helper class to calculate the remainder fraction of a RooAddPdf, i.e. 1-sum(i)x_i
       for a given RooArgSet x


   o RooCustomizer

     - Fix memory management issue for sterile use


   o RooAbsCategoryLValue

     - Follow changes in RooAbsLValue


   o RooNumCdf

     - Specialization of RooNumRunningInt to calculate running integrals of p.d.f.s:
       the running integral is by construction normalized to one exactly, taking out
       any possible imprecisions in the regular integral calculation and by imposing
       special constraints on the RooHistFunc that models the output so that the boundaries
       are constrained to exactly 0 and 1 when interpolation is used.


   o RooFFTConv

     - Fix bug in cache naming algorithm

     - Follow changes in RooAbsCachedPdf


   o RooChangeTracker

     - New special purpose object that tracks changes in a given set of variables, used
       to determine if cached p.d.fs in RooAbsCachedPdf and RooAbsCachedReal need to
       be recalculated due to parameter changes. In addition to valueDirty tracking,
       an explicit comparison can be made to stored reference values of variables,
       to avoid recalculation of expensive quantities in case a valueDirty is propagated
       even if the value did not change (this can e.g. happen when you step though
       a RooDataHist where usually only one of the observables changes value, but
       all observables propagate a valueDirty every time)


   o RooHist

     - Bug fix in makeResidual()


   o RooAbsReal

     - Fix small memory leak in createIntegral

     - Expand functionality of fillDataHist: optional correction for binVolume
       when filling, and optional progress indication.

     - Modify logEvalError() so that when cumulative logging for Minuit is disabled
       that messages are printed through the standard message logging service.

     - Modify error logging so that name of objects are stored in addition to 
       pointers so that delayed logging of errors of (cache) objects that no
       longer exists can be performed correctly.

     - Add virtual function preferredObservableScanOrder() to indicate preferred
       order in which multi-dimensional functions should be scanned into a 
       RooHistPdf, which may matter greatly for the performance of certain
       p.d.f.s like RooFFTConvPdf and RooLinearMorph

     - Add new function createRunningIntegral() which constructs for a given F(x,y) 
       a Int[xlo,x] F(x',y) dx. The default strategy is to construct the underlying
       integral with createIntegral() and adapt it with a RooCustomizer and a RooParamBinning
       to a running integral. In case it concerns a one-dimensional numeric running
       integral, the running integral is represented by a dedicated class RooNumRunningInt
       which scans the integrand and numerically integrates the scanned histogram


   o RooAbsCollection

     - Bug fix in nameFieldLength handling of print routine


   o RooAbsCachedPdf

     - Introduce explicitly the strategy that the cache contains the _normalized_ p.d.f. values,
       so that no postior normalization integral is required. This has the added advantages that
       the cache p.d.f can be instructed to consider itself normalized skipping an explicit
       normalization step in the RooHistPdf.

     - Add utility function getCachePdf() and getCacheHist() to retrieve cache p.d.f and histogram
       for a given choice of normalization set

     - Clean up structure of CacheElem nested class by making guts private and providing accessor
       function for derived CacheElem classes. Virtualize cache creation with a new member function 
       createCache that will allow derived classes to create a derived CacheElem.

     - Forward integration handling to cache pdf actually being used


   o RooDataHistSliceIter

     - Follow changes in RooDataHist for alternate binning 


   o RooRealMPFE

     - Follow changes in eval error logging in RooAbsReal


   o RooAbsPdf

     - Add createCdf() function to create cumulative distribution functions from p.d.f.s. This is 
       quite similar to RooAbsReal::createRunningIntegral() but with some c.d.f specific features
       related to constraints on normalization


   o RooAbsArg 

     - Fix bug in optimizeCacheMode()


   o RooBrentRootFinder

     - Improve error messaging through RooMsgService interface.


   o RooCmdArg

     - Expand payload from 2 to 3 strings


   o RooSimWSTool

     - Complete rewrite of RooSimPdfBuilder integrated with RooWorkspace for object storage.


   o RooNumRunningInt

     - New dedicated class to calculate running integral of any function that does not have
       an analytical integral implementation. This class scans such a function in a histogram
       and then numerically integrates the histogram. The filling of the histogram is performed
       adaptively using a recursion division strategy with a precision cutoff to save time
       of the filling of smooth functions in finely binned histograms


   o RooMultiCategory, RooSuperCategory

     - Minor tweak in name of proxies


   o RooAbsIntegrator

     - Deploy save and restore functionality of RooAbsFunc/RooRealBinding to restore observable
       values to prior values after an intergration step. 


   o RooMinuit

     - Fix gcc 4.3 compiler warning


   o RooWorkspace

     - Add bulk import() function taking a const RooArgSet instead of a RooAbsArg
 
     - Add RecycleConflictNodes() option to ignore conflicts and simply recycle internal
       nodes when a different external node is encountered.

     - Add new accessors catfunc() for category functions, arg() for generic RooAbsArgs,
       and funcArg() for fundamental arguments of any type.

     - Add separate section for category functions in Print()


   o RooHistPdf

     - Add option to declare contents unit normalized. When activated, the analytical
       integral is hardwired to 1. 

     - Add option to propagate cdfBoundaries mode to the underlying RooDataHist.


   o RooAbsOptTestStatistic

     - Optimize handling of empty rangeName specification (from Alfio)


   o RooSimultaneous

     - Tune proxy names

     - Make p.d.f return zero, in case index category is in state where no p.d.f is assigned,
       rather that assert(0)


   o LinkDef3.h, Module.mk

     - Add new class definitions

Revision 23134 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 11 07:53:39 2008 UTC (6 years, 9 months ago) by rdm
File length: 3075 byte(s)
Diff to previous 21379
move the following directories to "roofit":

roofitcore, roofit

Revision 21379 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 14 15:12:29 2007 UTC (7 years, 1 month ago) by wouter
Original Path: trunk/roofitcore/inc/RooAbsCachedPdf.h
File length: 3075 byte(s)
Diff to previous 20879
  o (Large number of classes)

    - Systematically use Riosfwd.h in header files instead
      of <iostream> or Riostream.h

    - Include "Riostream.h" in implementations where necessary

    - Convert remaining <iostream> to "Riostream" in implementations

    - Outline all inline functions using cout or endl to facilitate
      use of fwd declaration of iostreams in all classes

    - Elimination of some duplicate headers

    - Match use of 'using namespace std' in implementation files
      to classes that actually use STL classes

Revision 20879 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 19 11:22:56 2007 UTC (7 years, 2 months ago) by rdm
Original Path: trunk/roofitcore/inc/RooAbsCachedPdf.h
File length: 3086 byte(s)
Diff to previous 20408
Set property svn:eol-style LF on all source and Makefiles. This should avoid
problems with Win32 line endings ending up in the repository. All MS tools
support LF eols fine.

Revision 20408 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 19 12:18:09 2007 UTC (7 years, 3 months ago) by wouter
Original Path: trunk/roofitcore/inc/RooAbsCachedPdf.h
File length: 3086 byte(s)
Diff to previous 20161
   o RooAbsRealLValue

      - Remove stray debug print statements


   o RooAddPdf

      - Add new default ctor to fix persistence introduced by
        new cache management scheme

      - Add forgotten initializer to regular ctor


   o RooAbsCachedPdf

      - Add formal server-link dependency on cache parameters to 
        RooHistPdf cache representation so that the constant term
        optimizer can make the correct decision

      - Make RooObjCacheManager a persistent data member


   o RooObjCacheManager

     - Add debug message level information

     - Make _optCacheObservables a transient data member and initialize
       it in the default ctor.


   o RooAbsPdf, RooProjectedPdf

      - Add new default ctor to fix persistence introduced by
        new cache management scheme

      - Make RooObjCacheManager a persistent data member


   o RooAbsArg

      - Add methods graphVizTree() that produce input files
        for AT&Ts graphViz to make graphical representation
        of object tree. (To make actual graphics run 'dot -Tps -o graph.ps %s'
        where %s is argument passed to graphVizTree().

   o RooSetProxy

      - Remove stray debug print statements


   o RooSimultaneous

      - Initialize forgotten data member in all ctors


   o RooProdPdf, RooAbsAnaConvPdf

      - Make RooObjCacheManager a persistent data member
        

   o RooSuperCategory

      - Make contained iterator a transient data member
        and initialize it in the default ctor.

   
   o RooCacheManager

      - Add explicit separate default ctor.

Revision 20161 - (view) (download) (as text) (annotate) - [select for diffs]
Added Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by wouter
Original Path: trunk/roofitcore/inc/RooAbsCachedPdf.h
File length: 3087 byte(s)
   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

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.

  Diffs between and
  Type of Diff should be a

Sort log by:

Subversion Admin
ViewVC Help
Powered by ViewVC 1.0.9