[root] Log of /trunk/roofit/roofitcore/src/RooAbsCachedReal.cxx

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: 11780 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: 11475 byte(s)
Diff to previous 43190

 *** 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 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: 11065 byte(s)
Diff to previous 42984

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

   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 24119 - (view) (download) (as text) (annotate) - [select for diffs]
Added Tue Jun 3 18:42:54 2008 UTC (6 years, 7 months ago) by wouter
File length: 7413 byte(s)

   o RooAbsSelfCachedPdf

     - Follow changes in RooAbsCachedPdf 


   o RooCachedPdf

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

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

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


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

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


   o RooMsgService

     - Add new topic NumericIntegration

     - Show PROGRESS level messages by default


   o RooAbsSelfCachedReal

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


   o RooCachedReal

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


   o RooRealBinding

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


   o RooLinearMorph

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


   o RooAbsRealLValue

     - Following changes in RooAbsLValue

 
   o RooHistFunc

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


   o RooAbsCachedReal

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

   o RooFracRemainder

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


   o RooCustomizer

     - Fix memory management issue for sterile use


   o RooAbsCategoryLValue

     - Follow changes in RooAbsLValue


   o RooNumCdf

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


   o RooFFTConv

     - Fix bug in cache naming algorithm

     - Follow changes in RooAbsCachedPdf


   o RooChangeTracker

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


   o RooHist

     - Bug fix in makeResidual()


   o RooAbsReal

     - Fix small memory leak in createIntegral

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

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

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

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

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


   o RooAbsCollection

     - Bug fix in nameFieldLength handling of print routine


   o RooAbsCachedPdf

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

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

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

     - Forward integration handling to cache pdf actually being used


   o RooDataHistSliceIter

     - Follow changes in RooDataHist for alternate binning 


   o RooRealMPFE

     - Follow changes in eval error logging in RooAbsReal


   o RooAbsPdf

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


   o RooAbsArg 

     - Fix bug in optimizeCacheMode()


   o RooBrentRootFinder

     - Improve error messaging through RooMsgService interface.


   o RooCmdArg

     - Expand payload from 2 to 3 strings


   o RooSimWSTool

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


   o RooNumRunningInt

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


   o RooMultiCategory, RooSuperCategory

     - Minor tweak in name of proxies


   o RooAbsIntegrator

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


   o RooMinuit

     - Fix gcc 4.3 compiler warning


   o RooWorkspace

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

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

     - Add separate section for category functions in Print()


   o RooHistPdf

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

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


   o RooAbsOptTestStatistic

     - Optimize handling of empty rangeName specification (from Alfio)


   o RooSimultaneous

     - Tune proxy names

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


   o LinkDef3.h, Module.mk

     - Add new class definitions

This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, enter a numeric revision.

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