[root] Log of /trunk/roofit/histfactory/inc/RooStats/HistFactory/PiecewiseInterpolation.h

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

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 42233 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Nov 24 23:35:45 2011 UTC (3 years, 2 months ago) by wouter
File length: 4151 byte(s)
Diff to previous 42172

  o PiecewiseInterpolation, RooProdPdf, RooRealSumPdf, RooProduct, RooAddPdf, 
    RooAddition, RooHistPdf, RooHistFunc
 
    -  Implement isBinnedDistribution


  o RooSimSplitGenContext

    - New implementation of RooAbsGenContext for simultaneous pdf.
      The difference with the existing RooSimGenContext is that
      the logic is implemented at the generate() level rather than
      the generateEvent() level, which allows to perform mixed
      binned/unnbinned generation


  o RooBinnedGenContext

    - New implementation of RooAbsGenContext that performs binned
      generation, with an unbinned weighted dataset as output.
      This new context implements the algorithm of 
      the now deprecated method RooAbsPdf::generatedWeightedUnbinned()


  o RooSimultaneous

    - Implement method autoGenContext() that selects a split context
      can case (partially) binned generation is requested

    - Deprecate generateMixed() - now absorbed in generate() 
  

  o RooAbsGenContext

    - Make generate() virtual

    - Implement processing of extend mode here too


  o RooCompositeDataStore

    - Fix compiler shadowing warnings


  o RooAbsPdf

    - Add method binnedGenContext() to return a generator context
      for binned generation

    - Add method autoGenContex() that can return either a binned
      or unbinned context depending on the input and circumstances

    - Add support for ExpectedData(),GenBinned(),AllBinned() and AutoBinned()
      in generate()

    - Deprecate generateWeightedUnbinned() - now absorbed in generate()


  o RooLinkedList, RooLinkedListElem

    - Adjust memory management of chain elements to avoid slow heap growth 

   
  o RooGlobalFunc

    - Add GenBinned(),AllBinned() and AutoBinned()


  o Module.mk

    - Add RooSimSplitGenContext, RooBinnedGenContext

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

   *** 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 38599 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Thu Mar 24 08:37:05 2011 UTC (3 years, 10 months ago) by moneta
Original Path: trunk/roofit/histfactory/inc/PiecewiseInterpolation.h
File length: 3773 byte(s)
Diff to previous 37144

merge from roostats development branch the fix 38597 
(The changes were done originally in the v5-28-00-patches branch    
and they are : 


RooFit
    Added protectNegativeMean(bool) optional to gracefully handel cases when expectation is negative
    Added setNoRounding(bool) option to switch between rounding number of events
    Incremented version number for schema evolution

RooFitCore
     Added handeling of a special case in analytic integral for RooRealSumPdf

RooStats
    Fixed printout in number of toy MC used in FeldmanCousins and NeymanConstruction 
    Added SetOneSided(bool) option to ProfileLiklihoodTestStat for one-sided upper limits
    Added SetPOIPointsToTest(RooAbsData) method to FeldmanCousins tool, so that user can have control over which points in the parameter of interest to test (still using "profile construction" for nuisance parameters).  Additionally, added SetParameterPointsToTest, that has the same functionality as NeymanConstruction::SetParameterPointsToTest. 

HistFactory
   Fixed header definition in PiecewiseInterpolation
  Added analytic integration in PiecewiseInterpolation
  Added HistoToWorkspaceFactoryFast and MakeModelAndMeasurementsFast which implement the equivalent model produced by the original HistFactory, but in "standard form" instead of "number counting form".  Instead of splitting the histogram into bins and having a RooPoisson for each bin, this makes an extended Pdf with that interpolates between RooHistFuncs.  For situations with many bins, this is 5-15x faster and uses much less memory.  This model also works better with tools that require toy Monte Carlo.  This new model is the new default in hist2workspace.  The old model is still available with hist2workspace -number_counting_form input.xml.
 Fix dictionary on Fedora (r38188, issue #78554).

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

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

	Diffs between and
	Type of Diff should be a