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

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: 10340 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 23538 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Apr 24 21:02:00 2008 UTC (6 years, 9 months ago) by wouter
File length: 7015 byte(s)
Diff to previous 23134

Import changes from development branch

==== Date: Wed Feb 20 22:33:28 2008 =====

   o RooRealSumPdf

     - Do _not_ use normalization of RooAbsPdf input components
       in numerator of RooRealSumPdf expression since it is 
       already explicitly occurring in denominator of RooRealSumPdf.
       (Fixes wrong normalization reported by Tristan)


   o RooObjCacheManager

     - Register owner of cache with each cache elememt to
       facilitate callbacks


   o RooAbsCacheElement

     - Add storage for pointer to owner of cache and
       supply setOwner() function


   o RooAbsPdf

     - Use RooObjCacheManager callback mechanism to zero
       'last used normalization' pointer in RooAbsPdf
       when the cache-owned object pointed is about
       to be deleted. 


   o RooAbsArg

     - Make crc32 function static


   o RooWorkspace

     - Add CodeRepo nested class that allows to store C++ code
       of RooAbsArg derived classes that are not in ROOT distribution
       but are contained in workspace. When reading any missing
       class, code is compiled on the fly allowing for transparent
       reading of workspace object from file. Code is found in
       location pointed to from TClass objects. Additional search
       path for declaration and implementation files can be provided
       to be able to handle non-trivial cases.

     - Add WSDir nested class that represents information contained
       in workspace as read-only TDirectory for easy interactive use. 
       Directory representation is created using makeDir() member function.


  o LinkDef3

     - Add nested classes in RooWorkspace

===== Date: Wed Mar 26 23:04:26 2008 =====

   o RooProdPdf

     - Fix typo in ctor documentaion

     - Improve error message in expectedEvents() when no extendable p.d.f.s are found

     - Implement getConstraints() function to retrieve constraint p.d.f terms from product
       expression given set of observables and set of parameters to be constrained.


   o RooMsgService

     - Add PROGRESS message level between INFO and WARNING

     - Add globalKill level for messages to be able to quickly eliminate all messages below
       a given level without interfering with the stream structore of RooMsgService


   o RooPrintable

     - Implement new printing interface with more details control over items printed trhough contents enum
       (multiple ORable options) and style of printing (inline, single line, (verbose) multiline) with style 
       enum (exclusive options). 

     - Introduce generic virtual functions for printing of name,title,value,arguments,
       and extras of each object. 

     - Each class can overload the default contents used for all printing
       uses (inline,verbose,standard) etc as well as the default printing style invoked by Print()


   o RooPlot,RooGenContext, RooAbsRealLValue,RooDataSet,RooNameSet,RooCustomizer, RooAbsGenContext, RooAddModel,
     RooFitResult,RooCurve,RooAbsAnaConv,RooHist,RooAbsReal,RooAbsCollection,RooAddPdf,RooTable,RooAbsData,
     RooMappedCategory,RooFormula,RooFormulaVar,RooCatType,RooRealVar,RooAbsArg,RooAbsPdf,RooPlotable,RooRealIntegral,
     RooAbsBinning,Roo1DTable,RooAddGenContext,RooGenericPdf,RooResolutionMode,RooAbsHiddenReal,RooMultiCategory,
     RooAbsString,RooSetProxy,RooProdGenContext,RooConvGenContext,RooGenCategory,RooGrid,RooSimGenContext,
     RooThresholdCategory,RooAcceptReject,RooSuperCategory,RooEllipse,RooNumIntConfig,RooAbsCategory,RooListProxy,
     RooLinearVar,RooTreeData,RooTreeData

     - Update to new RooPrintable interface


   o RooGenContext,RooAbsGenContext,RooAddGenContext,RooProdGenContext,RooConvGenContext,RooSimGenContext

     - Implement attach() function to simplify management of changing parameters during lifetime of context


   o RooAbsRealLValue

     - Eliminate inFitRange() warning message as it is gives too many false warnings when used with
       parameterized ranges


   o RooCustomizer

     - Make owning of contents optional to simplify release of created components
     

   o RooAbsReal

     - Implement new evaluation error logging mechanism. Rather than passing zero p.d.f values, push error message with
       details on a static stack (if logging is enabled by e.g. RooMinuit). 

     - Augment functionality of createIntegral: explicitly allow integration over ranges with bounds parameterized in 
       in terms of other integrated observables. Integrals of this type are automatically recognized and cast
       as recursive integrals in case of >1-D integrals to integrate over requested phase space. 

     - Add createIntObj() helper function for above functionaliy.

     - Eliminate a lot of commented out debug code from createPlotProjection()

     - Modify fillHistogram(): when plot observables are cloned, explicitly interconnect clones again to facilitate
       proper plotting of N-D integrals with entangled parameterized ranges

     - Add ScaleFactor() argument to fillHistogram to control use of histogram density correction scale factor in Z-scale
       of filled histogram


   o RooProduction

     - Fix bug for persistence


   o RooRealMPFE

     - Extend client/server protocol with message to retrieve RooAbsReal evaluation error log from server side and
       merge with error log on client side


   o RooRealVar

     - Introduced concept of non-shared alternative binnings(ranges) required to accommodate RooParamBinning ranges
       that cannot be shared across instances because of their client/server connection to other objects in p.d.f
       expression trees. Modify setBinning to automatically recognize non-shareable binnings and divert those to
       non-shared alternative binning container.

     - Add setRange([const char*,] RooAbsReal&,RooAbsReal&) methods to simplify creation of parameterized ranges.


   o RooAbsArg

     - Introduce concept of owned components with addOwnedComponents() interface to be able to make any RooAbsArg
       object own any number of others. This can be used to simplify the memory management of object trees 

     - Introduce prohibitServerRedirect mode that will trigger fatal assert if any server redirect is attempted
       to thus configured object. Useful as debugging tool to track faulty copy constructors that leave clone
       object tree unintentionally connected to the original object tree.

     - Migrate fixed--name-field management tool from RooAbsReal to RooAbsArg. Used to accomplish regular
       formatting in RooAbsCollection::printStream.

     - Add concept of transient boolean attributes that are not tranferred on copy construction. Mostly useful
       for debugging.

     - Extend leafNodeServerList and treeNodeServerList to distinguish to types of leaf-nodes: strict leaf modes
       in the sense of the client-server tree structure and 'physical' leaf nodes that do not recurse into
       nodes that have isDerived()==kFalse. The latter corresponds to the original concept of leaf nodes / variables,
       which the former mode, a new addition, explicitly exposes any shape servers contained in parameterized
       ranges of variables.

     - Fix logic error in recursiveServerRedirect: do not recurse into nodes that are in the replacement list themselves.

     - Fix bug in printCompactTree(): value/shape clients were not always properly indicated.

     - Add getAllConstraints() method that finds all RooProdPdfs in expression trees and harvest constraints from all
       of these from the getConstraint() method


   o RooAbsPdf

     - Implement new evaluation error logging mechanism for negative p.d.f values and zero normalization integrals

     - Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to fitTo() method.
       The Constrain() method retrieves any constraints p.d.f. on parameters multiplied in any RooProdPdf in the normal 
       p.d.f expression and adds those to the likelihood that is minimized. Only constraints on the listed parameters
       will be picked up. Multiple constraints per parameter may exist. The ExternalConstrains() argument implements
       similar functionality except that provided external constraint p.d.f.s are added rather than internal constraints.

     - Fix potentially fatal bug in print statement in getContext()

     - Add new method createCdf() to create a cumulative distribution function from given p.d.f. Given a set of observables x, 
       the returned c.d.f is implemented in terms of a RooRealIntegral of p.d.f(x') over a parameterized range from [ 0 - x ].


   o Roo1DIntegrator

     - Improve error message


   o RooRealIntegral

     - Fix bug in calculation of shape dependencies on observables.

     - Add handling of dependencies of integral value on values of objects representing parameterized ranges of
       integrated observables.     


   o RooMCStudy

      - Add Constrain(const RooArgSet& pars) and ExternalConstraints(const RooArgSet& pdfs) arguments to constructor.
        In addition to passing these arguments to the fitTo() call of the fit stage, modify event generation as
        follows: instead of sampling events from 'static' generator p.d.f, sample value of constrained parameters
        from joint constraints p.d.f and sample observables at those parameter settings. Save the generator parameters
        for each toy as these change per toy. Change the pull calculation such that it uses the per-event truth values
        rather than the per-study truth value if constraints are used.


   o RooAddition

     - Fix bug in evaluate() related to persistence


   o RooMinuit

     - Enable/disable new evaluation error logging mechanism prior to and just after each MINUIT call.

     - Print logged error messages, if any, in glue function


   o RooProjectedPdf

     - Fix important bug: normalization set should always include integration set for each configuration


   o RooGlobalFunc

     - Add definition of Scaling(),Constrain() and ExternalConstraints() helper functions 


   o RooUniformBinning
  
     - Remove dedicated print function as it output is identical to that of the generic print function in RooAbsBinningx

  
   o RooAbsBinning

     - Add virtual methods isParameterized(),lowBound() and highBound() to be to detect and analyze parameterized binnings
       through abstract interface

     - Add isShareable() method to be able to separate shareable and non-shareable binnings in RooRealVar.

     - Add insertHook() and removeHook() function to allow connection of possible proxies present in binning to
       owning RooAbsArg.


   o RooWorkspace

     - Improve code import facility by introducing a class->file mapping step in the CodeStore to correctly handle cases where 
       multiple classes are defined in a single file.

     - Add check that TClass interface actually yields file names.

     - Only require default constructor to be present for non-abstract classes. It should be there for abstract classes as
       well but current TClass::HasDefaultConstructor() method will not tell us.

   o RooTreeData

     - Improve renameVariable() method to not only rename the RooAbsArg branch buffer but also any TTree branches involved as well.
       While the tree branch names are generally invisible to the user, having branch names that are different from branch buffer names
       may cause branch naming conflicts in merge() that are not detectable as branch buffer naming conflicts.


   o RooParamBinning

     - New class implementing binning with low and high points defined by external RooAbsReal objects 


   o RooConstrainSum

     - Helper class for RooAbsPdf to represent likelihood of collection of constraint p.d.f.s.


==== Date: Fri Mar 28 10:04:57 2008 =====

   o RooRecursiveFraction

     - Helper function for RooAddPdf that calculates recursive fraction 
       f1*(1-f2)*(1-f3) from a given set of plain fractions


   o RooAddPdf

     - Add flag to ctor to optionally interpret fractions as recursive fractions.
       If activated it constructs the recursive fractions using RooRecursiveFraction
       from the original fractions


   o LinkDef3.h, Module.mk

     - Add new class RooRecursiveFraction

==== Date: Tue Apr  1 22:42:19 2008 ====

   o RooDataWeightedAverage

     - New implementation of RooAbsOptTestStatistics that calculates data weighted
       average of any RooAbsReal. This class serves as successor of RooDataProjBinding
       that no longer complies with new optimization scheme. 

   o RooRealBinding

     - Implement name() function for more useful error messaging in integration


   o RooChi2Var,RooNLLVar

     - Follow changes in base class


   o RooAbsReal

     - In plotOn() support binning flag in ProjWData(). Reimplement data-weighted projections
       using new RooDataWeightedAverage class instead of RooDataProjBinding which does not
       work with new generic function optimization scheme. 

     - Add support for NumCPU() argument
       in plotOn() to facilitate multi-processor calculation of projections. Extend NumCPU()
       argument to pass interleaving option in MP splitting mode of RooAbsTestStatistic

     - Move fixAddCoefNormalization() and fixAddCoefRange() from RooAbsPdf to RooAbsReal
  

   o RooAbsTestStatistic

     - Generalize functionality: allow RooAbsReals as input arguments instead of RooAbsPdfs only.
       Also add virtual globalNormalization() function that allows to apply a global normalization
       term after combinedValue() operation to facilitate functionality of RooDataWeightedAverage.

     - Add option to split data in multiprocessor mode in interleave mode instead of in bulk mode.
       Interleave mode is useful for parallel processing of histogram data where bulk partitions
       may not contain equal amount of non-zero data points leading to non-optimal load balancing
       between processes.


   o RooAbsPdf

     - Move fixAddCoefRange() and fixAddCoefNormalization to RooAbsReal to support operation of
       new generalized RooAbsTestStatistic
     

   o RooIntegrator1D

     - Use name() of RooAbsFunc() to clarify warning and error messages.


   o RooRealIntegral

     - Rename _operMode to _intOperMode to avoid shadowing of equally named data member in RooAbsArg

     - Fix bug in recursive printing


   o RooSetProxy

     - Fix bug in print()


   o RooGlobalFunc

     - Modify ProjWData() and NumCPU() helper functions with extra optional argument


   o RooAbsOptTestStatistic

     - Follow changes in RooAbsTestStatistic


   o RooAbsFunc

     - Add virtual name() function to facilitate better error and warning messages from integrators

=== Date: Tue Apr 15 17:57:32 2008 ===

   o RooMsgService

     - Add option to prefix streamed messages with process ID to simplify
       debugging of parallel fits


   o RooAbsProxy

     - Add optional addContents flag to print()


   o RooArgProxy, RooSetProxy, RooListProxy

     - Implement addContents flag in print()


   o RooAbsReal

     - Reimplement stack of logged error messages in terms of custom EvalError class. 
       A separate list<EvalError> is now kept for each object that reports an error.
       In addition to the given error message a record is constructed of the proxy
       values at the time of reporting. 
 
     - In printEvalErrors() add option to restrict number of reported items per node.
       If number is zero, only number of errors per node is shown (without details)


   o RooRealMPFE
 
     - Adjust ReportErrors message to changes EvalError implementation in RooAbsReal.
 
     - Make sure to synchronize remote error logging state with state of parent process
       before each evaluate()


   o RooRealVar

     - Move printing of error from printValue() to printExtras()


   o RooNLLVar

     - Fix bug in setting of interleave parameter of base class in certain ctors


   o RooAbsPdf

     - Improve passing of eval error messsages by make separate messages for NaN
       and negative values and including details in the error message

     - Add PrintEvalError(Int_t nErr) option to fitTo() to control new eval error
       message control system

     - Int printValue show both value (raw from evaluate()) as well as most recently
       used normalization value (if available)


   o RooMinuit

     - Interface new eval error logging control by adding setPrintEvalErrors(Int_t numEvalErrors)

=== Date: Thu Apr 24 15:11:59 2008 ===

   o Various classes

     - Fix all -Wshadow compiler warnings

=== Date: Thu Apr 24 16:32:21 2008 ===

   o RooMsgService

     - Use TSystem::GetPid() rather than getpid() for portability


   o RooAbsReal

     - Make nested class EvalError public


   o RooWorkspace

     - Fix windows compiler warning

========================================

   o RooBanner

     - Increment version tag to 2.40

Revision 20988 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 22 14:54:13 2007 UTC (7 years, 2 months ago) by wouter
Original Path: trunk/roofitcore/src/RooProjectedPdf.cxx
File length: 6948 byte(s)
Diff to previous 20879

 
  ** Bringing trunk up-to-date w.r.t recent changes in branches/dev/roofit branch **

  Aggregated messages from branch commits follow

  --- Date: Fri Oct 19 20:35:30 2007 New Revision: 20422 ---

  o RooAbsArg

    - Add debug level print statement in findConstantNodes()

  o RooAbsAnaConvPdf

    - Do not expose cached RooCoefVars to constant term finding process.



  --- Date: Fri Oct 19 21:03:40 2007 New Revision: 20423 ---

  o RooPlot

    - Add forwarding function for all revent Set*() methods of TH1



  --- Date: Fri Oct 19 21:48:40 2007 New Revision: 20424 ---

  o RooAbsAnaConvPdf

    - Back out special handling of exposure of cached RooCoefVars 
      to constant term finding process.


  o RooObjCacheManager

    - Do not perform constant term finding on cache contents
      if cache manager is configured to perform clearOnRedirect
      for server redirects.



  --- Date: Wed Oct 31 23:36:10 2007 New Revision: 20587 ---

   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.


   o RooAddModel

      - Completely new implementation, based on existing RooAddPdf.
        RooResolutionModel functionality (convolution(),basisCode())
        taken from original RooAddModel. Reimplement integration strategy
        with caching of integral objects, rather than implementing
        only common analytical component

   o RooAbsAnaConvPdf,RooResolutionModel,RooAbsPdf

      - Remove special hook function that were required for functioning
        of original RooAddModel

   o RooObjCacheManager

      - Keep all _optCacheObservables versions created alive in separate owned list
        and only delete at end in dtor to avoid dangling pointer in complex
        optimizations

   o RooAbsArg

      - In optimizeCacheMode() ignore nodes that already have been const optimized.
        Although const optimization normally happens first, late cache optimization
        that happen upon late creation of objects can take place after const optimization.



  --- Date: Tue Nov 13 12:04:55 2007 New Revision: 20774 ---

   o RooAddModel

      - Completely new implementation, based on existing RooAddPdf.
        RooResolutionModel functionality (convolution(),basisCode())
        taken from original RooAddModel. Reimplement integration strategy
        with caching of integral objects, rather than implementing
        only common analytical component

   o RooAbsAnaConvPdf,RooResolutionModel,RooAbsPdf

      - Remove special hook function that were required for functioning
        of original RooAddModel

   o RooObjCacheManager

      - Keep all _optCacheObservables versions created alive in separate owned list
        and only delete at end in dtor to avoid dangling pointer in complex
        optimizations

   o RooAbsArg

      - In optimizeCacheMode() ignore nodes that already have been const optimized.
        Although const optimization normally happens first, late cache optimization
        that happen upon late creation of objects can take place after const optimization.

   o RooMsgService

      - Some restructuring to speed up code. 

      - Change topic naming from string to enum. 

      - Change debug-level print macros to take inline pre-decision
        based on static RooMsgService boolean that indicates if any debug
        stream is active. Also extend this speedup to doLogD() macro.

      - Allow multiple Topic specifications in a single stream using bit-wise
        or to reduce default number of streams from 6 to 2.

      - Terminate matching logic to streams early for 'universal' streams
        for which the logic does not depend on object properties.


   o RooGlobalFunc

      - Change Topic() argument from RooMsgService::MsgTopic to Int_t to allow specification
        of multiple topics


   o RooDataHist, RooMsgService, RooGenContext, RooAddModel, RooFFTConvPdf
     RooAbsAnaConvPdf, RooAbsReal, RooAddPdf, RooAbsOptGoodnessOfFit, RooAbsCachedPdf
     RooProfileLL, RooObjCacheManager, RooAbsArg, RooAbsPdf, RooRealIntegral
     RooAddGenContext, RooProdGenContext, RooConvGenContext, RooProjectedPdf, RooClassFactory
     RooWorkspace, RooTreeData
 
      - Follow change in RooMsgService interface



 --- Date: Tue Nov 13 13:13:05 2007 New Revision: 20776 ---


   o RooMCStudy

     - Initialize _genParams in 2nd ctor (fixes savannah #31139)



 --- Date: Fri Nov 16 21:24:52 2007 New Revision: 20853 ---


   o RooProdPdf, RooAddition

     - Fix memory leaks found with valgrind


   o RooMsgService, RooRealConstant, RooNumIntFactory, RooMinuit, RooNameReg, RooNumIntConfig, RooArgSet

     - Add cleanup() function to delete singleton at exit


   o RooMinuit

     - Initialize _warnLevel data member (valgrind)


   o RooAddModel

     - Disable coefficient projections in convolution mode
       (savannah #31302)


   o RooTrace

     - Remove messages about objects already deleted when not in verbose mode


   o RooSentinel

     - New class handling cleanup at exit


 --- Date: Mon Nov 19 16:41:52 2007 New Revision: 20901 ---


   o Makefile

     - Makefile to build stressRooFit


   o Makefile.arch

     - Stolen from $ROOTSYS/test


   o stressRooFit

     - Driver framework, base class of unit tests and
       automatic plot, curve, fit result comparison tools
       that unit tests can request


   o TestBasic1

     - Basic test running fitting, generation and plotting on Gaussian p.d.f



 --- Date: Wed Nov 21 17:58:28 2007 New Revision: 20965 ---

  o stressRooFit

    - Add regression test support for Double_t values
      and RooTables

    - In post-test analysis mode, analyze count of
      (silent) ERROR messages and fail test if they
      occcur

    - Eliminate memory leaks in testing framework

    - Add arguments '-n <N>' to run single test and
      argument '-mc' to run suite in memory checking 
      mode in which case no references files are opened
      to avoid ROOT I/O related noise in valgrind leak reports.

    - Link in 21 new tests


  o TestBasic2 ... TestBasic22

    - New stress testing modules. Modules 4,6,7,11,21 and 22
      are empty for now. All others are fully functional.



 --- Date: Thu Nov 22 14:32:14 2007 New Revision: 20980 ---


   o test/TestBasic15, test/TestBasic16, test/TestBasic20

     - Fix memory leak in test code itself


   o test/stressRooFit

     - Activate RooFit internal memory tracing when run in memory check mode


   o RooDataHist

     - Fix memory leak


   o RooMsgService

     - Add Tracing subject

     - Fix bug in printing of multi-subject streams 

     - Keep track of total number of (silent) ERROR messages

     - Add method to access contents of stream configurations


   o RooIntegrator1D, RooIntegrator2D, RooSegmentedIntegrator1D, RooSegmentedIntegrator2D, 
     RooGaussKronrodIntegrator1D, RooAdaptiveGaussKronronIntegrator1D, RooMCIntegrator, RooGrid

     - Fix default ctor to initialize all values used in dtor


   o RooAddModel

     - Add optional boolean to ctor to take ownership of components. Used
       in RooAddModel::convolution()

     - Fix memory leak in convolution()


   o RooFitResult

     - Migrations to RooMsgService

     - Add isIdentical() method for use in regression testing


   o RooCurve, RooHist

     - Add isIdentical() method for use in regression testing


   o Roo1DTable

     - Make persistable

     - Add isIdentical() method for use in regression testing


   o RooMath

     - Migrations to RooMsgService

     - Register static memory allocation of CERF lookup table in RooSentinel
       for cleanup in atexit().


   o RooAbsReal

     - Migrations to RooMsgService

     - Fix invalid read access due to wrong destructor order in plotAsymOn()

     - Fix memory leak in plotOn()


   o RooAbsCollection

     - Restrict creation of hash tables to deep-copy operations
       or shallow copy operations of lists with >30 elements


   o RooAddPdf, RooRealVar, RooDataProjBinding, RooFormulaVar, RooTreeData

     - Migrations to RooMsgService


   o RooAbsOptGoodnessOfFit

     - Fix memory leak


   o RooAbsPdf

     - Migrations to RooMsgService

     - Fix memory leak in fitTo()


   o RooNumIntFactory
            
     - Delete all owned prototype integrators in dtor


   o RooBinning

     - Fix ctors to always initialize _xlo and _xhi


   o RooResolutioModel

     - Register static identity RooFormulaVar with RooSentinel
       for cleanup in atexit()


   o RooSimPdfBuilder

     - Migrations to RooMsgService

     - Delete all fitCats and RooSimultaneous instances created 
       by builder in dtor

     - Return non-const top-level p.d.f. from buildPdf()


   o RooLinkedList

     - First delete hash tables, then clear list instead of
       reverse order to avoid invalid read problems with TList


   o RooMinuit

     - Migrations to RooMsgService

     - Initialize MINUIT print levels to -1 if RooMsgService
       is operating in silent mode

     - Trim initial error on parameters if param +/- 2*errors
       is out of param range


   o RooSentinel

     - Add cleanup hooks from RooMath and RooResolutionModel


   o RooSimultaneous

     - Fix memory leak

     - Migrations to RooMsgService


   o  RooProjectedPdf

     - Implement RooProjectedPdf::CacheElem dtor


   o  RooTable

     - Add pure virtual isIdentical() interface

Revision 20161 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 1 16:28:25 2007 UTC (7 years, 3 months ago) by wouter
Original Path: trunk/roofitcore/src/RooProjectedPdf.cxx
File length: 6887 byte(s)
Diff to previous 19583

   o RooAbsCache

    - New abstract base class for cache objects associated with RooAbsArgs.
      Caches register themselves with the owning RooAbsArg and propagate
      all necessary state changes and meta information to objects in the cache


   o RooCacheManager

    - Concrete template implementation of RooAbsCache with an interface
      and functionality styled after RooNormListManager. The template class
      provide no special handling for cache contents that includes RooAbsArg
      objects and does not forward hook calls. It is thus mostly intended
      to cache basic types indexed on a normalization/integration configuration


   o RooObjCacheManager

    - Class derived from RooCacheManager<RooAbsCacheElement> that implements
      all proper call forwarding and handling of state and other meta information
      to RooAbsArg objects embedded in the cache elements. To facilitate this
      functionality the RooAbsCacheElement defines a pure virtual method
      containedArgs() that must be implemented to expose its contents to
      the cache manager. The default behavior on a serverRedirect hook is
      to sterilize the cache. OperMode changes are not forwarded by default
      to the cache contents as cached objects do not necessarily have the
      same operation mode (e.g. if the cache contains an integral of its owner).
      Any calls to optimizeCacheMode(), printCompactTreeHook(), and findConstantNodes()
      are forwarded. Moreover, optimizeCacheMode() calls are remembered and
      any objects inserted in the cache after such a call was received will be
      optimized upon insertion in the cache

   o RooAbsCacheElement

    - Abstract base class for objects to be managed by RooObjCacheManager. Each
      object must in addition to its payload implement the containedArgs()
      member function that exposes the RooAbsArg object content to the manager
      for processing. The argument passed to containedArgs() indicates the use
      case for the returned list of objects, allowing the cache payload to
      return different lists depending upon use. This is for most applications
      not required.


   o RooAbsCachedPdf

    - Abstract base class derived from RooAbsPdf for p.d.f.s that implement 
      value caching in a grid over the entire domain of the observables. 
      The base class implements the overall caching logistics and manages
      the RooDataHists and RooHistPdfs that respresent the cached contents.
      Derived classes must inputBaseName() defined a unique name prefix for
      all cache objects, actualObservales() and actualParameters() to
      determined the actual observables and parameters given a set of 
      available observables and fillCacheObject() which should fill the
      RooDataHist cache for a given obs/params configuration with the
      p.d.fs values.


   o RooAbsSelfCachedPdf

    - Abstract base class derived from RooAbsCachedPdf that implements
      all of the required logistics in RooCachedPdf and only require
      derived classes from RooAbsSelfCachedPdf to implement evaluate().
      Any class derived from RooAbsPdf can thus be trivially switched
      to derived from RooAbsSelfCachedPdf and gain the caching functionality.
      

   o RooCachedPdf

    - Concrete class derived from RooAbsCachedPdf that implements
      the caching of an externally provided p.d.f in the constructor.


   o RooFFTConvPdf

    - Concrete class derived from RooAbsCachedPdf that implement generic
      numeric convolution of two input p.d.f.s using FFT technique
      and convolution theorem. Actual FFTs are calculated by FFTW
      through TVirtualFFT interface in ROOT. Present implementation only supports 
      convolution in one dimension, but this will be extended later
      as there are no fundamental limitations in RooAbsCachedPdf nor FFTW.
 

   o RooHistPdf

    - Moved from RooFit to RooFitCore because it is used by caching classes


   o RooProdPdf

     - Use new RooObjCacheManager to store partial objects

     - Fix memory leak (already patched in 15.0.14h)


   o RooDataHist

     - Use new RooCacheManager template to cache partial bin volumes

     - Add new set(),setAllWeights() method to update current weight and all weights
       respectively, for use in cached p.d.f.s

     - Add sliceIterator() that iterates over all bins in a lower dimensional 
       slice of the dataset


   o RooDataHistSliceIter

    - Class derived from TIterator that implements the iteration
      over a slice in a reduced number of dimensions in a RooDataHist


   o RooMsgService

     - Speed up processing of debug streams in cases where no debug streams are active

     - add macros series oocoutX and oocxcoutX that allow to associate message with
       a different object than *this

   o RooRealBinding

     - Interface new setValue method that allows value to be set outside default
       domain, but inside given alternate named range. For use in numeric integrator
       bindings


   o RooAbsRealLValue

     - Add new inRange() method with range name specifier to check against chosen
       range instead of default range


   o RooCmdConfig

     - Fix dangling return pointer problem in decodeStringOnTheFly() method


   o RooNameSet

     - Fix bug in refoll()


   o RooChi2Var, RooNLLVar

     - Add processing of AddCoefRange() named argument


   o RooConvCoefVar

     - Hold p.d.f in proxy without value/shape state propagation to obtain
       correct dependency of RooConvCoefVar through separate set proxy
       with parameters that do have state propagation

     - In getAnalyticalIntegral() ask for integration coefficient specific
       to coefficient (following interface change in RooAbsAnaConv)


   o RooEfficiency

     - Follow interface change in RooCategoryProxy


   o RooAbsAnaConvPdf

    - Use new RooObjCacheManager to hold normalization and coefficient representations

    - Extend getCoefAnalyticalIntegral() interface so that each coefficient
      can have a separate integration configuration

    - Modify makeCoefVars() such that it constructs the RooConvCoefVars with
      actual dependents for each coefficients, rather than inserting dependencies
      of any of the coefficients in each coefficient. This logic requires support
      from the implementation class that is interface through a new member function
      coefVars()


   o RooAbsReal 

    - Add Boolean data member treeVar that indicates is value buffer is also
      branch buffer of a tree. This information is already present in the RooAbsReal
      but is relatively expensive to retrieve and is always needed in the inner
      loop of data set operations. This extra member significantly speeds up operations

    - Remove superfluous _norm[] token in name returned by integralNameSuffix() if 
      no normalization set is supplied.

    - Add a fillDataHist() method that fills a given RooDataHist with a sampling
      of the given function. Added for support of caching p.d.f.s


    - Downgrading warning on non-dependent projection variables in plotOn() to
      a debug level message

    - Remove function optimizeDirty(),doConstOpt(),undoConstOpt(),findCacheableBranches()
      findUnusedDatasetVariables() and findRedundantCacheServers() as part of reorganization
      of optimization functionality.


   o RooAbsCollection

    - Use iterator semantics instead of vector semantics to process RooLinkedList
      contents in assignment operator

    - Add utility function contentsString() returning stl string with names
      of contents


   o RooAddPdf

    - Rewrite cache management using new RooObjCacheManager that holds projection
      integrals, range integrals and supplemental normalization lists


   o RooAbsOptGoodnessOfFit

    - Improve handling of normalization ranges and reference ranges for test statistics
      containing RooAddPdfs. New named argument in fitTo() and RooNllVar::ctor() pass
      reference range for fractions in RooAddPdf components that do not have an explicit
      fixed definition already. Name all normalization ranges explicitly after the
      subrange to which the're applied to avoid name clashes and conflicts if multiple
      normalization ranges are involved.

    - Rewrite informational messages through RooMsgService

    - Implement new constOptimizeTestStatistic() function that signals all test statistic
      components of a RooAbsArg expression tree to perform their constant term optimization

    - Implement new optimizeCaching() driver function that changes default lazy-evaluation-with-caching
      scheme to test statistic scheme where only parameters objects propagate state changes and
      where all components that depend directly or indirectly on observables have lazy evaluation
      disabled. Changes to p.d.f objects are delegated to RooAbsPdf::optimizeCacheMode(). Changes
      to dataset are delegated to RooAbsData::optimizeReadingWithCaching()

    - Implement new optimizeConstantTerms() function that is back end for constOptimizeTestStatistic
      implementation. 


  o RooAICRegistry, RooNormSetCache

    - Remove tracking of allocation cycles of RooArgSets as this scheme is superseded by
      memory pool mechanism for RooArgSet allocation


  o RooMappedCategory

    - Follow interface change in RooCategoryProxy.


  o RooRealMPFE

    - Follow reorganization of optimization functionality: implement new constOptimizeTestStatistic
      function for forwarding to slave processes.


  o RooRealVar

    - Add new setVal() function with range name to facilite setting of values that are outside
      default range, but inside specified alternate range. Needed for numeric integration and
      certain RooAddPdf coefficient projection.


  o RooAbsArg

    - Make state management functions public [is/set][Value/ShapeDirty](), setOperMode90
  
    - Add static _flipAClean boolean to support setACleanAdirty() static method.

    - Implement mechanism for registration of cache objects with base class RooAbsCache.
      Forward all calls to operModeHook(), redirectServersHook(), optimizeCacheMode()
      and printCompactTreeHook() to all caches for further processing
   
    - Define constOptimize() function and provide default implementation that forwards
      to all servers 

    - Implement optimizeCacheMode() function that puts expression tree in optimized
      caching for test-statistics operations (only cache/lazy evaluate nodes that
      do not (indirectly) depend on observables

    - Implement findConstantNodes() function that identifies all nodes that depend
      exclusively on constant observables and >0 observables that are eligible
      for precalculation and caching in test statistics operations by 
      RooAbsOptTestStatistic::optimizeConstantTerms()

    - Define constOptimizeTestStatistics that signal an expression tree that any
      embedded test statistic objects should perform their constant term optimization.
      Default implementation in RooAbsArg forwards call to all servers.


  o RooAbsPdf

    - Use new RooObjCacheManager to manage normalization integrals cache.

    - Process new SumCoefRange() option in fitTo() that sets the coeffient
      interpretation range for all embedded RooAddPdf objects of which
      the interpretation range was not explicitly set

    - Extend interface of fixAddCoefNormalizationSet(): add extra argument
      that controls if AddCoef normalization set are forcibly overruled
      for objects that already have an explicit range setting.

  
   o RooRealIntegral 

    - Add some informational messaging through RooMsgService, rewrite existing ones

    - Speed up numeric summations by precreating the involved RooSuperCategory
      in the ctor rather than in evaluate().

    - Fix bug in dependency insertion: explicitly require servers to be value
      server to avoid pulling in fake dependents.
    
    - Remove obsolete data members

    - Implement new setACleanADirty() function that atomically flips state of
      all AClean objects to ADirty for the duration of the integration step.
      Replaces the much more expensive prepareACleanFunc() that did this
      only for the objects involved.

    - Process factorizing terms in integral only if the list is not empty

    - Process Jacobian terms in integral only if the list is not empty


  o RooAddGenContext

   - Adapt to cache management chanches in RooAddPdf


  o RooNumIntFactory

   - Use STL classes for internal memory management


  o RooSetProxyy

   - Implement operator new() and operator() delete as required because
     RooArgSet implements them 


  o RooAbsGoodnessOfFit

   - Store and forward AddCoefRange information for embedded RooAddPdf objects

   - Implement constOptimizeTestStatistic() and forward to components


  o RooErrorVar

   - Follow inRange() interface change in RooAbsRealLValue


  o RooConvGenContext

    - Adapt code to make it work with both RooAbsAnaConv objects and
      the newly introduced RooFFTConvPdf


  o RooMinuit

    - Follow reorganization of optimization functionality


  o RooProjectedPdf

    - Store projection using new RooObjCacheManager


  o RooGlobalFunc

    - Add RooFit::SumCoefRange() named argument for RooAbsPdf::fitTo() 
      and RooNLLVar::ctor() and RooChi2Var::ctor()


  o RooClassFactory

    - Extend existing makePdf(),makeFunction and makeClass() functions
      to also accept RooAbsCategory arguments, to accept an optional string
      inserted as the return value expression inserted in the 
      evaluate() method of the class created, as well as as option string
      specifying one or more analytical integrations of the given function
      expression that will be advertised in the generated getAnalyticalIntegral()
      code and implemented in the generated analyticalIntegral() code

    - Add makeAndCompileFunction() and makeAndCompilePdf methods that
      generate the code and immediate compile it through ROOTs ACliC interface.
      These functions have a simpler interface because the list of arguments
      of the function to be created can be specified as a const RooArgSet&
      rather than a string with a list of names, thus making it easier
      for on-the-fly definition of compiled objects.

    - Add defineFunction() and definePdf() methods define and compile
      a function/pdf using the above functions and immediately instantiate
      an object of the given type passing the specified RooArgSet arguments
      to the constructor of the object. These functions make a compiled
      equivalent of RooFormulaVar based on the TFormula interpreter, i.e.

           RooAbsReal* f = new RooFormulaVar("f","D(1-2w)",RooArgSet(D,w)) ;

      becomes
       
           RooAbsReal* f = RooClassFactory::defineFunction("f","D(1-2w)",RooArgSet(D,w)) ;

   
  o RooAbsCategory

   - Add Boolean data member treeVar that indicates is value buffer is also
     branch buffer of a tree. This information is already present in the RooAbsReal
     but is relatively expensive to retrieve and is always needed in the inner
     loop of data set operations. This extra member significantly speeds up operations

   - Construct explit clean name for TBranch name if node is cached, equivalent
     to what is done in RooAbsReal. Needed because new constOptimizer can also
     cache RooAbsCategory objects


  o RooArgSet

   - Implement operator new() and operator delete() to implement memory pool scheme
     for RooArgSets. The goal of this implementation is to insure that two RooArgSet
     pointers are _never_ the same. This allows to RooNormSet cache manager to safely
     and quickly index integration and normalization configurations by evaluating
     the contents of a RooArgSet only the first time it sees it.


  o RooSimultaneous

   - Implement caching of partial integrals using new RooObjCacheManager

   - Following interface change in RooCategoryProxy ;


  o RooAbsData

   - Defined pure virtual methods optimizeReadingWithCache() and allClientsCached()


  o RooTreeData

   - Implement optimizeReadingWithCache() which determines given a p.d.f to be
     evaluated and a list of the nodes that are cached for it, which observables
     in the dataset are no longer required because they are either not an observable
     of the p.d.f, or they exclusively feed nodes that are cached. Reading of these
     observables is disabled through SetBranchStatus().
  
   - Move allClientsCached() utility function here from RooAbsReal.


  o RooCategoryProxy

   - Remove const char*() conversion operator in favor of a const char* label() method
     to remove possibly ambiguities in C++ math expressions involving category proxies.


  o LinkDef3.h

   - Add newly defined classes

Revision 19329 - (view) (download) (as text) (annotate) - [select for diffs]
Added Thu Jul 12 20:30:29 2007 UTC (7 years, 6 months ago) by wouter
Original Path: trunk/roofitcore/src/RooProjectedPdf.cxx
File length: 4947 byte(s)

  o Module.mk, Linkdef3.h

    - Add new classes


  o RooAbsArg

    - Mark proxy, client and server lists as persistable
    - Introduce dependsOnValue() function
    - Implement univeral printing method based on named proxies
    - Move debug tracing of function evaluation to new RooMsgService interface


  o RooAbsPdf

    - Make persistable: add dummy ctor, set class version to 1
    - Prevent persistence of normalization cache data members


  o RooAbsProxy

    - Add virtual print() method to support universal p.d.f. printing
    - Set class version number to 1
    - Prevent persistence of normalization set pointer


  o RooAbsReal

    - Move plotOn() print messages to new RooMsgService interface


  o RooAddPdf

    - Add default constructor
    - Prevent persistence of cache and cache management data members
    - Fix bug in evaluate()
    - Move debug tracing of function evaluation to RooMsgService interface


  o RooArgProxy

    - Implement print() method
    - Increment version number to 1


  o RooGenContext

    - Add extensive informational and debug message in ctor through RooMsgService interface


  o RooGlobalFunc

    - Add new helper functions for RooMsgService class


  o RooListProxy

    - Implement print() method


  o RooMinuit

    - Improve verbosity control


  o RooMsgService

    - New singleton class that handles RooFit output in flexible way. All messages are
      classified with a level (debug,info,warning,error,fatal), a topic (can be any string,
      for now have defined "generation" and "plotting") and by object properties (name,
      class name, base class name, or presence of specific attribute tag). Output is
      filtered and processed by one or more reporting stream that can each apply different
      filtering criteria and or send output to an alternate ostream or output file.


  o RooProdPdf

    - Add new ctor with only named argument to allow definition of
      product with exclusively conditional p.d.f.s
    - Add default ctor
    - Increment class version number to 1
    - Prevent persistence of cache and cache management data members


  o RooProdGenContext

    - Add extensive informational and debug message in ctor through RooMsgService interface
    - Fix bug in parsing stage that did not properly handle cases like f(x|y)g(y|x)


  o RooProjectedPdf

    - New class of p.d.f. that represents projection (integral) of another p.d.f.
      Integrals and normalizations of constructed on the fly from the original and
      multiple sequential projections steps are automatically consolidated into a single
      step (i.e. creating a projection of a RooProjectedPdf will result in the same
      integrator configuration as creating the same projection immediately from
      the original p.d.f.). Intelligent handling/forwarding of internal generator
      techniques is not implemented yet.


  o RooRealProxy

    - Increment class version number to 1


  o RooSetProxy

    - Implement print() method


  o RooTreeData

    - Fix in createTree() routine to avoid ROOT error messages on buffer writing


  o RooWorkSpace

    - Initial version of new concept class that is essential starting point for the RooStats project.
      A workspace is a container class that owns all components of an analysis,
      i.e. p.d.f.s. functions variables and datasets. Objects imported in the
      workspace are automatically cloned and internally connected to provide a
      consistent working environment. Workspace also serve to persist complete
      analysis projects

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: