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

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

Parent Directory Parent Directory


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

Revision 44507 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 4 12:30:41 2012 UTC (2 years, 7 months ago) by axel
File length: 4976 byte(s)
Diff to previous 41676
Remove
  using namespace std;
from Riostream.h, which has huge consequences for all of ROOT.
Riostream.h is now a simple wrapper for fstream, iostream, iomanip for backward compatibility; Riosfwd.h simply wraps iosfwd.

Because of templates and their inline functions, Riostream.h needed to be included in headers, too (e.g. TParameter.h), which violated the assumption that Riostream.h is not exposing its using namespace std to headers.
ROOT now requires R__ANSISTREAM, R__SSTREAM, which does not change the set of supported compilers.

Without "using namespace std", several identifiers are now prefixed by std::; e.g. roofit/* source files now have a using namespace std to keep their coding style.
TFile::MakeProject() now generates "using namespace std" to convert the CINT-style class names into C++ ones.

Revision 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: 4956 byte(s)
Diff to previous 41536
   *** Miscellaneous speed improvements ***
  
    o PiecewiseInterpolation

      - Import changes from Max baak (new interpolation options)

      - Deploy fast iterators


    o RooGaussian

      - Bug fix in analytical integral over 'mean' parameter (Lorenzo Moneta)


    o RooBernstein

      - Deploy fast iterators


    o RooProdPdf

      - Reorganize code for improved speed


    o RooDataHist

      - Add support for vector-based data storage


    o RooGenContext

      - Improve generation speed by putting internal pdf clone to ADirty mode


    o RooRealBinding

      - Minimize number of calls to min() and max() for efficiency reasons


    o RooAbsRealLValue

      - In randomize() Minimize number of calls to min() and max() for efficiency reasons


    o RooDataSet

      - Make addFast() even faster by disable state propagation


    o RooAbsGenContext

      - Disable state propagation in output dataset for efficiency reasons
      - Call initGenerator() only on the first generation sequence

 
    o RooVectorDataStore

      - Add support for native vs current buffers, to support the functioning
        of addColumn(s)() and cacheArgs() when the datastore is attached
        to a pdf in RooAbsOptTestStatistics

   
    o RooAbsCategoryLValue

      - Support change in RooAbsCategory to operate nominally by index rather than by label


    o RooXYChi2Var

      - Change code to support new pdf/data attachment scheme in RooAbsOptTestStatistics
        where only the store buffers are reattached and the variable objects themselves


    o RooFFTConvPdf

      - Bug fix in getActualObservables() - functionality of setCacheObs() is now restored


    o RooAbsReal

      - Small adjustments in getVal() to make it faster in most cases


    o RooAbsCollection

      - Add datamember to keep track contents is exclusively RooRealVars. For those that
        do implement a faster version of assignFast()


    o RooAbsData

      - Add methods attachBuffers() and resetBuffers() - forwarded to datastore - that
        facilite new 'fast-attach' methods used in RooAbsOptTestStatistic


    o RooCompositeDataStore

      - Fix copy constructors so that they clone and own the subsidiary datasets

      - Operate index by value rather than by string label for efficiency reasons


    o RooRealVar

      - Bug fix in attachToVStore() to properly handle RRVs with StoreError tags


    o RooAbsPdf

      - Adjustments in getVal() to make it faster for most cases
      - Modify generate(GenSpec*) to initialize specInit flag that
        triggers one-time call of initGenerator()
      - Modify generate() to not repeatedly call initGenerator() for the same gencontext

 
    o RooAbsArg

      - Deploy fast iterators in more places
      - Add various new inline methods performing multiple ops (e.g retrieving and
        clearing one or more dirty flags) for improbed RooAbsReal/RooAbsPdf::getVal()
        operations
   

    o RooBanner

      - Increment version tag to 3.48


    o RooRealIntegral

      - Add overloaded getVal() method that also checks for shapeDirty flag,
        which was removed from RooAbsReal::getVal() as it is not needed for
        any class other than RooRealIntegral


    o RooAddGenContext

      - Disable state propagation in output dataset for efficiency reasons
      - Replace ROOT container classes with STL versions for efficiency reasons


    o RooMultiCatIter

      - Adjust code to new RooCatType behaviour that by default only tracks the
        integer representation of type


    o RooProdGenContext

      - Replace ROOT container classes with STL versions for efficiency reasons


    o RooTreeDataStore

      - Adjust code so that it works with the new fast-attach mechanism used
        in RooAbsOptTestStatistic


    o RooRealProxy

      - In lvptr() remove explicit check for lvalue


    o RooSimGenContext

      - Disable state propagation in output dataset for efficiency reasons
      - Replace ROOT container classes with STL versions for efficiency reasons
      - In createDataSet() create a prototype dataset in the first call, and
        clone that for subsequent calls rather than calling the expensive named
        argument constructor each time


    o RooTrace

      - Add (dummy) method callgrind_zero() and callgrind_dump() as hook functions
        to facilitate improved callgrind profiling


    o RooAbsCategory

      - Adjust class so that it works with the integer representation of types only
        and lookup associated string label on the fly, whenever it is requested


    o RooFormular

      - Eliminate overloaded getVal() as its functionality is now provided in 
        RooAbsReal::getVal()


    o RooAbsOptTestStatistic

      - Implement new fast-attach mechanisms for pdf and datasets: only readjust the
        buffer pointers of the dataset to the pdf observables, rather than reattaching
        the pdf to the dataset observables. This results in a _much_ faster 
        operation of setData() and no longer entangles the test statistics with observables
        of datasets that may be deleted during the lifetime of the test statistic

 
    o RooSimultaneous
 
       - Overload fillDataHist() with new version with correct normalization (from Scott Snyder)


    o RooCategory

       - Adjust getLabel() so that it retries labels associated with the current index on the fly


    o RooCatType

       - Make label contents 'transient', i.e. it is not copied on assignment for faster 
         category operations. RooAbsCategory will load the associated labels on demand from now on.

Revision 41536 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 21 20:30:29 2011 UTC (3 years, 3 months ago) by wouter
File length: 4928 byte(s)
Diff to previous 36230
   *** Deployment of vector datastore & miscellaneous speed improvements ***  

   o RooProduct,RooProdPdf,RooRealSumPdf,RooConstraintSum,RooAddition

     - Deploy minimal iterator


   o RooDataHist

     - Add sumEntries() 
     

   o RooDataSet

     - In ctor, allow choice of vector and tree data store.
     - Change calls to attachToTree() to attachToStore()     
     - Add sumEntries() forwarding call to stre


   o RooVectorDataStore

     - New RooAbsDataStore implementation, based on STL vectors
       rather than TTrees


   o RooAbsReal

     - Adjust getVal() so that clean-cache elements are processed more efficiently
     - Add attachToVStore() 
    

   o RooAbsCollection,RooLinkedList

     - Add minimalIterator() returning by valye a minimistic iterator (forward step only)
       with a non-virtual step function


   o RooAddPdf

     - Deploy minimal iterator
     - Skip evaluation of supplemental normalization factors if the're all one


   o RooAbsData

     - Add static member encoding default storage type (vector vs tree)
     - Add method convertToVectorStore() to convert datasets with a tree-based store
       to a vector-based store


   o RooCompositeDataStore

     - Implement dummy loadValues() method


   o RooRealVar

     - Implement attachToVStore()


   o RooAbsPdf

     - Deploy minimal iterators
     - In getVal() also check for negative integrals as problematic value


   o RooAbsArg
 
     - Implement default version of isDerived() that always returns kTRUE
     - Add pure virtual method attachToVStore()
     - Deploy minimal iterators
     - Implement attachToStore() which forwards to attachToTree() or attachToVStore()
       depending on the storage type


   o RooTreeDataStore

     - Use setOperMode() with recursion where needed instead of looping manually
       over branches
     - Implement sumEntries()


   o RooNameReg

     - Add special fast handling of null pointers for conversions both ways


   o RooAbsCategory

     - Implement attachToVstore()


   o RooRealVar

     - Implement isDerived() method that was orignally in RooAbsArg
     - Implement attachToVStore() that optionally attaches error buffers too


   o LinkDef3, Module.mk

     - Add class RooVectorDataStore


   o RooAbsString

     - Implement dummy attachToStore()


   o RooConstVar, RooCategory

     - Implement isDerived() that always returns kFALSE 


   o RooAbsDataStore

     - Add pure virtual method sumEntries()
     - Add pure virtual method loadValues() 


   o RooLinkedListIter

     - Add class RooMinimalLinkedListIterator for forward-only 
       iteration without virtual function calls 
     - Add typedef to RMLLI
     - Add non-virtual NextNV() to RooLinkedListIter

Revision 36230 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Oct 9 20:21:02 2010 UTC (4 years, 3 months ago) by wouter
File length: 4805 byte(s)
Diff to previous 28259
  And yet more Coverity fixes

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

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

     - Upgrade inline documention: make sure that every member function has some descriptive comments, every
       data member has a descriptive comment, make sure that each class has a description.

     - Fix class description header so that it is correctly identified by THtml

     - Remove a couple of obsolete member function

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

     - Follow changes in RooAbsCachedPdf 


   o RooCachedPdf

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

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

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


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

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


   o RooMsgService

     - Add new topic NumericIntegration

     - Show PROGRESS level messages by default


   o RooAbsSelfCachedReal

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


   o RooCachedReal

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


   o RooRealBinding

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


   o RooLinearMorph

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


   o RooAbsRealLValue

     - Following changes in RooAbsLValue

 
   o RooHistFunc

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


   o RooAbsCachedReal

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

   o RooFracRemainder

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


   o RooCustomizer

     - Fix memory management issue for sterile use


   o RooAbsCategoryLValue

     - Follow changes in RooAbsLValue


   o RooNumCdf

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


   o RooFFTConv

     - Fix bug in cache naming algorithm

     - Follow changes in RooAbsCachedPdf


   o RooChangeTracker

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


   o RooHist

     - Bug fix in makeResidual()


   o RooAbsReal

     - Fix small memory leak in createIntegral

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

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

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

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

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


   o RooAbsCollection

     - Bug fix in nameFieldLength handling of print routine


   o RooAbsCachedPdf

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

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

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

     - Forward integration handling to cache pdf actually being used


   o RooDataHistSliceIter

     - Follow changes in RooDataHist for alternate binning 


   o RooRealMPFE

     - Follow changes in eval error logging in RooAbsReal


   o RooAbsPdf

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


   o RooAbsArg 

     - Fix bug in optimizeCacheMode()


   o RooBrentRootFinder

     - Improve error messaging through RooMsgService interface.


   o RooCmdArg

     - Expand payload from 2 to 3 strings


   o RooSimWSTool

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


   o RooNumRunningInt

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


   o RooMultiCategory, RooSuperCategory

     - Minor tweak in name of proxies


   o RooAbsIntegrator

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


   o RooMinuit

     - Fix gcc 4.3 compiler warning


   o RooWorkspace

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

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

     - Add separate section for category functions in Print()


   o RooHistPdf

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

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


   o RooAbsOptTestStatistic

     - Optimize handling of empty rangeName specification (from Alfio)


   o RooSimultaneous

     - Tune proxy names

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


   o LinkDef3.h, Module.mk

     - Add new class definitions

Revision 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: 4427 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 23134 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 11 07:53:39 2008 UTC (6 years, 9 months ago) by rdm
File length: 4366 byte(s)
Diff to previous 21631
move the following directories to "roofit":

roofitcore, roofit

Revision 21631 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Jan 10 20:03:35 2008 UTC (7 years ago) by wouter
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4366 byte(s)
Diff to previous 21379
   ***********************************************************************
   * NOTE: THE FOLLOWING FILES MUST BE REMOVED BY HAND AFTER THIS COMMIT *
   *       WHEN UPDATING AN EXISTING RELEASE AREA                        *
   *                                                                     *
   *       include/RooNormManager.h                                      *
   *       include/RooNormListManager.h                                  *
   *       roofitcore/src/RooNormManager.o                               *
   *       roofitcore/src/RooNormManager.d                               *
   *       roofitcore/src/RooNormListManager.o                           *
   *       roofitcore/src/RooNormListManager.d                           *
   *                                                                     *
   ***********************************************************************

   o RooNormListManager, RooNormManager

     - Removed, now obsolete. Replacement is RooObjCacheManager 


   o RooNumber

     - Add non-inlined accessor function infinity() to replace
       static double inifinity to fix Windows linked problems


   o RooStreamParser, RooCurve, RooRangeBinning, RooNumConvolution
     RooHistError, RooTreeData, RooRealVar, RooBinning, RooErrorVar

     - Follow migration of RooNumber::infinity()


   o RooPlot

     - Fix SetTitle()


   o RooDataSet

     - Initialize wgtVar ptr in default ctor


   o RooAbsReal

     - Redesign scheme to import non-double TTree branches
       to RooAbsReal buffer to fix gcc warnings on 
       strict aliasing rules for type-punned pointers.


   o RooAbsPdf

     - Make globalSelectComp() non-inline to avoid
       Windows linking problems.


   o RooResolutionModel

     - Fix crash in use of resolution models when completely
       const-optimized by deleting _norm pointer on a 
       serverRedirect.


   o RooAbsCategory

     - Redesign scheme to import non-integer TTree branches
       to RooAbsReal buffer to fix gcc warnings on 
       strict aliasing rules for type-punned pointers.

   o LinkDef2.h, Module.mk

     - Remove classes RooNormManager, RooNormListManager

   o RooBanner

     - Increment version tag to 2.31

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

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

    - Include "Riostream.h" in implementations where necessary

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

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

    - Elimination of some duplicate headers

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

Revision 21136 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Nov 30 22:33:08 2007 UTC (7 years, 1 month ago) by wouter
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4279 byte(s)
Diff to previous 20879
  o RooResolutionModel, RooSimultaneous, RooAbsCategory

    - Fix uninitialized values in ctor

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

Revision 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/inc/RooAbsCategory.h
File length: 4259 byte(s)
Diff to previous 18735
   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 18735 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 11 09:13:47 2007 UTC (7 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4209 byte(s)
Diff to previous 13546
Change structure and names of files to that of ROOT CVS repository

Revision 13546 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Dec 8 13:19:58 2005 UTC (9 years, 1 month ago) by wverkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4233 byte(s)
Diff to previous 12082
   o RooCategorySharedProperties

     - Shared properties implementation for RooCategory. Contains
       definition of named ranges.

   o RooCategory

     - Move towards shared properties implementation of named ranges


   o Roo1DTable RooAbsArg RooAbsCategory
     RooAbsCollection RooAbsString RooArgList
     RooArgSet RooCategory RooCategory
     RooCategoryProxy RooConvCoefVar RooConvGenContext
     RooCustomizer RooDataHist RooErrorVar
     RooFitResult RooGenCategory RooGenCategory
     RooGraphEdge RooGraphNode RooGraphNode RooHtml
     RooImproperIntegrator1D RooMultiCategory RooNameSet
     RooNumIntConfig RooNumIntFactory RooSuperCategory
     RooSuperCategory RooTable RooThreshEntry

     - Replace many ROOT header includes by forward declarations

Revision 12082 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Jun 20 15:45:21 2005 UTC (9 years, 7 months ago) by wverkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4276 byte(s)
Diff to previous 11619
   o RooBanner

     - Update version number and copyright


   o Many files

     - Change <iostream> to "Riostream" to support compilation on platforms
       that do not have iostream classes in namespace std


   o RooAbsAnaConvPdf

     - Fix bug in range integration in getAnalyticalIntegralWN()

     - Change getCoefAnalyticalIntegral() signature to include rangeName in argument list


   o RooAbsArg

     - Add methods getObservables()/getParameters with const RooAbsData& argument


   o RooAbsPdf

     - Add support for Range(Double_t, Double_t) to specify fit range in fitTo()

     - Migrate getMaxVal()/maxVal() to RooAbsReal [Gerhard]

     - Fix bug in normalization of PDF projections over limited range: account for both
       fraction of data in range and fraction of projection in range (calculation of latter
       deferred to RooAbsReal::plotOn)


   o RooAbsReal

     - Migrate getMaxVal()/maxVal() from RooAbsReal [Gerhard]

     - Add code in plotOn() to support normalization of PDF projections plotted in limited range


   o RooAbsRealLValue, RooRealVar, RooErrorVar, RooLinearVar

     - Change getBinning() so that it only creates a new binning on the fly if a newly added boolean argument
       is true. Otherwise, return default binning


   o RooAdaptiveGaussKronrodIntegrator1D, RooGaussKronrodIntegrator1D

     - Declare prototypes for glue functions


   o RooArgSet

     - Fix readFromStream() and writeToStream() so that they are consistent with each other again for
       both regular and scientific notation mode.

     - Fix processing of include directives inside files in readFromFile()

     - Suppress warning messages about ignored lines in files unless verbose flag is set. Add verbosity control
       flag to readFromFile().


   o RooCategory

     - Support concept of ranges for categories as well through new member functions setRange(),addToRange(),
       clearRange(),hasRange(),isInRange() and isStateInRange(). Ranges are named TLists containing a non-owned
       subset of the possible RooCatTypes.


   o RooCategoryProxy

     - Make lvptr() const since it is.


   o RooConvCoefVar

     - Pass rangeName in getAnalyticalIntegral() to getCoefAnalyticalIntegral()


   o RooPlotable, RooCurve, RooHist, RooEllipse

     - Implement getFitRangeNEvt(Double_t, Double_t) that returns the number of events in the given sub-range.


   o RooDataHist

     - Fix bug using RooAbsData::plotOn --> using RooTreeData::plotOn


   o RooGlobalFunc

     - Add adjustNorm boolean argument to named argumentss Range()


   o RooMultiCatIter

     - Require that input is RooAbsCategoryLValue rather than RooAbsCategory.


   o RooPlot

     - Keep track of object that generated normalization event count in addition to event count itself.
       This allows to later on calculate an event count in a limited range through getFitRangeNEvt(Double_t, Double_t)


   o RooRealIntegral

     - Support ranges in category summation in integration code.


   o RooSimPdfBuilder

     - Fix bug in unitarity constraint split of parameter in partial build: adjust formula for remainder fraction
       so that it only uses the states that are actually built.

     - Improve error handling


   o RooSuperCategory

     -  Implement hasRange() and isInRange() functionality inherited from RooAbsRealLValue


   o RooClassFactory

     - New class that automatically generates code for PDFs and functions given a name and a list of argument names


   o RooEffProd

     - New class that implement product of PDF and efficiency function. Main feature is efficient implementation
       of event generator in case input PDF has 'smart' event generator

   o RooEffGenContext

     - Generator context associated with RooEffProd


   o Module.mk

     - ROOT make file module needed to compile RooFit as part of ROOT


   o make_roofit_installkit

     - Script to package RooFit source as ROOT module for compilation with ROOT system

Revision 11619 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 18 21:44:54 2005 UTC (9 years, 9 months ago) by wverkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4074 byte(s)
Diff to previous 11181
  Upgrade compiler warning level to

    -Wall -W -Woverloaded-virtual

  Fix classes where necessary to support compilation at this
  warning level

Revision 11181 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Feb 25 14:23:04 2005 UTC (9 years, 10 months ago) by wverkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4081 byte(s)
Diff to previous 10638
   o All files

     - Update copyright notice from 2004 to 2005

Revision 10638 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 29 12:22:24 2004 UTC (10 years, 1 month ago) by wverkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4080 byte(s)
Diff to previous 8538
  o All Classes

    Migration from classic to standard IOstreams

Revision 8538 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 5 22:44:13 2004 UTC (10 years, 9 months ago) by wverkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4067 byte(s)
Diff to previous 5212
  o All files

    - Update (c) to 2004

Revision 5212 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 5 04:34:04 2002 UTC (12 years, 4 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4006 byte(s)
Diff to previous 5209
  o All files

   - Fix aesthetic detail in new headers

Revision 5209 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Sep 4 21:07:02 2002 UTC (12 years, 4 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 4068 byte(s)
Diff to previous 5174
  o All files

    - Replace file header with new 'legalized' version

  o LICENSE

    - New file with full text of license agreement

Revision 5174 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Aug 21 23:06:42 2002 UTC (12 years, 5 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3455 byte(s)
Diff to previous 4325
  Major new version (to become V00-01-00)

  o README

    - Update standalone compilation instructions
      Refer BaBar users to RooFitBabar/README

  o RooAICRegistry

    - Fix memory leak

  o RooAbsArg

    - Add default implementation of constOptimize() that
      forwards the call to all servers

    - Add RooAbsOptGoodnessOfFit, RooRealMPFE as friends

    - Add protected pure virtual method setTreeBranchStatus()
      that can be used by the optimizer to disable reading
      of the tree branch associated with the RooAbsArg

  o RooAbsBinning

    - Add description

  o RooAbsCategory

    - Add operator==()

    - Implement setTreeBranchStatus()

  o RooAbsCollection

    - Add addClone(RooAbsCollection&,...) to add a list of clones

  o RooAbsData

    - Add pure virtual methods for new caching mechanism:
       * cacheClone() returns a clone of the dataset with cache
       * resetCache() clears the existing cache
       * setArgStatus() disables reading of given args from tree

  o New class RooAbsGoodnessOfFit

    - Abstract base class for goodness-of-fit variables.
      A goodness-of-fit is any quantity calculated from a PDF
      and a dataset. This class orgamizes parallelization over multiple
      CPUs and calculation of GOFs from simulatenous PDFs.

  o New class RooAbsOptGoodnessOfFit

    - Abstract base class for goodness-of-fit variables
      that calculate the PDF value at each data point in the
      given dataset. It implements various optimizations:
      caching of constant terms, elimination of unused variables etc.

  o RooAbsPdf

    - Deploy new normalization integral manager RooNormManager
      to cache multiple normalization integrals for a PDF.
      This greatly increases the efficiency for certain situations
      where PDFs are alternatingly called with 2 or more different
      normalization choices

    - Reimplement fitTo() in terms of RooNLLVar and RooMinuit.

    - Reimplement plotNLLOn() in terms of RooNLLVar and plotOn()

    - Migrate plotNLLContours to RooMinuit

    - Remove obsolete method fitContext

  o RooAbsReal

    - Add operator==()

    - Implement setTreeBranchStatus()

    - Fix memory leak in createProjection()

  o RooAbsString

    - Implement setTreeBranchStatus()

  o RooAddModel

    - Eliminate getNormSpecial() construction that was originally
      introduced to efficiently handle calls with 2 alternating
      projection/normalization configurations originating from
      RooConvolutedPdf. This is now handled by RooNormManager.

  o RooAddPdf

    - Reimplement caching of coefficient projection list and
      supplemental normalization list using RooNormListManager.
      (Also supports caching of multiple configurations now)

  o RooArgSet

    - Implement addClone(RooAbsCollection&,...)

  o RooBanner

    - Add description

  o RooBinning

    - Add description

  o New class RooChi2Var

    - Implementation of simple Chi^2 of RooAbsOptGoodnessOfFit
      for a RooDataHist and a RooAbsPdf.

      Chi^2 is calculated from PDF value at the bin center.
      Poisson errors are used if no user defined errors are present

  o RooConvolutedPdf

    - Reimplement normalization integral management using
      RooNormListManager

    - Deprecate use of RooResolutionModel::getNormSpecial. No longer needed.

  o RooCustomizer

    - Fix memory leak

  o RooDataHist

    - Add lo/hi Error associated with each bin. Default implementation
      returns poisson errors. Error is return by weightError().

    - New set() function allows user to override poisson errors

  o RooDataSet

    - Fix copy ctor for weighted datasets

    - Implement cacheClone()

  o RooDirItem

    - Add description

  o RooDouble

    - Add description

  o RooExtendPdf

    - Follow changes in normalization management of RooAbsPdf

  o Removed class RooFitContext

    - Replaced by RooMinuit/RooNLLVar

  o RooFitResult

    - Change terminology NLL -> FCN (fits are no longer NLL necessarily)

    - Store and report accuracy code of minuit error matrix

    - Minor tweaking of parameter dumps with mixed symmetric/asymmetric
      errors

  o RooGenericPdf

    - Follow changes in RooAbsPdf normalization management

  o RooIntegratorConfig

    - Add description

  o RooLinTransBinning

    - Add description

  o RooLinkedListElem

    - Add description

  o RooLinkedListIter

    - Add description

  o New class RooMPSentinel

    - New class to keep track of server processes started for
      parallelized goodness-of-fit calculations. On linux
      hosts, these processes don't exit when the parent process
      exits. This class sends termination signals when this
      singleton class is deleted

  o RooMath

    - Activate CERF disk caching by default

  o New class RooMinuit

    - New seamless interface between RooFit objects and MINUIT
      Class propagates information forth and back between RooAbsArg
      objects and minuits internal memory buffer (e.g. parameter
      values, errors, step sizes, constant status)

    - This class minimizes any RooAbsReal function (doesn't need to
      be a NLL or Chi2)

  o Removed class RooNLLBinding

    - Obsolete after introduction of RooNLLVar

  o New class RooNLLVar

    - Implementation for NLL of RooAbsOptGoodnessOfFit

  o RooNameSet

    - Fix memory leak

  o New class RooNormManager

    - New manager class for normalization/projection integrals for PDFs
      This class matches RooArgSet pointer pairs to the integration
      and normalization sets to previously registered integrals.
      Multiple pointer pairs can point to the same integral (e.g.
      pointer to different RooArgSets with the same contents) and
      multiple integrals can be cached. This class doesn't create
      the normalization integrals. It merely indicates if it has
      one or not, and leaves it up to the owning class to create
      and register new normalizations


  o New class RooNormListManager

    - Similar to RooNormManager, except that RooArgLists of normalization
      integrals are caches instead of single integrals

  o RooNormSetCache

    - Rework functionality. This class, used by RooNorm(List)Manager
      manages multiple redundant RooArgSet pointer pairs that represent
      the same projection/normalization configuration

  o RooProdPdf

    - Almost complete rewrite in terms of RooNormListManager


  o RooRealConstant

    - Minor const changes

  o RooRealIntegral

    - Streamline iterator use: Create various interator in ctor
      and reuse them in evaluate() instead of creating and deleting
      them on the fly

  o New class RooRealMPFE

    - Front end for MultiProcessor calculations. Class RooRealMPFE
      takes a RooAbsReal as argument and calculates it in separate
      process. Calculations can be started asynchronously with
      the calculate() call. The rest of the interface (and behaviour)
      is identical to that of the original RooAbsReal.

  o RooResolutionModel

    - Deprecate getNormSpecial - superceded by RooNormManager

  o RooSetProxy

    - Implement addClone(const RooAbsCollection&,...)

  o Removed class RooSimFitContext

    - Obsolete - replaced by RooMinuit/RooNLLVar

  o RooSimGenContext

    - Fix memory leak

  o RooSimultaneous

    - remove obsolete fitContext() method

  o RooTreeData

    - Reimplement caching. Cached functions are now stored in
      a separate tree in the dataset. Main benefit of the new
      implementation is that caches can efficiently be reset
      and refilled on the fly

  o makedocs

    - Add stanzas for new tutorial macros

Revision 4325 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 8 20:20:45 2002 UTC (12 years, 9 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3339 byte(s)
Diff to previous 3067
  o RooAbsCategory

    - Add protected defineTypeUnchecked(label,index) for internal
      use that skips any checks for duplicate label definition.

    - Implement member functions in using iterators instead of
      array semantics to prepare for future migration to different
      state list container class

  o RooAbsCollection

    - Enable hash tables lookup in snaphot output container to reduce
      tree copying and reconnection time

  o RooCustomizer,RooSimPdfBuilder

    - Enable hash table lookup in various internal lists to speed
      up build process

  o RooHashTable

    - Add member function to return current hash table size

  o RooLinkedList

    - Add get/setHashTableSize() function to steer hash table lookup
      in lists. Tables can be resized or activated at any moment in
      the lists lifetime.

  o RooSuperCategory

    - Use defineTypeUnchecked() instead of defineType() in
      updateIndexList()

Revision 3067 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Oct 19 06:56:53 2001 UTC (13 years, 3 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3171 byte(s)
Diff to previous 2995
  o RooAbsArg

    - Introduce static variable and function nameFieldLength()
      that controls size of the name field when printing
      in standard print mode. Default(0) makes field fit
      name of object

    - Introduce universal value assignment via virtual
      operator=() to Double_t, Int_t, const char*.
      Default implementation in RooAbsArg results in user
      error message.

    - Extend createFundamental() to optionally take a new name
      as argument

    - Add new pure virtual fillTreeBranch() method in which
      subclasses must implement a method to fill their branches
      in the given tree with their current value

  o  RooAbsCategory,RooAbsReal,RooAbsString

     - Implement fillTreeBranch()
     - Adjust createFundamental()

  o  RooAbsCollection

     - Fix replace() to find correct replacement candidate if >1
       object exists in list with name of variable to be replaced

     - In printToStream() adjust RooAbsArg::nameFieldLength()
       to size of longest argName contained in list

  o  RooAbsData

     - Fix default ctor to instantiate unpersisted data members

  o  RooArgList

     - Add operator[] taking index as argument, returning a
       RooAbsArg&. If index is out of range, a softAbort() is
       generated

  o  RooArgSet

     - Add operator[] taking arg name as argument, returning a
       RooAbsArg&. If index is out of range, a softAbort() is
       generated

  o  RooErrorHandler

     - New lightweight class implementing softAssert()
       and softAbort() that will terminate processing
       but not kill the root session.

  o  RooCustomizer

     - Make inherit from RooPrintable and implement Print() method

  o  RooDataSet

     - Add self to gDirectory() in every ctor to facilitate persistence.
       Remove internal ttree from gDirectory to avoid unnecessary entries.

  o  RooFormula

     - Disable conditional compilation pending investigation of some
       obscure problems

  o  RooRealVar

     - Add static functions printScientific() and printSigDigits()
       that control formatting in print() and writeToStream().

     - Augment format() to be able to print both value and error
       with specified precision (instead of always using the precision
       from the error when its printed)

  o RooStreamParser

     - Process continuation line sequences '\\' in readLine()

  o RooStringVar

     - Implement operator=(const char*)

  o RooTreeData

    - Change cacheArg() and cacheArgs() to use new column adding
      technique implemented via fillTreeBranch()

    - Change addColumn() and to use new column adding
      technique implemented via fillTreeBranch().
      Add new addColumns() member to do multiple columns at once.

Revision 2995 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Oct 8 05:20:24 2001 UTC (13 years, 3 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3108 byte(s)
Diff to previous 2887
  Documentation update
  --------------------

  o Most classes

    - Update inline documentation

  o RooHtml

    - Add MakeIndexNew() method that can create sub-index files
      by topic. Similar to THtml::MakeIndex(), but topic is taken
      from tag in file instead of subdirectory name

    - Add MakeIndexOfTopics() method that creates master
      index of index files by topic.

  o All classes

    - Provisionally assign one of the following topic tags to each class

       PDF  - Probability Density functions
       REAL - Real valued functions
       CAT  - Discrete valued functions
       PLOT - Plotting and tabulating
       CONT - Container classes
       MISC - Miscellaneous
       USER - Other user classes
       AUX  - Auxiliary classes for internal use

  o makedocs

    - Modify to make new sub-index files and index of topics file.
      (Description of topic tags is defined here)

Revision 2887 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Sep 28 21:59:29 2001 UTC (13 years, 3 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3100 byte(s)
Diff to previous 2882
  Overhaul of plotting (part 2)
  -----------------------------

  o RooAbsData

    - Add new virtual function plotAsymOn(frame,asymCat,...)
      for asymmetry plotting

  o RooAbsPdf

    - Implement plotOn() with normalization support (Raw,Relative,NumEvent)

  o RooAbsReal

    - Implement new plotting functions:

      plotOn(frame,....)               - Regular projected plotting
                                         (overloaded in RooAbsPdf)
      plotSliceOn(frame,sliceset,...)  - Partially projected plotting
      plotAsymOn(frame,asymCat,...)    - Asymmetry plotting
                                         (for any 'sign-type' cat. variable)

    - Projection logic moved from RooCurve::ctor to plotOn(),
      rearranged to use createProjection()

    - Introduce some protected helper functions for plotting
      plotSanityChecks(), makeProjectionSet()

  o RooAddPdf

    - Implement partial plotting function

      plotCompOn(frame,compSet,....)

      to plot any arbitrary subset of components

    - Fix normalization in evaluate(), revert to default
      extendedTerm()

  o RooCurve

    - Remove projection logic from ctor (moved to RooAbsReal::plotOn)

  o RooSimultaneous

    - Overload inherited plotOn() with dummy function and message for
      user

    - Implement plotOn(frame,RooAbsData*) which constructs a RooAddPdf
      plot function, with the relative weights determined from
      the supplied dataset

    - Implement plotCompOn(frame,RooAbsData*,compSet,...) and
      plotCompOn(frame,RooAbsData*,indexLabelList,...) to plot only
      selected parts of the pdf (supplied as argSet of component
      pdfs, or a string with comma separated labels of the index
      category)

  o RooTreeData

    - Introduce dummy plotAsymOn(frame,asymCat,...)




  Misc. small fixes / improvements
  --------------------------------

  o RooAbsCategory

    - Add helper function isSignType() to determine if
      given category has 2 or 3 states with values -1,0,1

  o RooConvolutedPdf

    - Fix potential null ptr evaluation in getAnalyticalIntegralWN()

  o RooGenContext

    - Comment out some unreachable code to suppress OSF compiler warning

  o RooPdfCustomizer

    - Generalized to work with any RooAbsArg tree.
      Need to change name at some point...

  o RooStreamParser

    - Insert forgotten & in readInteger so that function now
      actually modifies integer reference to be read
      (Found by OSF compiler)

Revision 2882 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Sep 27 18:22:31 2001 UTC (13 years, 3 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3044 byte(s)
Diff to previous 2696
  Binned data reorganization
  --------------------------

  o RooAbsArg,RooAbsCategory,RooAbsReal,RooAbsRealLValue,RooAbsCategoryLValue,RooAbsLValue,RooRealVar

    - Introduce the concept of 'fit bins' for the purpose of binned fits
      So far we have been abusing the plot bins for this purpose but this
      will ultimately lead to confusion

      RooAbsLValue now defines 5 abstract methods to access the fit bin interface
      setFitBin(), getFitBin(), numFitBins(), getFitBinWidth(), createFitBinIterator()
      which are implemented in RooAbsCategoryLValue and RooAbsRealLValue

      RooRealVar holds the fitBins data member.

  o RooDataHist

    - Change to use fit bins and range instead of plot bins and range for
      binning a dataset

    - Add new sum() methods implementing full and partial summation of
      of the dataset contents, optionally accounting for bin volume correction

  o RooHistPdf

    - New PDF constructed from a RooDataHist implements n-dimensional
      PDFs constructed from an equivalent histogram. All dimensions can
      be either real of discrete

    - All partial and full integrations are implemented using the new
      RooDataHist::sum() methods.



  Plotting reorganization (part 1)
  --------------------------------

  o RooPlot,RooHist,RooCurve,RooPlotable

    - Store the two components of the normalization #events and binWidth
      seperately

    - Replace getFitRangeNorm() method with getFitRangeNEvt() and getFitRangeBinW()
      methods

    - Adapt updateFitRangeNorm() to store components of normalization separately

  o RooAbsReal ( & RooSimultaneous)

    - Add extra enum to plotOn() indicating interpretation of given scalefactor

      Raw      -> Apply scale factor without any other adjustments
      Relative -> Apply scale factor after default normalization adjustment (old implementation)
      NumEvent -> Interpret scale factor as number of events to normalize to

      For RooAbsReals that are not a RooAbsPdf, the Raw procedure is always applied

      Some more reorganization will follow in this area

  o RooFormulaVar

    - Take out dummy analytical integration definition now that plotOn will do the
      right thing by default




  Misc. fixes
  -----------

  o RooAbPdf

    - Fix normalization bug in analytical integration by introducing overloaded
      analyticalIntegralWN, which returns analyticalIntegral()/getNorm()
      instead of just analyticalIntegral()

  o RooAddPdf

    - Eliminate now obsolete addPdf() and addLastPdf() member functions

Revision 2696 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 17 01:18:44 2001 UTC (13 years, 5 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3225 byte(s)
Diff to previous 2695
  o RooAbsArg,RooAbsReal,RooAbsCategory,RooAbsString

    - Implement numPlotBins() method

  o RooAbsData, RooDataSet

    - Make table() method const

Revision 2695 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Aug 17 00:35:57 2001 UTC (13 years, 5 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3165 byte(s)
Diff to previous 2626
  Groundwork for binned fits

  o RooAbsData

    - New abstract base class common to RooDataSet and yet to
      introduced RooDataHist, which will hold N-dimensional
      histograms to be fitted

  o RooDataSet

    - Make class inherit from RooAbsData

  o RooAbsArg

    - Add abstract createPlotBinIter() and getPlotBin() methods

  o RooAbsReal

    - Implement createPlotBinIter() and getPlotBin() methods
    - Add getPlotBinCenter(ibin), getPlotBinLow(ibin) and
      getPlotBinHigh(ibin) methods

    - Add plotBinWidth data member and code to update it each
      time if plotMin/Max/Bins changes.

  o RooAbsCategory

    - Implement createPlotBinIter() and getPlotBin() methods

  o RooAbsString

    - Implement dummy creatPlotBinIter() and getPlotBin() methods

  o RooAbsBinIter

    - New abstract base class for AbsArg bin iterators

  o RooRealFixedBinTer

    - New implementation of plotBin iterator for RooAbsReal
      objects with a fixed grid binning.

  o RooCatBinIter

    - New implementation of plotBin iterator for RooAbsCategory
      objects

Revision 2626 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Aug 2 21:39:13 2001 UTC (13 years, 5 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3044 byte(s)
Diff to previous 2612
  o RooTrace

    - New memory tracing utility (singleton class)

  o RooAbsArg,RooDataSet,RooArgSet

    - Install hooks for RooTrace in ctors and dtors

  o RooThreshEntry

    - Fix bug in copy ctor

  o RooAbsReal,RooAbsPdf

    - Move analytical integration support
      (getAnalyticalIntegral,analyticalIntegral,
       forceAnalyticalInt,selfNormalized) from RooAbsPdf to RooAbsReal
      so that every RooAbsReal can be integrated

 o All RooAbsReal derived classes

    - Change signature of evaluate(),getVal(),traceEval(),checkDependents()
      from X(const RooDataSet* dset) X(const RooArgSet* nset)

 o RooAbsPdf

    - Manage normalization caching with a RooArgSet listing the dependents
      instead of a RooDataSet containing this list

    - Remove obsolete nLogLikelihood function (now in RooFitContext)

 o RooAbsArg

    - rename setProxyDataSet to setProxyNormSet
    - add getParameters(),dependentOverlaps() that
      take a 'const RooArgSet*'

 o Roo*Proxy

    - rename changeDataSet() to changeNormSet()

 o RooConvolutedPdf

    - Replace dummy data set for convolution normalization by an RooArgSet

 o RooDataSet

    - Remove inheritance from TTree, make it contain a TTree instead.
      Forward all relevant TTree member functions. Add correct Clone()
      function (now possible due to inheritance change)

 o Various classes

    - Fix const handling to eliminate Linux2 compiler warnings

Revision 2612 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue Jul 31 05:54:23 2001 UTC (13 years, 5 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3044 byte(s)
Diff to previous 2415
  o All RooAbsArg derived classes

    - Change clone() to clone(const char* newname=0) to facilitate cloning with alternate names.

  o RooAbsArg

    - Add another layer to link management: operMode. If operMode=auto, all behaves
      as before. If operMode=AClean, the arg assumes the cache is always clean and
      getValueDirty() will always return false. If operMode=ADirty, the arg assumes
      the cache is always dirty and isValueDirty will always return true.

      The ADirty and AClean modes are used by the optimizer in the fit context
      to shut down link management (and save time) for cases where the arg is
      always dirty after a dirty state propagation from one of the dependents.
      The AClean mode is used similarly for args that are cached in the dataset

      The setOperMode() member is protected as care should be taken in switching modes.
      It is the callers responsability to ensure that the claimed state (especially
      in case of AClean) is indeed correct.

    - Split setValueDirty(Bool_t flag) in setValueDirty() and clearValueDirty().
      The latter is trivial and can be inlined to save time.

    - redirectServers() now has an optional nameChange flag that allows to reconnect
      to servers with different names. If the option is enabled, a link will be reconnected
      to the server with a 'ORIGNAME:<servername>' attribute instead of a server with <servername>
      This feature is used by RooPdfCustomizer.

    - Added recursive printDirty() member that listed dirty state of arg and all its servers.

    - Add sorting capability by implementing IsSortable() and CompareTo() members.
      Sorting will result in alphabetical ordering by object name.

 o RooAbsCategory

    - Change tree attachement: store both label and index fields in tree instead of
      just the index field. Looking up the corresponding label turns out to be rather
      expensive, especially if many state are defined.

    - The postTreeLoadHook() mechanism that formerly implemented the index lookup
      has been abandoned completely (save 1 virtual function call per data set load).

 o RooAbsPdf

    - Change function call structure of eval tracing a bit to reduce the number
      of calls per trace from virtual calls to 1 concrete call.

    - In syncNormalization, if the data sets are different, first check if they
      also have a different contents before processing the change. (Save multiple
      identical normalization calculations for cases were a resolution model is
      shared by >1 RooConvolutedPdf. (WVE Caveat: this has some problems: code will
      die if cached data set is deleted before pdf. Will fix this soon)

      Install pre- and postSyncNormalizationHook functions that can be used to customize
      the call. Used by RooConvolutedPdf to create/update dummy data sets used to
      push down partial integrations to the convolution integrals.

    - Move nLogLikelihood to RooFitContext

 o RooAbsReal

    - in attachToTree(), mangle name of object in tree to exclude math symbols that
      are interpreted by root in certain circumstances

 o RooAddModel

    - Store coef and proxy iterators in class instead of creating them on the fly each
      time in evaluate()

    - Release ownership of proxied resolution models in the copy constructor. If the
      AddModel is copied, the proxied components will be owned by the list created
      by RooArgSet::snapshot().

    - Include name of AddModel owner in component resolution model to avoid multiple
      identically named object in certain PDF configurations

    - Export 'master list' of combined normalization leaf node servers of all components.
      The convolutedPdf needs this for it's own dependency calculation

 o RooArgSet

    - Add silent option to remove()

 o RooCatType

    - Store name in char[] instead of in TNamed::fName (a TString) so that
      the name can be attached to a Tree. (A TString is not a TObject)

 o RooConvolutedPdf

    - Push integration of all dependents that do not overlap with the coefficients
      to the convolution integrals, instead of just the convolution variable

 o RooDataSet

    - Add new constructor that allows to specify the cut as a RooFormulaVar object
      instead of a string. This allows to cut on function arguments that are not
      part of the data set

    - Allow to switch off dirty state propagation after a row-load operation
      (can be used in certain optimization scenarios)

 o RooFitContext

    - Add option to not clone either dataset or pdf on construction

    - Remove non-RooRealVar parameters from master parameter list to prevent that
      MINUIT chokes on them

    - Sort minuit parameter list alphabetically

    - Add cache optimization option, which shuts down all link management for the
      all pdf value components (not normalization). This can save a significant amount
      of time, especially for very complex PDFs as the number dirty propagations scales
      with the square of the number of nodes. Use newly introduces AClean and ADirty
      modes to ensure proper evaluation of PDF nodes

    - Add option to execute migrad with 'strategy 0', which skips the evaluation of
      the error matrix. (Saves time if you do that later with HESSE anyway)

    - Move nLoglikelihood() function from RooAbsPdf to here.

    - Improve readability of messages in fitting in log-mode: print on screen only value
      and name of parameters that change instead of dumping all their values all the time.
      The old format has been retained in the log file, to allow automated processing of such files.

 o RooFormulaVar

    - Also update _origList on a serverRedirect

    - Export ok() function of RooFormula (indicates if expression compiled ok)

 o RooMath

   - Add fast, interpolated, complex error function. Upon first use separate lookup tables
     are filled for the im and re part of the complex error function. New functions will
     do a 2nd or 3rd order 2D interpolation (depending on z) of the lookup table for either
     the re part, the im part or both. Precision is better that 1e-6 in ~99% of covered
     phase space. Imprecise regions are in problematic part of cErf where giant fluctuations
     occur. Typical likelihood calculated with interpolated cErf agrees in the first 10
     significant digits. Interpolation function is ~3.5 times faster than original CWERF
     implementation, when only 1 component (im/re) of cErf is needed (most cases).

     Interpolation function taken from Numerical Recipes and further optimized for
     fixed grid assumption

 o RooMappedCategory

    - Clone also MapCatEntries in RooMappedCategory copy ctor

 o RooProdPdf

    - Store coef and proxy iterators in class, instead of instantiating them on the fly
      in evaluate()

    - Add optional cutoff parameter. If running PDF product goes below cutoff, product
      calculation is terminated (default value=0, very small values like 1e-15 can be
      benificial in case of wide window calculations a Gaussian + something flattish)

 o RooRealIntegral

    - Allow and perform integration over variables that input function doesn't depend
      on (multiply integral by product of ranges of such variables)

 o RooResolutionModel

    - In convolution(): append name of owner to convolution, to avoid non-identical
      convolutions with the same name in certain PDF configurations

    - Forward redirectServers to basis function

 o RooSimultaneous

    - Overload fitTo() to create a RooSimFitContext instead of a RooFitContext
      which allows certain additional optimizations specific to RooSimultaneous

    - Normalize by the number of registered PDFs instead of the number of types
      defined by the index category (allows to to partial fits)

 o RooStreamParser

    - Take '}' and ';' out of the default punctuation list so that RooSuperCategory
      state names do not get broken up into multiple tokens

 o RooThresholdCategory

    - New category class that applies a series of thresholds on a RooRealVar to
      define its state.

 o RooThreshEntry

    - Support class for RooThresholdCategory

 o RooPdfCustomizer

    - Utility class that serves a factory to build multiple PDFs from a single prototype
      that have slightly different leaf nodes.

      The class takes a proto type and a master index category in the constructor.
      A series of splitting rules determines how given leaf nodes are to be 'split'
      over the master index category or a subset of the master index (in case the master
      index is a RooSuperCategory)

      The instiated 'split' leaf nodes are put in an argset referenced in the constructor.
      and the owner of the argset is responsible for deleting them (or passing them on
      to another RooPdfCustomizer). The instantiated branch nodes are owned by the customizer.

 o RooSimFitContext

    - Specialized fit context, derived from RooFitContext, that optimizes the likelihood
      calculation in case the top level pdf is a RooSimultaneous. The original data
      set is broken into pieces, corresponding to a single state of the RooSimultaneous
      index category and those data subsets are combined with the corresponding PDF branches
      of the RooSimultaneous to form an array of regular RooFitContexts. The total likelihood
      is calculated as the sum of the likelihoods from the array of fit contexts.

      The NLL output from each subcontext is cached and only recalculated if a parameter
      that the PDF of that subcontexts depends on, is changed.

      This form of calculation is very efficient for fits where the correlation matrix has
      a block diagonal form. The CPU time in RooSimFitContext scales (approximately) with
      the number of elements in the block diagonal elements instead of with the total number
      of elements.

 o Nearly all classes

    - A large number of minor bugs has been fixed and many functions
     that are called very frequently have been inlined, made non-virtual or
     have been eliminated, following the result of repeated profiler studies.

Revision 2415 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Jun 16 20:28:21 2001 UTC (13 years, 7 months ago) by david
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3080 byte(s)
Diff to previous 2345
- introduce AbsArg::createFundamental() changes
- fix normalization of AbsReals plotted on top of a dataset
- modify RealFunc1D to also bind a normalization ArgSet and scale factor

Revision 2345 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 31 21:21:37 2001 UTC (13 years, 7 months ago) by david
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3042 byte(s)
Diff to previous 2200
RooAbsPdf:

 - add interface for querying built-in generator capabilities, similar
   to the analytic integral interface: getGenerator() & generateEvent()
 - rename tryIntegral() methods to matchArgs()/matchArgsByName() and fix
   problem with >1 proxy name in TList version (now matchArgsByName())
 - move attatchDataSet() method into RooAbsArg and change RooDataSet* arg to RooDataSet&
 - make RooAcceptReject a friend so it can use recursiveRedirectServers()

RooArgSet:

 - add a method remove(const RooArgSet&) that calls remove(const RooAbsArg&)
 - add removeAll() method
 - add replace(const RooArgSet&) method

RooAcceptReject:

 - implementation of general-purpose accept-reject generator, used by RooGenContext

RooAbsRealLValue,RooAbsCategoryLValue:

 - add non-virtual randomize() method for toy MC

RooAbsArg:

 - add printout of our memory address in verbose printToStream() for x-referencing
   with client/server addresses of other AbsArgs.

RooRealIntegral:

 - augment verbose printToStream() output

RooAbsCategory:

 - add protected getOrdinal() method

RooAbsCategoryLValue:

 - add protected setOrdinal() method

Revision 2200 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 14 22:54:22 2001 UTC (13 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2994 byte(s)
Diff to previous 2191
 o Most classes

   - Give a reasonable 1-line description of class as ClassDef comment

Revision 2191 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 14 05:22:55 2001 UTC (13 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 3007 byte(s)
Diff to previous 2167
 Reorganize analytical/numerical integration structure

 o RooAbsArg

   - Back out 'integration dependents' option in getDependents()
     (logic moved to RooRealIntegral)
   - checkDependents is by default always OK

 o RooAbsRealLValue

   - Add isSafeForIntegation(const RooArgSet& depList) method
     in which an LValue can indicate if it is OK to use the
     object as LValue in integration fo the present
     parameter/dependent configuration is

 o RooRealIntegral

   - Move all logic to decide what to integrate numerically/analytically
     and where to use LValue and depth-expanded RValue into RRI ctor.

     Summary of logic:

     For every server of function that is to be integrated

       if (RealLValue && isSafeForIntegration && noOverlapWithOtherServers)
          Integrate of LValue
       else if (CategoryLValue && noOverlapWithOtherServers)
          Sum over LValue
       else
          Integrate/Sum over leafNode dependents of server

     Now, all details of integration technique are completely contained
     in RooRealIntegral, which can _always_ be performed (if N-dimensional
     numerical integration is implemented)

 Other changes

 o RooFormulaVar

   Allow new variable names in formula expression (@0, @1, ... @n)
   that reference the nth object in the given RooArgSet.
   (e.g. "@0 + @1 * @2")

Revision 2167 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 11 06:30:01 2001 UTC (13 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2917 byte(s)
Diff to previous 2164
 o RooAbsArg

   - In destructor, only print out warnings about live clients
     that get cut off in verboseDirty() mode.

     For automatically declared RooAbsArg this error condition
     never occurs, but for client/server links in lists, the
     order of deletion doesn't take these link directions into account.

 o RooCategory

   - Disallow defineType("") with a semicolon in the name.
     This would confuse the reverse mapping of
     RooSuperCategory::setIndex()/setLabel()

 o RooArgSet

   - Make default clone/copy ctor not copy the contents of the
     list (Some core classes changed that used this feature)

   - Extend snapshot function to ::snapshot(Bool_t deepCopy)
     which allows to make both shallow (only list contents copied)
     and deep snapshots (also all dependents of list contents
     copied and added to list)

   - Modify replace() to use AddBefore();Remove() instead
     of Remove();Add() so that a replace call doesn't interfere
     with an iterator over the RooArgSet

 o RooRealIntegral

   - Change dependent type checking from RooRealVar/RooCategory
     to RooAbsRealLValue/RooAbsCategoryLValue

 o RooSuperCategory

   - Add MakeIterator() function which returns a RooMultiCatIter
     on the super categories servers.

   - Implement setIndex/setLabel(), which decodes the composite super
     label into labels of the input categories

   - Make use of new RooSetProxy which proxies the RooArgSet list
     of input categories

   - Enhance verbose printing

 o RooGenCategory

   - Port/rewrite from RooFitTools. User method scanned for all states
     and translated into a

       'SuperCategory type-index -> GenCategory type-index'

    map (int-to-int via a simple array), making the class substantially
    faster. The mapping is revised upon a shapeDirty() which is
    propagated from all the input categories

 o RooAbsCategory

   - New abstract common base for RooArgProxy and RooSetProxy

 o RooSetProxuy

   - Proxies a RooArgSet. Essential service provided: upon a
     redirectServers the list contents is replaced with the
     new pointers from the redirection list.

Revision 2164 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 10 18:58:48 2001 UTC (13 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2859 byte(s)
Diff to previous 2158
 *** Changes to allow a dataset to cache of derived objects  ***

 o RooAbsReal, RooAbsCategory and RooAbsString

   Now each implements a protected method attachToTree, which allows to
   connect the cache of any RooAbsArg to a TTree column
   All other implementations (RooRealVar etc) removed

 o Most classes

   Type-blind assignment RooAbsArg* <...>::operator(const RooAbsArg*)
   has been replaced by RooAbsArg::copyCache(RooAbsArg *), which is
   needed for data set copy operations.

   A new method RooAbsArg::syncCache(RooDataSet *)
   can be used force to update the cache before a copyCache call.

 o RooDataSet

   - Holds a list of _cacheVars in addition to _vars, which are not
     owned by the data set, but are updated nevertheless.
     The cache list is not copied in a Clone() or copy operation.

   - New methods cacheArg(RooAbsArg&) and cacheArgs(RooArgSet&)
     register derived objects for caching in the dataset.

     The values for these derived objects for each row of the tree
     will be calculated and stored as a new column in the tree.

     The cache of the derived object is attached to that tree column.
     On a RooDataSet:get() row-load call, a setDirty(kTRUE) is called
     for each cached (and uncached) object to propagate a value change
     to the cached objects clients. Then immediately a setDirty(kFALSE)
     is performed on the cached objects, to impose that the tree-loaded
     value of the cache is correct and doesn't need to be recalculated.

 o RooFitContext

    - Optimizer not uses cacheArgs instead of addColumn, which
      is integration-safe and can now be used on any derived object
      with constant parameters


 o RooAbsPdf

    - Another iteration in the structure of getVal.
      To make data set attachement work, the normalized value is
      now stored in the cache instead of the raw value.

 *** Cleanup of assignment operator ***

 o RooAbsRealLValue/RooAbsCategoryLValue

     - Implements assignment to Double_t/(Int_t,const char*)

 o RooRealVar/RooCategory

     - Implemements assignment to RooRealVar/RooCategory

 o All other assignment operators deprecated

     - No more assignment of derived types to each other
       (conceptually unclear)

Revision 2158 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 10 00:16:09 2001 UTC (13 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2760 byte(s)
Diff to previous 2114
 o RooAbsArg
    - Small change in 'Standard' printing logic
    - isXXXDirty() will always return kFALSE if isDerived is kFALSE

 o RooAbsCategory
    - Absorb caching/evaluation code of RooDerivedCategory
    - Add defineType(const char*) (without index code)
    - Add clearTypes() ;

 o RooDerivedCategory
    - Retired

 o RooAbsCategoryLValue
    - New abstract base class for LValue categories
      (e.g. RooCategory, RooSuperCategory)

 o RooCategory:
    - Add methods that publicize the defineType/clearType
      members of RooAbsCategory
    - Implement getIndex()/Label() that bypasses caching mechanism

 o RooMappedCategory
    - Complete rewrite using wildcard regular expression mapping
      of labels. Hard-coded number mapping deprecated

 o RooMapCatEntry
    - New auxiliary class for RooMappedCategory

 o RooSuperCategory
    - New, functionality similar to version in RooFitTools,
      but rewritten from scratch

 o RooAbsReal
    - Absorb caching/evaluation code of RooDerivedReal
    - Absorb analytical integration support code of RooDerivedReal
    - Absorb range checking code from RooRealVar

 o RooAbsRealLValue
    - New abstract base class for LValue reals
      (.e.g RooRealVar, RooUnblind*)

 o RooDerivedReal
   - Retired

 o RooRealVar
    - Implement concrete getVal() that bypasses caching mechanism

 o RooProdPdf
    - New, functionality similar to version in RooFitTools,
      but rewritten from scratch

Revision 2114 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu May 3 02:15:56 2001 UTC (13 years, 8 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2709 byte(s)
Diff to previous 1985
  o (Most classes)
    Merge X(const x&) and X(const char*, const X&) copy constructors
    into a single X(const& X, const char*=0)

  o RooAbsArg
    - Add 'depth-aware' client-server management functions

      recursiveRedirectServers(...)
      treeNodeServerList(...)
      leafNodeServerList(...)
      branchNodeServerList(...)
      overlaps(...)
      dependsOn(...) (now recursive)

    - Add/move parameter/dependent interpretation to RooAbsArg

      getParameters(...)
      getDependents(...)
      dependentOverlaps(...)
      checkDependents(...)

    - Change Clone() to Clone(const char*) and make it call
      a pure virtual clone().

  o RooAbsPdf

     - First implementation

     - Actual fitting implemented in RooFitContext

     - Incorporates normalization technology from
       RooNormFunction (now retired)

     - Separate getValNorm() dropped in favour of
       getVal(const RooDataSet* =0)

     - getVal(...) provides all owned proxies with
       the correct data set (which they need for their
       value cast operators that don't take an RDS)

  o RooFitContext

     - First implementation

     - Owns a clone of a dataset and a PDF and ties them
       together with a redirectServers

     - Caches indexed parameter list for fast Minuit lookup

     - global Optimizer function seeks out PDF components
       that only have constant parameters and add these
       as precalculated columns to the data set clone
       (redirectServers edits PDF tree to point to cache)

  o RooDataSet

     - Implement addColumn(RooAbsReal) that adds a column
       of precalculated values given function for each
       row of the data set

  o RooAbsReal

     - Change getVal() to getVal(const RooDataSet* set=0)
       to allow dynamic normalization for PDFs.

  o RooArgProxy and dependents

     - Cache last data set used, for use in getVal(...) call in
       value cast operator.

  o RooRealProxy

     - add min()/max() functions that get out the integration limits
       if the underlying real is a RooRealVar. (Needed by RooAbsPdf
       analytical integration implementations)

  o (Most classes)

     - A large number of minor fixes have been applied to make
       the Solaris 5.7 compiler happy

Revision 1985 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Apr 14 00:43:20 2001 UTC (13 years, 9 months ago) by davidk
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2801 byte(s)
Diff to previous 1981
RooCatType:

 - multiply-inherit from RooPrintable and standardize printToStream()
 - remove Int_t() and Int_t&() cast operators
 - operator==(const RooCatType&) requires index and label to match (was just index before)

RooAbsCategory:

 - add lookupType(const RooCatType&) which was being faked using RooCatType::Int_t() before
 - delegate equality tests in lookupType() methods to RooCatType::operator==() methods
 - delegate printing of RooCatType's to RooCatType::printToStream()

RooMappedCategory:

 - standardize printToStream()
 - change a!=b into !(a==b) for RooCatType a,b (op!= was being faked by RooCatType::Int_t())
 - add setShapeDirty() in addMap()

RooAbsArg:

 - use AbsArg::printToStream(OneLine) to print client,server info in printToStream(Verbose)

RooPlot:

 - add getPlotVar() member fn

RooDataSet:

 - add const plot(RooAbsReal&) and plot(RooPlot*) methods to eventually replace Plot()
 - make Plot() const and remove the unused options argument
 - const_cast our ArgSet in Plot() so we can call redirectServers()

RooFormula:

 - make ctor ArgSet argument const to allow DataSet::plot() to be const

Revision 1981 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Apr 13 00:43:57 2001 UTC (13 years, 9 months ago) by david
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2714 byte(s)
Diff to previous 1911
RooRealVar:

 - remove Double_t() and Double_t&() cast operators (let's at least try...)
 - add inline methods to set/get infinite limits (one-sided limits are ok)
 - replace hasFitLimits() with hasFitMax() and hasFitMin() for one-sided limits
 - update writeToStream() to output +INF and -INF *** parser needs to be updated ***
 - update printToStram() to output +INF and -INF
 - fix typos in setFitMin()/Max()

RooAbsCategory:

 - standardize printToStream()
 - swap order of args to defineType() for backwards compatibility with RFT

RooDataSet:

 - update usage of RooAbsCategory::defineType()

Revision 1911 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Apr 9 04:29:34 2001 UTC (13 years, 9 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2698 byte(s)
Diff to previous 1910
  o Add RooDerivedCategory, similar to RooDerivedReal

    Make RooMappedCategory derived from RooDerivedReal

Revision 1910 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sun Apr 8 00:06:49 2001 UTC (13 years, 9 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2847 byte(s)
Diff to previous 1874
 o Another major round of const-correctness improvements

 o Add RooDerivedReal as an intermediates class between
   RooAbsReal and RooRealFormula,RooRealIntegral,RooUnblind*

   the getVal() -> cache check -> traceEval() -> evaluate()
   chain has been moved into this class.

   Derived Classes of RooDerivedReal only need to implement
   evaluate() for contents definition. The getVal() of RooAbsReal
   return the straight contents of _value.

 o Added RooRealIntegral class, which represents the integal and/or sum
   over various RooRealVar/RooCategory dependents of a generic RooDerivedReal

   Integral value is cached and updated when the value of one of the
   non-integrated dependents of the integrated functions changes
   (detected via valueDirty bit propagation), or if the integration ranges
   of one of the integrated dependents change (detected via shapeDirty
   bit propagation).

   If the RooDerivedReal supports analytical integration (implemented
   via the getAnalyticalIntegral/analyticalIntegral functions) it's
   analytical integrator is used. Otherwise a numerical integration algorithm
   is used (currently limited to 1-dimensional integrations)

   Summation of an arbitrary number of category dependents is supported
   but not implemented yet, pending the port of RooSuperCategory, which
   will support a trivial implementation.

   Analytical integation interface: Each RooDerivedReal has 2 functions
   implemented

      - getAnalyticalIntegral(RooArgSet& integrandList),
        which determines if analytical integration is supported
        for the given list of integrands. If not, it returns
        code 0. If yes, it returns a positive code, which RooRealIntegral
        will pass to analyticalIntegral().

      - analyticalIntegral(Int_t code) Performs or dispatches the
        analytical integral represented by the code assigned by
        getAnalyticalIntegral()

   In theory, the above scheme could be implemented with just one
   function, returning a pointer to a member function, but
   pointer-to-members are not supported by ROOT due to portability
   problems. The current scheme is inspired on the TFormula implementation
   of referencing external parameters.

   A default implementation in RooDerivedReal handles the default
   (no analytical integration available) case.

Revision 1874 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 29 22:37:41 2001 UTC (13 years, 9 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2835 byte(s)
Diff to previous 1864
 o Add Arg::Arg(const char* name, Arg& arg) type copy constructor
   to all RooAbsArg derived types in addition to Arg::Arg(Arg& arg)
   copy constructor.
   (NB: We cannot omit or protect the latter form because CINT uses them)

 o Some general constructor and operator=() cleanup

Revision 1864 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 29 01:59:10 2001 UTC (13 years, 9 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2665 byte(s)
Diff to previous 1863
 o For all AbsArg derived classes

   - Make cache and dirty state bits mutable so that we can make
     getVal() const

   - Propagate constness to isValid(),printToStream(),writeToStream()
     and various other members where appropriate

Revision 1863 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 29 01:06:45 2001 UTC (13 years, 9 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2607 byte(s)
Diff to previous 1846
 o Add blinding support

   - RooDataSet can now read mixed blind/unblind data, if the
     blinding string (if present) is always the same.
     The data set dynamically adds a 'blindState' category to
     it's internal variable list which indicates if a given event
     is blinded or not.

   - Imported RooFitTools/RooBlind as RooBlindTools

   - Created two unblinder engines RooUnblindCPDeltaTVar and
     RooUnblindCPAsymVar. To perform blinding to do

     RooRealVar deltat(...)
     RooCategory tag(...)
     RooCategory blindStat(...) // All these should come from a RooDataSet

     RooUnblindCPDeltaTVar deltat_ub("deltat_ub","DeltaT unblind",
                                     "Blinding String",deltat,tag,blindsStat)

     OR

     RooRealVar sin2b(...)
     RooUnblindCPAsymVar sin2b_ub("sin2b_ub","Sin2Beta unblind",
                                  "Blinding String",sin2b)

     Then feed deltat_ub  and sin2b_ub in the PDF.

     the print() and read/write methods of the unblinders show some
     configuration information, but don't reveal the unblinded value
     The getVal() of the unblinders is 'protected' and can only be
     accessed by RooDataSet

 o Some cleanup in dirty flag propagation code

 o Optional indexing category in RooDataSet::read that tells from which file
   a given event is coming. A dummy category should be appended to the varlist
   and it's name should be given as the last argyment in the RooDataSet ctor.

   If the filespec is "fileA,fileB,fileC", for each file a new index type
   is created with values 0,1,2 etc.. and labels ('file000','file001' etc).

   One can also explicitly assign index labels to each file using the
   following file spec string: "fileA:Dstar,fileB:Dstar,fileC:Jpsi".
   In this example fileA and fileB will have index label Dstar (value 0)
   and file C has label "Jpsi" (value 1)

   Finally it is also possible to predefine label types in the index
   category. RooDataSet::read will use the existing label/values defined
   and assign new ones where undefined.

 o Fix type in RooAbsArg::Print()

Revision 1846 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 22 15:31:25 2001 UTC (13 years, 10 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2593 byte(s)
Diff to previous 1834
 o Extend RooFormula to understand RooCategory labels '<catName>:<catLabel>'
   so you can e.g. do (tagCat==tagCat::Kaon)

 o Transplant and rework most advanced reading options from RFT/RooVarList
   to RFC/RooArgSet

      - Nested if statements

         if (conditional)
         else if (conditional)
         else
         endif

      Conditionals are evaluated by a RooFormula object that can use the
      entire arglist as variables

      - Recursive include statements

         include <filepath>

      - Some useful other commands for configuration file use

         echo "message" -> Print message while processing
         abort          -> Force termination of read with error status

   Handling of errors in the input file format is fairly exhaustive.

 o Some reworking of the RooStreamParser in the way newlines are handled.
   Some of the clients of RSP have been changed accordingly.

   Main new feature is a RSP::atEOL() member that determines if there is
   a newline between the last read token and the next token to be read.

 o Temporarily made RooAbsArg::Print/printToStream non-const as the
   implementation in some subclasses call a non-const getVal()
   This problem must be fixed for good in all classes soon.

Revision 1834 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Mar 19 15:57:32 2001 UTC (13 years, 10 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2593 byte(s)
Diff to previous 1833
 o Finish most of readFromStream/writeToStream implementation

 o Various small additions and fixes

Revision 1833 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Sat Mar 17 03:47:39 2001 UTC (13 years, 10 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2517 byte(s)
Diff to previous 1832
 o Add RooTable objects (RooAbsReal->THxF, RooAbsCategory->RooTable)

 o RooAbsCategory::createTable added (analoguous to RooRealVar::createHisto)

 o RooDataSet::Table function added to fill table from data set

 o Some bug fixes in RooAbsCategory loading in RooDataSets

 o Some work on non-compact reading/writing of RooRealVars

Revision 1832 - (view) (download) (as text) (annotate) - [select for diffs]
Added Sat Mar 17 00:32:55 2001 UTC (13 years, 10 months ago) by verkerke
Original Path: trunk/roofitcore/inc/RooAbsCategory.h
File length: 2390 byte(s)
 o Change of naming scheme to enhance portability of RooFitTools macros

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

  Diffs between and
  Type of Diff should be a

Sort log by:

Subversion Admin
ViewVC Help
Powered by ViewVC 1.0.9