[root] Log of /trunk/roofit/roofitcore/src/RooVectorDataStore.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: 44736 byte(s)
Diff to previous 46470

 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 46464 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Oct 11 14:00:00 2012 UTC (2 years, 3 months ago) by wouter
File length: 43912 byte(s)
Diff to previous 46156

  *** Assorted bug fixes (Savannah and otherwise) ***

  o RooDataHist

     - When importing TH1s omit 'average bin density' correction factor as that
       proves to be very uninuitive. (Savannah #96153)


  o RooGlobalFunc

     - Set importDensity by default to kFALSE in Import(TH1&) following
       new convention (Savannah #96153)


  o RooGenFitStudy

     - Save errors of fitted parameters in summary data


  o RooStreamParser

     - Fix parsing issue for variables starting with an 'i' (Savannah #82458)


  o RooPlot

     - Add static interface to control directory auto-attach to allow importing in workspaces
       (Savannah #94239)


  o RooRealBinding

     - In saveXvec()/restoreXvec() also save and restore all buffers of components of
       the bound function to make sure it works fine if components are cached in
       in the likelihood and operate in clean mode.


  o RooVectorDataStore

     - In cacheArgs() and recalculateCache() skip calculation of elements where the
       event weight is zero

     - In the streamer explicit convert stl::vector pointers to an empty collection
       to null pointers to make vector stores with uncertainty work fine after
       persistence (ROOT persistence turns null pointers in to pointers to null
       collections as part of the read-back process) (Savannah #94908) 


  o RooRealSumPdf

     - Elaborate one of the debug print statements


  o RooProduct

     - Change internal storage from set to list and change constructor input argument 
       from set to list to support products of identical terms (Savannah #94925)


  o RooAddition

     - Change constructor input argument from set to list to support products
       of identical terms (Savannah #94925)


  o RooAbsPdf

     - In fitTo() only invoke SUMW2 afterburner if there are >0 free parameters
       (Savannah #92332)


  o RooWorkspace

     - In generic object import() disable auto-attach of RooPlots to gDirectory
       (Savannah #94239)


  o RooListProxy

     - In add() check if _owner is set before calling addServer on it (allows
       operation in schema evolution) (Needed for Savannah #94925)


  o RooFormulaVar

     - Fix documentation (Savannah #93498)


  o LinkDef2

     - Add schema evolution for RooProduct and RooAddition (for Savannah #94925)

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: 43275 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: 41541 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 42950 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Feb 9 21:21:53 2012 UTC (2 years, 11 months ago) by wouter
File length: 41230 byte(s)
Diff to previous 42864

   Assorted bug fixes

   o RooChi2Var, RooXYChi2Var, RooDataWeightedAverage, RooNLLVar

     - Deploy upgraded interface of recalculateCache()


   o RooAbsDataStore

      - Extend interface for recalculateCache() to take needed
        info for smart recalculation when using NCPU>1 and to
        pass needed info for proper handling of normalization
        observables


   o RooCompositeDataStore

      - Forward recalculateCache() to components (should not
        be needed but just in case)


   o RooVectorDataStore

     - Treat conditional observables properly in the normalization
       set passed to cached pdfs

     - Only update elements that are actually being recalculated
       when using NumCPU>1


   o RooAbsAnaConv

     - Persist _model so that generation works after persistence

 
   o RooAbsReal

     - Disable cache-and-track when making plot projections
       with DataWeightedAverage, as this cannto work because
       the needed information for normalization is not available

     - Reinstate cloning of the function in fillDataHist(). Without
       it is is possible to trigger as accidental 'self-destruct'
       of cached normalization objects that call fillDataHist()


   o RooCachedReal

     - Make evaluate() return _func instead of null to make
       disableCache mode of base class functional

     - Initialize data member _useCdfBoundaries in all ctors

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

   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 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: 34039 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]
Added Fri Oct 21 20:30:29 2011 UTC (3 years, 3 months ago) by wouter
File length: 29496 byte(s)

   *** 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

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: