[root] Log of /trunk/roofit/roostats/src/HypoTestCalculatorGeneric.cxx

Revision 48176 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Dec 21 15:13:08 2012 UTC (2 years, 1 month ago) by moneta
File length: 9230 byte(s)
Diff to previous 44479

HypoTestCalculatorGeneric: 

  add possibility to re-generate the same toys for getting the test statistics distribution for the alternate

ToyMCSampler: 

  set the parameters for evaluating the test statistics after generating the toys not before. 
  It should be the same within ROoStats because ToyMCSampler::fParametersForTestStat are the null POI, which are anyway re-set in 
  ToyMCSampler::Generate.   However it was a problem for combine ("CMS")

Revision 44428 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri Jun 1 08:08:39 2012 UTC (2 years, 7 months ago) by moneta
File length: 8458 byte(s)
Diff to previous 44366

apply patch provided by Tim Adye: 


1) Save fit errors in detailed outputs' RooRealVars, rather than as separate
variables. If withErrorsAndPulls is specified, the asymmetric errors are also
saved. Work round bug #94908 by using RooTreeDataStore in
DetailedOutputAggregator and ToyMCImportanceSampler (can be removed when #94908
is fixed).

2) Fix detailed output dataset name and variable order (dsname_TS0 should be
first variable). Previously SamplingDistributions from importance sampling were
wrong (taken from the first global observable!).

3) Make detailed output for data available via
HypoTestResult::GetAllTestStatisticsData().

4) Don't save detailed output in HypoTestResult if it was not requested.

5) Rationalised the saving and restoring of parameters in ToyMCSampler. The POI
value in the workspace is not overwritten before calling the test stat (restores
behaviour from 5.32).

6) Remove unnecessary dataset copy in ToyMCImportanceSampler.

7) Fix ToyMCImportanceSampler double->int compiler warnings.

8) Fix minor memory leaks in HypoTestCalculatorGeneric, ToyMCSampler, and
ProfileLikelihoodTestStat.

9) Update streamer so PiecewiseInterpolation::setAllInterpCodes works for
objects created with ROOT 5.30.

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

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

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 41706 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Nov 2 08:15:37 2011 UTC (3 years, 2 months ago) by moneta
File length: 6429 byte(s)
Diff to previous 40001

set the global observables in the FrequentistCalculator and not in the base HypoTestCalculatorGeneric, since the HybridCalculator does not need the global observables

Revision 39513 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Tue May 31 17:49:43 2011 UTC (3 years, 7 months ago) by moneta
File length: 6320 byte(s)
Copied from: branches/dev/roostats/roofit/roostats/src/HypoTestCalculatorGeneric.cxx revision 39512
Diff to previous 39493

merge from the trunk development in dev roostats branch from 39465 up to current revision
- new FrequentistCalculator class from Sven 
 - new HypoTestInverter class and rename old one HypoTestInverterOriginal 
- some fixes in ProofConfig from Sven

Revision 39493 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon May 30 17:55:19 2011 UTC (3 years, 7 months ago) by sven
Original Path: branches/dev/roostats/roofit/roostats/src/HypoTestCalculatorGeneric.cxx
File length: 6320 byte(s)
Diff to previous 39465

FrequentistCalculator:
 - selecting set of nuisance parameters for profile differently
 
HypoTestCalculator:
 - changed name of the returned HypoTestResult
 - renamed some internal variables

Revision 39465 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Fri May 27 20:02:40 2011 UTC (3 years, 7 months ago) by sven
Original Path: branches/dev/roostats/roofit/roostats/src/HypoTestCalculatorGeneric.cxx
File length: 6276 byte(s)
Copied from: branches/dev/roostats/roofit/roostats/src/HybridCalculatorGeneric.cxx revision 39376
Diff to previous 38585

Refactored HybridCalculatorGeneric into HypoTestCalculatorGeneric

FrequentistCalculator:
 added

HypoTestResult:
 additional flag for inverted tests: SetBackgroundAsAlt()
 
ProofConfig:
 made CloseProof() a "static" function

Revision 38585 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Wed Mar 23 17:15:25 2011 UTC (3 years, 10 months ago) by moneta
Original Path: branches/dev/roostats/roofit/roostats/src/HybridCalculatorGeneric.cxx
File length: 7930 byte(s)
Copied from: branches/dev/roostats/roofit/roostats/src/HybridCalculatorGeneric.cxx revision 37083
Diff to previous 37084

create a new roostats branch with current trunk revision

Revision 37084 - (view) (download) (as text) (annotate) - [select for diffs]
Modified Mon Nov 29 21:37:13 2010 UTC (4 years, 1 month ago) by moneta
Original Path: trunk/roofit/roostats/src/HybridCalculatorGeneric.cxx
File length: 7930 byte(s)
Copied from: branches/dev/roostats/roofit/roostats/src/HybridCalculatorGeneric.cxx revision 37083
Diff to previous 36913

merge from the development branch the changes applied by Kyle and Sven from revision 36852 to 
37056. 

Major changes:  added HybridCalculatorGeneric
                fixes for ModelConfig when reading from a file

Revision 36913 - (view) (download) (as text) (annotate) - [select for diffs]
Added Wed Nov 24 17:33:15 2010 UTC (4 years, 2 months ago) by sven
Original Path: branches/dev/roostats/roofit/roostats/src/HybridCalculatorGeneric.cxx
File length: 7930 byte(s)

HybridCalculatorGeneric: added
- contains the HybridCalculator "backend" and works with any TestStatSampler
- bugfix: use parameters of interest only for TestStatSampler

HybridCalculator:
- assumes ToyMCSampler
- can do importance sampling and adaptive sampling for null and alt

MaxLikelihoodEstimateTestStat: added Proof constructor

ToyMCSampler:
- check for NaN of test statistic
- when using proof: keep the same number of total toys

Tutorial rs201b_hybridcalculator:
- added importance sampling and adaptive sampling as options

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: