Log of /trunk/roofit/roostats/inc/RooStats/ToyMCStudy.h
Parent Directory
Revision
44157 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Mon May 7 16:41:44 2012 UTC (2 years, 8 months ago) by
moneta
File length: 2816 byte(s)
Diff to
previous 43199
merge changes from roostats development branch up to revision 44155
Modifications by Jakub Ademek and Max Baak :
ensure that ToyMCSampler can return TTree with detailed fit output.
See for a detailed description:
https://indico.cern.ch/getFile.py/access?contribId=0&resId=3&materialId=slides&confId=182211
Modifications by Sven Kreiss:
ProfileLikelihoodTestStat:
- added option to add errors and pulls to detailed output
Revision 44128 - Directory Listing
Modified Fri May 4 21:33:08 2012 UTC (2 days, 17 hours ago) by sven
ToyMCSampler, ToyMCStudy, SamplingDistribution, DetailedOutputAggregator:
- bugfixes for the naming of the result
- return toys with weight=1 when generating unweighted toys (not -1)
- make it optional to return errors and pulls with detailed output
- from Tim Adye: catch NaNs at the right place
ProfileLikelihoodTestStat:
- added option to add errors and pulls to detailed output
FrequentistCalculator (from Tim Adye):
- skip the profiling if there are no free nuisance parameters
--This line, and those below, wil
_M roostats
_M roostats/src
M roostats/src/HypoTestResult.cxx
M roostats/src/FrequentistCalculator.cxx
M roostats/src/HypoTestCalculatorGeneric.cxx
M roostats/src/RooStatsUtils.cxx
M roostats/src/ToyMCSampler.cxx
M roostats/src/ToyMCStudy.cxx
M roostats/src/ProfileLikelihoodTestStat.cxx
M roostats/src/SamplingDistribution.cxx
_M roostats/inc
M roostats/inc/LinkDef.h
M roostats/inc/RooStats/ProfileLikelihoodTestStat.h
_M roostats/inc/RooStats/ToyMCSamplerOld.h
M roostats/inc/RooStats/FrequentistCalculator.h
M roostats/inc/RooStats/HypoTestCalculatorGeneric.h
A + roostats/inc/RooStats/DetailedOutputAggregator.h
M roostats/inc/RooStats/RatioOfProfiledLikelihoodsTestStat.h
M roostats/inc/RooStats/ToyMCStudy.h
M roostats/inc/RooStats/TestStatistic.h
M roostats/inc/RooStats/SamplingDistribution.h
M roostats/inc/RooStats/HypoTestResult.h
A + roostats/inc/RooStats/MinNLLTestStat.h
M roostats/inc/RooStats/RooStatsUtils.h
M roostats/inc/RooStats/ToyMCSampler.h
Revision
43199 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Thu Mar 1 20:17:42 2012 UTC (2 years, 10 months ago) by
moneta
File length: 2797 byte(s)
Diff to
previous 39928
merge from the roostats development branch the new developments from Sven Kreiss:
new ToyMCImportanceSampler
new version of the ToyMCSampler that can use multiple test statistics and "detailed output" of those test statistics.
extension to the FrequentistCalculator that allows the user to manually specify the values for the signal nuisance parameters using SetConditionalMLEsNull/Alt().
make HypoTestResult managing now the SamplingDIstribution for null and alt
Revision
39817 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Modified
Sat Jun 18 12:49:41 2011 UTC (3 years, 7 months ago) by
wouter
File length: 2375 byte(s)
Diff to
previous 39391
o RooDataSet
- Introduce pool-based memory allocation scheme
- In ctor for composite datasets with Link() ensure that
order of observables is preserved to allow use of assignFast()
o RooRealSumPdf
- Use getNorm() in expectedEvents() rather than createIntegral()
o RooAbsCollection
- Do no allocate hash tables by default
- Introduce contents claim counter to counter 'foreign' ownership
claims of contents (needed for RooAbsOptTestStatistic::setData()
support)
- If collection is owning, only delete contents if claim count is also zero
- In snapshot() raise hash table threshold from 100 to 1000
o RooRefCountedList
- Disable hash tables by default
o RooStudyPackage
- Make study package own clone of incoming workspace
- Implement copy ctor
o RooAbsTestStatistic
- Implement 'master' setData() method. Forward to setDataSlave()
of self for monolithic likelihoods or forward data components
to likelihood components in case node is SimMaster. If data
is not fast-splittable, execute slow split.
o RooAbsData
- Implement 'live check' to be able to conclude if a given dataset
pointer points to a live or dead object
- Claim contents of _vars through new claim mechanism. Release
in dtor, allow _vars to delete contents if claim count is zero
- Add concept of owned component datasets to support fast-splitting
of dataset
- Add method canSplitFast() that indicate if fast split is available
(only possible if dataset was created as composite)
- Add method getSimData() that retrieves pointer to component
RooDataSet representation for a given index state
o RooObjCacheManager
- Add static mechanism that allows to deleted cached observables lists used for
cache optimization triggers to be deleted on a sterilize() action. This
is useful on toy studies with setData() operation, that would otherwise
collect very large lists of observable clones during the toy cycle.
o RooAbsPdf
- Set contraint term to ADirty to avoid synchronization problems when using
setData() in the likelihood
o RooAbsArg
- In clone operations set hash table threshold at 1000 nodes
- In getObservables() use pass-by-value iterators rather than heap iterators
to making this faster. Also make getObservables() non-virtual, as it is in
fact not overloaded in any subclass (anymore). Also remove looping over
branch nodes to call getObservablesHook() as no class implements method
anymore.
o RooAddition
- Implement a setData() method that forwards to its components. Allows transparent
operation of setData() on likelihood objects with constraint terms
o RooLinkedList
- Add method that returns iterator by value (simply forwards to similar implementation
in RooLinkedList)
o RooSimGenContext
- Move calculation of fraction table from ctor to dedicated updateFraction() method
- Before each generation sequence call updateFractions() so that multi-generation
sequence are robust against parameter changes between calls
- In createDataSet() always make a composite dataset if the index is present, as this
allows faster use in toymc operations
o RooAbsOptTestStatistic
- Initialize all variables in default ctor
- In dtor and ctor handle ownership of dataset observables, on which we put a claim
(i.e. we need to delete contents if the test statistics survives the dataset)
- Reimplement existing setData() as setDataSlave(), and add claim management on
dataset observables. When attached new data to function, request that object caches
clear full content in sterilize() operation to avoid buildup of cache objects in
long toy runs.
- In setData() adjust event count of test statistics, for correct functioning of extended
terms after update
o RooArgSet
- In ctor for list and a single object, only add object if not already in list
(is already checked, but new procedure preserves order of list elements in case
object was already present)
o LinkDef
- Add list<RooAbsData*> and map<string,RooAbsData*> to support streaming of composite datasets
o RooAbsStudy
- Implement clone method to support polymorphic array cloning
o RooAbsReal
- Add interface method setData()
o RooProfileLL
- When storing coordinates of absolute minimum, store only those that are non-constant.
Otherwise option to restart each minimization from known absmin may alter constant
parameters
Revision
34726 -
(
view)
(
download)
(
as text)
(
annotate)
-
[select for diffs]
Added
Wed Aug 4 19:39:32 2010 UTC (4 years, 5 months ago) by
sven
Original Path:
branches/dev/roostats/roofit/roostats/inc/ToyMCStudy.h
File length: 2280 byte(s)
RooFitCore:
- RooProfileLL:
- added default constructor
- RooAbsTestStatistic:
- initialize _projDeps in default constructor; and in destructor only delete if different from NULL
- RooStudyManager.cxx and RooWorkspace.cxx:
- backport from trunk: Form-related changes
RooStats:
- HybridCalculater:
- added AdaptiveSampling
- added ImportanceSampling
- factored out GenerateSamplingDistribution(...)
- HypoTestPlot and HypoTestResult:
- cleanup
- SamplingDistPlot:
- changed method of normalization
- SamplingDistribution:
- added CDF(...)
- added Constructor from RooDataSet for debugging
- ProfileLikelihoodTestStat:
- added default constructor
- added include to RooStatsUtils
- RatioOfProfiledLikelihoodsTestStat:
- added default constructor
- make fNullPdf and fAltPdf pointers
- added ProofConfig:
- Holds configuration options for runs with proof (right now, used by ToyMCSampler)
- added ToyMCStudy
- ModelConfig:
- GetSnapshot now returns an actual snapshot(), i.e. a copy
- ToyMCSampler:
- factored creation and storage of nuisance parameters into a separate class
- runs in parallel using ToyMCStudy if an instance of ProofConfig is given
- added AdpativeSampling: SetMaxToys(...), SetToysLeftTail(...), SetToysRightTail(...), SetToysBothTails(...)
- added ImportanceSampling: SetImportanceDensity(...), SetImportanceSnapshot(...)
- added GetNToys(), GetSamplingDistName()
- factored out Generate(...)
- ClassImp macro added to: ModelConfig, ToyMCSampler
Tutorials:
- rs201b: options for proof, adaptive sampling and importance sampling
- rs401: added fc.FluctuateNumDataEntries(false);
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.