From f1b1038af7d641bfd5d5af8b6f50180559c71fb7 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Wed, 13 May 2015 15:37:18 +0200 Subject: [PATCH 1/3] Migrate dictionaries to be built via xml file instead of linkdef since otherwise the classes are unknown to CLANG https://hypernews.cern.ch/HyperNews/CMS/get/edmFramework/3441.html This required to use proper include paths, unfortunately, so it will need changes in the Makefile for standalone compilation. --- interface/Asymptotic.h | 4 +- interface/AsymptoticNew.h | 2 +- interface/BayesianFlatPrior.h | 2 +- interface/BayesianToyMC.h | 2 +- interface/BestFitSigmaTestStat.h | 4 +- interface/CachingMultiPdf.h | 4 +- interface/CachingNLL.h | 2 +- interface/CascadeMinimizer.h | 2 +- interface/ChannelCompatibilityCheck.h | 2 +- interface/FitterAlgoBase.h | 4 +- interface/GenerateOnly.h | 2 +- interface/GoodnessOfFit.h | 4 +- interface/HybridNew.h | 2 +- interface/MarkovChainMC.h | 2 +- interface/MaxLikelihoodFit.h | 2 +- interface/MultiDimFit.h | 2 +- interface/ProfileLikelihood.h | 2 +- .../ProfiledLikelihoodRatioTestStatExt.h | 4 +- interface/VectorizedSimplePdfs.h | 2 +- interface/VerticalInterpHistPdf.h | 4 +- src/AsimovUtils.cc | 10 +- src/AsymPow.cc | 2 +- src/Asymptotic.cc | 20 +-- src/AsymptoticNew.cc | 12 +- src/AtlasPdfs.cxx | 2 +- src/BayesianFlatPrior.cc | 4 +- src/BayesianToyMC.cc | 8 +- src/BestFitSigmaTestStat.cc | 14 +- src/CachingMultiPdf.cc | 2 +- src/CachingNLL.cc | 20 +-- src/CascadeMinimizer.cc | 12 +- src/ChannelCompatibilityCheck.cc | 12 +- src/CloseCoutSentry.cc | 2 +- src/CombDataSetFactory.cc | 4 +- src/Combine.cc | 18 +- src/CombinedLimit_LinkDef.h | 156 ------------------ src/DebugProposal.cc | 2 +- src/FastTemplate.cc | 2 +- src/FeldmanCousins.cc | 4 +- src/FitterAlgoBase.cc | 22 +-- src/GenerateOnly.cc | 4 +- src/GoodnessOfFit.cc | 12 +- src/HGGRooPdfs.cc | 2 +- src/HWWLVJJRooPdfs.cc | 2 +- src/HWWLVJRooPdfs.cxx | 2 +- src/HZGRooPdfs.cxx | 2 +- src/HZZ2L2QRooPdfs.cc | 8 +- src/HZZ4LRooPdfs.cc | 2 +- src/HZZ4L_RooSpinZeroPdf.cc | 2 +- src/HZZ4L_RooSpinZeroPdf_2D.cc | 2 +- src/HZZ4L_RooSpinZeroPdf_phase.cc | 2 +- src/HybridNew.cc | 28 ++-- src/JacknifeQuantile.cc | 2 +- src/MarkovChainMC.cc | 20 +-- src/MaxLikelihoodFit.cc | 12 +- src/MultiDimFit.cc | 12 +- src/PdfDiagonalizer.cc | 2 +- src/ProcessNormalization.cc | 2 +- src/ProfileLikelihood.cc | 14 +- src/ProfiledLikelihoodRatioTestStat.cc | 4 +- src/ProfiledLikelihoodRatioTestStatExt.cc | 12 +- src/ProfilingTools.cc | 2 +- src/RooBernsteinFast.cc | 2 +- src/RooFitGlobalKillSentry.cc | 2 +- src/RooMinimizerOpt.cc | 2 +- src/RooMultiPdf.cxx | 2 +- src/RooScaleLOSM.cc | 2 +- src/RooSimultaneousOpt.cc | 4 +- src/RooSpline1D.cc | 2 +- src/RooSplineND.cc | 2 +- src/SequentialMinimizer.cc | 4 +- src/SimpleCacheSentry.cc | 2 +- src/SimpleGaussianConstraint.cc | 2 +- src/SimplerLikelihoodRatioTestStat.cc | 2 +- src/SimplerLikelihoodRatioTestStatExt.cc | 4 +- src/TH1Keys.cc | 2 +- src/TestProposal.cc | 2 +- src/ToyMCSamplerOpt.cc | 6 +- src/VectorizedCB.cc | 4 +- src/VectorizedGaussian.cc | 2 +- src/VectorizedSimplePdfs.cc | 2 +- src/VerticalInterpHistPdf.cc | 4 +- src/VerticalInterpPdf.cc | 2 +- src/classes.h | 41 +++++ src/classes_def.xml | 122 ++++++++++++++ src/rVrFLikelihood.cc | 2 +- src/th1fmorph.cc | 2 +- src/utils.cc | 6 +- 88 files changed, 384 insertions(+), 377 deletions(-) delete mode 100644 src/CombinedLimit_LinkDef.h create mode 100644 src/classes.h create mode 100644 src/classes_def.xml diff --git a/interface/Asymptotic.h b/interface/Asymptotic.h index 54e4604f119..ddc64519f3b 100644 --- a/interface/Asymptotic.h +++ b/interface/Asymptotic.h @@ -8,8 +8,8 @@ * * */ -#include "../interface/LimitAlgo.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include class RooRealVar; #include diff --git a/interface/AsymptoticNew.h b/interface/AsymptoticNew.h index c0f74689ef1..ffffb45c7ac 100644 --- a/interface/AsymptoticNew.h +++ b/interface/AsymptoticNew.h @@ -9,7 +9,7 @@ * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" #include class RooRealVar; diff --git a/interface/BayesianFlatPrior.h b/interface/BayesianFlatPrior.h index 2752ba21b51..772203639ef 100644 --- a/interface/BayesianFlatPrior.h +++ b/interface/BayesianFlatPrior.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" class BayesianFlatPrior : public LimitAlgo { public: diff --git a/interface/BayesianToyMC.h b/interface/BayesianToyMC.h index f395e48de84..9e281689601 100644 --- a/interface/BayesianToyMC.h +++ b/interface/BayesianToyMC.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" class RooArgSet; class BayesianToyMC : public LimitAlgo { diff --git a/interface/BestFitSigmaTestStat.h b/interface/BestFitSigmaTestStat.h index a81bb8ac314..0a35f755a61 100644 --- a/interface/BestFitSigmaTestStat.h +++ b/interface/BestFitSigmaTestStat.h @@ -9,8 +9,8 @@ class RooMinimizer; #include #include #include -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" class BestFitSigmaTestStat : public RooStats::TestStatistic { public: diff --git a/interface/CachingMultiPdf.h b/interface/CachingMultiPdf.h index c95b095107e..8265ad69901 100644 --- a/interface/CachingMultiPdf.h +++ b/interface/CachingMultiPdf.h @@ -1,8 +1,8 @@ #ifndef CachingMultiPdf_h #define CachingMultiPdf_h -#include "../interface/RooMultiPdf.h" -#include "../interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMultiPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" #include #include #include diff --git a/interface/CachingNLL.h b/interface/CachingNLL.h index 8b23067434e..86180448683 100644 --- a/interface/CachingNLL.h +++ b/interface/CachingNLL.h @@ -14,7 +14,7 @@ #include #include #include -#include "../interface/SimpleGaussianConstraint.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimpleGaussianConstraint.h" #include class RooMultiPdf; diff --git a/interface/CascadeMinimizer.h b/interface/CascadeMinimizer.h index bb389099bbf..d265becbef8 100644 --- a/interface/CascadeMinimizer.h +++ b/interface/CascadeMinimizer.h @@ -7,7 +7,7 @@ class RooRealVar; #include #include #include -#include "../interface/RooMinimizerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h" #include class CascadeMinimizer { diff --git a/interface/ChannelCompatibilityCheck.h b/interface/ChannelCompatibilityCheck.h index 31f106ac888..3333b5b9ed1 100644 --- a/interface/ChannelCompatibilityCheck.h +++ b/interface/ChannelCompatibilityCheck.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/FitterAlgoBase.h" +#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h" class ChannelCompatibilityCheck : public FitterAlgoBase { public: diff --git a/interface/FitterAlgoBase.h b/interface/FitterAlgoBase.h index 222564f6710..deba5d453c3 100644 --- a/interface/FitterAlgoBase.h +++ b/interface/FitterAlgoBase.h @@ -8,8 +8,8 @@ * * */ -#include "../interface/LimitAlgo.h" -#include "../interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" class RooFitResult; class RooMinimizer; class RooCmdArg; diff --git a/interface/GenerateOnly.h b/interface/GenerateOnly.h index 8d6fa902d06..afd3207aece 100644 --- a/interface/GenerateOnly.h +++ b/interface/GenerateOnly.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" class RooAbsPdf; class RooRealVar; class RooAbsData; class RooArgSet; diff --git a/interface/GoodnessOfFit.h b/interface/GoodnessOfFit.h index c29b18b7bb1..cf94ab401da 100644 --- a/interface/GoodnessOfFit.h +++ b/interface/GoodnessOfFit.h @@ -8,8 +8,8 @@ * * */ -#include "../interface/LimitAlgo.h" -#include "../interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" class GoodnessOfFit : public LimitAlgo { public: diff --git a/interface/HybridNew.h b/interface/HybridNew.h index bb9e87fafaa..8e5ebbb46f9 100644 --- a/interface/HybridNew.h +++ b/interface/HybridNew.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" #include #include #include diff --git a/interface/MarkovChainMC.h b/interface/MarkovChainMC.h index efe755b7c61..327badaa45b 100644 --- a/interface/MarkovChainMC.h +++ b/interface/MarkovChainMC.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" #include class RooArgSet; namespace RooStats { class MarkovChain; } diff --git a/interface/MaxLikelihoodFit.h b/interface/MaxLikelihoodFit.h index 8f3e5ef8540..3273751e3d6 100644 --- a/interface/MaxLikelihoodFit.h +++ b/interface/MaxLikelihoodFit.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/FitterAlgoBase.h" +#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h" #include #include #include diff --git a/interface/MultiDimFit.h b/interface/MultiDimFit.h index 91d668264f6..4a780cdd018 100644 --- a/interface/MultiDimFit.h +++ b/interface/MultiDimFit.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/FitterAlgoBase.h" +#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h" #include #include diff --git a/interface/ProfileLikelihood.h b/interface/ProfileLikelihood.h index 87192e24307..3104b732ccf 100644 --- a/interface/ProfileLikelihood.h +++ b/interface/ProfileLikelihood.h @@ -8,7 +8,7 @@ * * */ -#include "../interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" class RooAbsPdf; class RooRealVar; class RooAbsData; class RooArgSet; diff --git a/interface/ProfiledLikelihoodRatioTestStatExt.h b/interface/ProfiledLikelihoodRatioTestStatExt.h index b7fe5919fb5..28b33a31c41 100644 --- a/interface/ProfiledLikelihoodRatioTestStatExt.h +++ b/interface/ProfiledLikelihoodRatioTestStatExt.h @@ -9,8 +9,8 @@ class RooMinimizerOpt; #include #include #include -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" namespace nllutils { bool robustMinimize(RooAbsReal &nll, RooMinimizerOpt &minimizer, int verbosity=0, bool zeroPoint=false); diff --git a/interface/VectorizedSimplePdfs.h b/interface/VectorizedSimplePdfs.h index de5d35fdce5..e0e86cadfb8 100644 --- a/interface/VectorizedSimplePdfs.h +++ b/interface/VectorizedSimplePdfs.h @@ -3,7 +3,7 @@ #include #include -#include "../interface/HGGRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HGGRooPdfs.h" #include class VectorizedExponential { diff --git a/interface/VerticalInterpHistPdf.h b/interface/VerticalInterpHistPdf.h index 5a9e962af60..62c8e3885bd 100644 --- a/interface/VerticalInterpHistPdf.h +++ b/interface/VerticalInterpHistPdf.h @@ -8,8 +8,8 @@ #include "RooRealProxy.h" #include "RooListProxy.h" #include "TH1.h" -#include "../interface/SimpleCacheSentry.h" -#include "../interface/FastTemplate.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate.h" #include class FastVerticalInterpHistPdf; diff --git a/src/AsimovUtils.cc b/src/AsimovUtils.cc index 6569cae9b99..4d4e777f7b2 100644 --- a/src/AsimovUtils.cc +++ b/src/AsimovUtils.cc @@ -1,4 +1,4 @@ -#include "../interface/AsimovUtils.h" +#include "HiggsAnalysis/CombinedLimit/interface/AsimovUtils.h" #include #include @@ -7,10 +7,10 @@ #include #include #include -#include "../interface/utils.h" -#include "../interface/ToyMCSamplerOpt.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ToyMCSamplerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" RooAbsData *asimovutils::asimovDatasetNominal(RooStats::ModelConfig *mc, double poiValue, int verbose) { RooArgSet poi(*mc->GetParametersOfInterest()); diff --git a/src/AsymPow.cc b/src/AsymPow.cc index 04d7a2b0b5d..228b8d97235 100644 --- a/src/AsymPow.cc +++ b/src/AsymPow.cc @@ -1,4 +1,4 @@ -#include "../interface/AsymPow.h" +#include "HiggsAnalysis/CombinedLimit/interface/AsymPow.h" #include #include diff --git a/src/Asymptotic.cc b/src/Asymptotic.cc index 952d4357838..337b22c8d26 100644 --- a/src/Asymptotic.cc +++ b/src/Asymptotic.cc @@ -1,6 +1,6 @@ #include -#include "../interface/Asymptotic.h" +#include "HiggsAnalysis/CombinedLimit/interface/Asymptotic.h" #include #include #include @@ -9,15 +9,15 @@ #include #include #include -#include "../interface/Combine.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooFitGlobalKillSentry.h" -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/ToyMCSamplerOpt.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/CascadeMinimizer.h" -#include "../interface/utils.h" -#include "../interface/AsimovUtils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooFitGlobalKillSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/ToyMCSamplerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/AsimovUtils.h" #include diff --git a/src/AsymptoticNew.cc b/src/AsymptoticNew.cc index 3575010a78e..08367faf154 100644 --- a/src/AsymptoticNew.cc +++ b/src/AsymptoticNew.cc @@ -3,12 +3,12 @@ #include #include #include "RooStats/AsymptoticCalculator.h" -#include "../interface/AsymptoticNew.h" -#include "../interface/Combine.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooFitGlobalKillSentry.h" -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/AsymptoticNew.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooFitGlobalKillSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" using namespace RooStats; diff --git a/src/AtlasPdfs.cxx b/src/AtlasPdfs.cxx index 4a904aab590..46ac86f7335 100644 --- a/src/AtlasPdfs.cxx +++ b/src/AtlasPdfs.cxx @@ -30,7 +30,7 @@ END_HTML #include "RooMsgService.h" #include "TMath.h" -#include "../interface/AtlasPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/AtlasPdfs.h" ClassImp(RooStats::HistFactory::RooBSplineBases) diff --git a/src/BayesianFlatPrior.cc b/src/BayesianFlatPrior.cc index acc851f38d8..ee9378c7d6f 100644 --- a/src/BayesianFlatPrior.cc +++ b/src/BayesianFlatPrior.cc @@ -1,12 +1,12 @@ #include -#include "../interface/BayesianFlatPrior.h" +#include "HiggsAnalysis/CombinedLimit/interface/BayesianFlatPrior.h" #include "RooRealVar.h" #include "RooArgSet.h" #include "RooUniform.h" #include "RooWorkspace.h" #include "RooPlot.h" #include "TCanvas.h" -#include "../interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" #include "RooStats/BayesianCalculator.h" #include "RooStats/SimpleInterval.h" #include "RooStats/ModelConfig.h" diff --git a/src/BayesianToyMC.cc b/src/BayesianToyMC.cc index 87fe59dd3d5..736b6e9fa40 100644 --- a/src/BayesianToyMC.cc +++ b/src/BayesianToyMC.cc @@ -1,6 +1,6 @@ #include #include -#include "../interface/BayesianToyMC.h" +#include "HiggsAnalysis/CombinedLimit/interface/BayesianToyMC.h" #include "RooRealVar.h" #include "RooArgSet.h" #include "RooUniform.h" @@ -13,9 +13,9 @@ #include "RooStats/RooStatsUtils.h" #include -#include "../interface/Combine.h" -#include "../interface/CachingNLL.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" using namespace RooStats; diff --git a/src/BestFitSigmaTestStat.cc b/src/BestFitSigmaTestStat.cc index bee13539e1a..ba2100e8a22 100644 --- a/src/BestFitSigmaTestStat.cc +++ b/src/BestFitSigmaTestStat.cc @@ -1,18 +1,18 @@ -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/BestFitSigmaTestStat.h" -#include "../interface/CascadeMinimizer.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/BestFitSigmaTestStat.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include #include -#include "../interface/RooMinimizerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h" #include #include #include #include #include #include -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" //---- Uncomment this and run with --perfCounters to get statistics of successful and failed fits #define DEBUG_FIT_STATUS diff --git a/src/CachingMultiPdf.cc b/src/CachingMultiPdf.cc index d28612afe2a..fcec3383180 100644 --- a/src/CachingMultiPdf.cc +++ b/src/CachingMultiPdf.cc @@ -1,4 +1,4 @@ -#include "../interface/CachingMultiPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingMultiPdf.h" #include "vectorized.h" // Uncomment do do regression testing wrt uncached multipdf diff --git a/src/CachingNLL.cc b/src/CachingNLL.cc index 87999d86d6e..3fa06243512 100644 --- a/src/CachingNLL.cc +++ b/src/CachingNLL.cc @@ -1,16 +1,16 @@ -#include "../interface/CachingNLL.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include #include #include #include -#include "../interface/ProfilingTools.h" -#include <../interface/RooMultiPdf.h> -#include <../interface/VerticalInterpHistPdf.h> -#include <../interface/VectorizedGaussian.h> -#include <../interface/VectorizedCB.h> -#include <../interface/VectorizedSimplePdfs.h> -#include <../interface/CachingMultiPdf.h> +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" +#include +#include +#include +#include +#include +#include #include "vectorized.h" namespace cacheutils { @@ -53,7 +53,7 @@ namespace cacheutils { //---- Uncomment to enable Kahan's summation (if enabled at runtime with --X-rtd = ... // http://en.wikipedia.org/wiki/Kahan_summation_algorithm //#define ADDNLL_KAHAN_SUM -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" //std::map cacheutils::CachingAddNLL::offsets_; bool cacheutils::CachingSimNLL::noDeepLEE_ = false; diff --git a/src/CascadeMinimizer.cc b/src/CascadeMinimizer.cc index 5090eb766a0..3b63a1ea033 100644 --- a/src/CascadeMinimizer.cc +++ b/src/CascadeMinimizer.cc @@ -1,9 +1,9 @@ -#include "../interface/CascadeMinimizer.h" -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/utils.h" -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" #include #include diff --git a/src/ChannelCompatibilityCheck.cc b/src/ChannelCompatibilityCheck.cc index e0a15b5299d..ccc58a82513 100644 --- a/src/ChannelCompatibilityCheck.cc +++ b/src/ChannelCompatibilityCheck.cc @@ -1,4 +1,4 @@ -#include "../interface/ChannelCompatibilityCheck.h" +#include "HiggsAnalysis/CombinedLimit/interface/ChannelCompatibilityCheck.h" #include #include #include @@ -8,11 +8,11 @@ #include #include #include -#include "../interface/Combine.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include diff --git a/src/CloseCoutSentry.cc b/src/CloseCoutSentry.cc index d1aae3d21ad..cbdcd049dab 100644 --- a/src/CloseCoutSentry.cc +++ b/src/CloseCoutSentry.cc @@ -1,4 +1,4 @@ -#include "../interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" #include #include diff --git a/src/CombDataSetFactory.cc b/src/CombDataSetFactory.cc index 07b747c7874..afaf736f8c3 100644 --- a/src/CombDataSetFactory.cc +++ b/src/CombDataSetFactory.cc @@ -1,5 +1,5 @@ -#include "../interface/CombDataSetFactory.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/CombDataSetFactory.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include diff --git a/src/Combine.cc b/src/Combine.cc index 67fc7a0c22c..60497fef919 100644 --- a/src/Combine.cc +++ b/src/Combine.cc @@ -1,7 +1,7 @@ /************************************** Simple multiChannel significance & limit calculator ***************************************/ -#include "../interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" #include #include #include @@ -49,14 +49,14 @@ #include #include -#include "../interface/LimitAlgo.h" -#include "../interface/utils.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/ToyMCSamplerOpt.h" -#include "../interface/AsimovUtils.h" -#include "../interface/CascadeMinimizer.h" -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/ToyMCSamplerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/AsimovUtils.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" using namespace RooStats; using namespace RooFit; diff --git a/src/CombinedLimit_LinkDef.h b/src/CombinedLimit_LinkDef.h deleted file mode 100644 index 856e8537521..00000000000 --- a/src/CombinedLimit_LinkDef.h +++ /dev/null @@ -1,156 +0,0 @@ -#include "../interface/TestProposal.h" -#include "../interface/DebugProposal.h" -#include "../interface/VerticalInterpPdf.h" -#include "../interface/VerticalInterpHistPdf.h" -#include "../interface/AsymPow.h" -#include "../interface/CombDataSetFactory.h" -#include "../interface/TH1Keys.h" -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/SimpleCacheSentry.h" -#include "../interface/th1fmorph.h" -#include "../interface/HZZ4LRooPdfs.h" -#include "../interface/HWWLVJRooPdfs.h" -#include "../interface/HZZ2L2QRooPdfs.h" -#include "../interface/HGGRooPdfs.h" -#include "../interface/HZGRooPdfs.h" -#include "../interface/SequentialMinimizer.h" -#include "../interface/ProcessNormalization.h" -#include "../interface/RooSpline1D.h" -#include "../interface/RooSplineND.h" -#include "../interface/RooScaleLOSM.h" -#include "../interface/rVrFLikelihood.h" -#include "../interface/RooMultiPdf.h" -#include "../interface/RooBernsteinFast.h" -#include "../interface/SimpleGaussianConstraint.h" -#include "../interface/AtlasPdfs.h" -#include "../interface/HZZ4L_RooSpinZeroPdf.h" -#include "../interface/HZZ4L_RooSpinZeroPdf_phase.h" -#include "../interface/HZZ4L_RooSpinZeroPdf_2D.h" -#include "../interface/HWWLVJJRooPdfs.h" - -#ifdef __CINT__ -#pragma link off all globals; -#pragma link off all classes; -#pragma link off all functions; -#pragma link C++ class TestProposal+; -#pragma link C++ class DebugProposal+; -#pragma link C++ class VerticalInterpPdf+; -#pragma link C++ class VerticalInterpHistPdf+; -#pragma link C++ class FastTemplate+; -#pragma link C++ class FastHisto+; -#pragma link C++ class FastHisto2D+; -#pragma link C++ class FastHisto3D+; -#pragma link C++ class FastVerticalInterpHistPdfBase+; -#pragma link C++ class FastVerticalInterpHistPdfBase::Morph+; -#pragma link C++ class FastVerticalInterpHistPdf+; -#pragma link C++ class FastVerticalInterpHistPdf2D+; -#pragma link C++ class FastVerticalInterpHistPdf3D+; -#pragma link C++ class FastVerticalInterpHistPdf2Base+; -#pragma link C++ class FastVerticalInterpHistPdf2+; -#pragma link C++ class FastVerticalInterpHistPdf2D2+; -#pragma link C++ class HZZ4L_RooSpinZeroPdf+; -#pragma link C++ class HZZ4L_RooSpinZeroPdf_phase+; -#pragma link C++ class HZZ4L_RooSpinZeroPdf_2D+; -#pragma link C++ class AsymPow+; -#pragma link C++ class CombDataSetFactory+; -#pragma link C++ class TH1Keys+; -#pragma link C++ class RooSimultaneousOpt+; -#pragma link C++ class SimpleGaussianConstraint+; -#pragma link C++ class SimpleCacheSentry+; -#pragma link C++ function th1fmorph; -#pragma link C++ class RooqqZZPdf+; -#pragma link C++ class RooggZZPdf+; -#pragma link C++ class RooqqZZPdf_v2+; -#pragma link C++ class RooggZZPdf_v2+; -#pragma link C++ class RooBetaFunc_v2+; -#pragma link C++ class Roo4lMasses2D+; -#pragma link C++ class Roo4lMasses2D_Bkg+; -#pragma link C++ class Roo4lMasses2D_BkgGGZZ+; -#pragma link C++ class RooFourMuMassShapePdf2+; -#pragma link C++ class RooFourEMassShapePdf2+; -#pragma link C++ class RooTwoETwoMuMassShapePdf2+; -#pragma link C++ class RooFourMuMassRes+; -#pragma link C++ class RooFourEMassRes+; -#pragma link C++ class RooTwoETwoMuMassRes+; -#pragma link C++ class RooRelBW1+; -#pragma link C++ class RooRelBWUF+; -#pragma link C++ class RooRelBWUF_SM4+; -#pragma link C++ class RooRelBWUFParam+; -#pragma link C++ class RooRelBWUFParamWidth+; -#pragma link C++ class RooRelBW+; -#pragma link C++ class RooRelBWHighMass+; -#pragma link C++ class RooDoubleCB+; -#pragma link C++ class RooaDoubleCBxBW+; -#pragma link C++ class RooCB+; -#pragma link C++ class RooFermi+; -#pragma link C++ class Triangle+; -#pragma link C++ class RooLevelledExp+; -#pragma link C++ class RooPower+; -#pragma link C++ class cmsmath::SequentialMinimizer+; -#pragma link C++ class ProcessNormalization+; -#pragma link C++ class RooSpline1D+; -#pragma link C++ class RooSplineND+; -#pragma link C++ class RooScaleLOSM+; -#pragma link C++ class RooScaleHGamGamLOSM+; -#pragma link C++ class RooScaleHGluGluLOSM+; -#pragma link C++ class RooScaleHGamGamLOSMPlusX+; -#pragma link C++ class RooScaleHGluGluLOSMPlusX+; -#pragma link C++ class RooTsallis; -#pragma link C++ class RooErfExpPdf+; -#pragma link C++ class RooAlpha+; -#pragma link C++ class RooAlphaExp+; -#pragma link C++ class RooBWRunPdf+; -#pragma link C++ class RooErfPow2Pdf+; -#pragma link C++ class RooAlpha4ErfPow2Pdf+; -#pragma link C++ class RooErfPowPdf+; -#pragma link C++ class RooAlpha4ErfPowPdf+; -#pragma link C++ class RooPow2Pdf+; -#pragma link C++ class RooPowPdf+; -#pragma link C++ class RooQCDPdf+; -#pragma link C++ class RooUser1Pdf+; -#pragma link C++ class RooAlpha4ErfPowExpPdf+; -#pragma link C++ class RooErfPowExpPdf+; -#pragma link C++ class RooStepBernstein+; -#pragma link C++ class RooGaussStepBernstein+; -#pragma link C++ class rVrFLikelihood+; -#pragma link C++ class RooMultiPdf+; -#pragma link C++ class RooBernsteinFast<1>+; -#pragma link C++ class RooBernsteinFast<2>+; -#pragma link C++ class RooBernsteinFast<3>+; -#pragma link C++ class RooBernsteinFast<4>+; -#pragma link C++ class RooBernsteinFast<5>+; -#pragma link C++ class RooBernsteinFast<6>+; -#pragma link C++ class RooBernsteinFast<7>+; -#pragma link C++ class RooAnaExpNPdf+; -#pragma link C++ class RooAlpha42ExpPdf+; -#pragma link C++ class Roo2ExpPdf+; -#pragma link C++ class RooExpNPdf+; -#pragma link C++ class RooAlpha4ExpNPdf+; -#pragma link C++ class RooExpTailPdf+; -#pragma link C++ class RooAlpha4ExpTailPdf+; -#pragma link C++ class RooAlpha4GausExpPdf+; -#pragma link C++ class RooGausExpPdf+; -#pragma link C++ class RooDoubleCrystalBall+; - -#pragma link C++ class RooStats::HistFactory::RooBSplineBases+; -#pragma link C++ class RooStats::HistFactory::RooBSpline+; -#pragma link C++ class RooParamKeysPdf+; -#pragma link C++ class RooStarMomentMorph+; - -#pragma link C++ class RooSigPlusInt+; -#pragma link C++ class RooBWHighMassGGH+; -#pragma link C++ class RooCPSHighMassGGH+; -#pragma link C++ class RooCPSHighMassGGHNoInterf+; -#pragma link C++ class RooCPSHighMassVBF+; -#pragma link C++ class RooCPSHighMassVBFNoInterf+; -#pragma link C++ class RooVBFZZPdf+; -#pragma link C++ class RooVBFZZPdf_v2+; -#pragma link C++ class RooExpPoly+; -#pragma link C++ class RooPowerLaw+; -#pragma link C++ class RooPowerFunction+; -#pragma link C++ class RooTH1DPdf+; -#pragma link C++ class RooPowerExpPdf+; -#pragma link C++ class RooErfPdf+; -#pragma link C++ class RooChebyshevPDF+; - -#endif diff --git a/src/DebugProposal.cc b/src/DebugProposal.cc index f8e6b0a0192..fd14d91aa90 100644 --- a/src/DebugProposal.cc +++ b/src/DebugProposal.cc @@ -1,4 +1,4 @@ -#include "../interface/DebugProposal.h" +#include "HiggsAnalysis/CombinedLimit/interface/DebugProposal.h" #include #include #include diff --git a/src/FastTemplate.cc b/src/FastTemplate.cc index c937a034ef8..aab919d9697 100644 --- a/src/FastTemplate.cc +++ b/src/FastTemplate.cc @@ -1,4 +1,4 @@ -#include "../interface/FastTemplate.h" +#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate.h" #include #include diff --git a/src/FeldmanCousins.cc b/src/FeldmanCousins.cc index 8ba17164f1b..92547ffe08a 100644 --- a/src/FeldmanCousins.cc +++ b/src/FeldmanCousins.cc @@ -1,6 +1,6 @@ #include -#include "../interface/FeldmanCousins.h" -#include "../interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/FeldmanCousins.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" #include #include #include diff --git a/src/FitterAlgoBase.cc b/src/FitterAlgoBase.cc index 34900bb40f8..2ca03872d6e 100644 --- a/src/FitterAlgoBase.cc +++ b/src/FitterAlgoBase.cc @@ -1,4 +1,4 @@ -#include "../interface/FitterAlgoBase.h" +#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h" #include #include @@ -13,21 +13,21 @@ #include "RooGaussian.h" #include "RooConstVar.h" #include "RooPlot.h" -#include "../interface/RooMinimizerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h" #include "TCanvas.h" #include "TStyle.h" #include "TH2.h" #include "TFile.h" #include -#include "../interface/Combine.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/CascadeMinimizer.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/utils.h" -#include "../interface/ToyMCSamplerOpt.h" - -#include "../interface/ProfilingTools.h" -#include "../interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ToyMCSamplerOpt.h" + +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" #include #include diff --git a/src/GenerateOnly.cc b/src/GenerateOnly.cc index dc251782471..ed45081f354 100644 --- a/src/GenerateOnly.cc +++ b/src/GenerateOnly.cc @@ -1,5 +1,5 @@ -#include "../interface/GenerateOnly.h" -#include "../interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/GenerateOnly.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" #include using namespace RooStats; diff --git a/src/GoodnessOfFit.cc b/src/GoodnessOfFit.cc index 8a2bb48f540..619b34ffc7f 100644 --- a/src/GoodnessOfFit.cc +++ b/src/GoodnessOfFit.cc @@ -1,4 +1,4 @@ -#include "../interface/GoodnessOfFit.h" +#include "HiggsAnalysis/CombinedLimit/interface/GoodnessOfFit.h" #include #include #include @@ -17,11 +17,11 @@ #include #include #include -#include "../interface/Combine.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include diff --git a/src/HGGRooPdfs.cc b/src/HGGRooPdfs.cc index e755b9cd5a9..984f6ef0148 100644 --- a/src/HGGRooPdfs.cc +++ b/src/HGGRooPdfs.cc @@ -27,7 +27,7 @@ #include "Riostream.h" #include -#include "../interface/HGGRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HGGRooPdfs.h" #include "RooRealVar.h" ClassImp(RooPower) diff --git a/src/HWWLVJJRooPdfs.cc b/src/HWWLVJJRooPdfs.cc index 9c942cd49b1..991ebbea9e0 100644 --- a/src/HWWLVJJRooPdfs.cc +++ b/src/HWWLVJJRooPdfs.cc @@ -1,6 +1,6 @@ #include "Riostream.h" -#include "../interface/HWWLVJJRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HWWLVJJRooPdfs.h" #include "RooAbsReal.h" //#include "RooAbsCategory.h" #include "RooMath.h" diff --git a/src/HWWLVJRooPdfs.cxx b/src/HWWLVJRooPdfs.cxx index 03c5ea6c4c1..c0f239d0f63 100755 --- a/src/HWWLVJRooPdfs.cxx +++ b/src/HWWLVJRooPdfs.cxx @@ -6,7 +6,7 @@ #include "Riostream.h" -#include "../interface/HWWLVJRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HWWLVJRooPdfs.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" #include "RooExponential.h" diff --git a/src/HZGRooPdfs.cxx b/src/HZGRooPdfs.cxx index e0de3ed2c34..739a3c9e186 100644 --- a/src/HZGRooPdfs.cxx +++ b/src/HZGRooPdfs.cxx @@ -29,7 +29,7 @@ #include #include "TMath.h" #include "Math/SpecFunc.h" -#include "../interface/HZGRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZGRooPdfs.h" #include "RooAbsReal.h" #include "RooRealVar.h" #include "RooArgList.h" diff --git a/src/HZZ2L2QRooPdfs.cc b/src/HZZ2L2QRooPdfs.cc index 65f73d0a4df..59f74f702b0 100644 --- a/src/HZZ2L2QRooPdfs.cc +++ b/src/HZZ2L2QRooPdfs.cc @@ -2,10 +2,10 @@ #include #include "TMath.h" -//#include "../interface/RooDoubleCB.h" -//#include "../interface/RooFermi.h" -//#include "../interface/RooRelBW.h" -#include "../interface/HZZ2L2QRooPdfs.h" +//#include "HiggsAnalysis/CombinedLimit/interface/RooDoubleCB.h" +//#include "HiggsAnalysis/CombinedLimit/interface/RooFermi.h" +//#include "HiggsAnalysis/CombinedLimit/interface/RooRelBW.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ2L2QRooPdfs.h" #include "RooRealVar.h" #include "RooRealConstant.h" diff --git a/src/HZZ4LRooPdfs.cc b/src/HZZ4LRooPdfs.cc index 9e221d4c141..3533e8c3aad 100644 --- a/src/HZZ4LRooPdfs.cc +++ b/src/HZZ4LRooPdfs.cc @@ -1,6 +1,6 @@ #include "Riostream.h" -#include "../interface/HZZ4LRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4LRooPdfs.h" #include "RooAbsReal.h" #include "RooRealVar.h" #include "RooVoigtian.h" diff --git a/src/HZZ4L_RooSpinZeroPdf.cc b/src/HZZ4L_RooSpinZeroPdf.cc index cdfbcd488b2..624207b5624 100755 --- a/src/HZZ4L_RooSpinZeroPdf.cc +++ b/src/HZZ4L_RooSpinZeroPdf.cc @@ -1,5 +1,5 @@ #include "Riostream.h" -#include "../interface/HZZ4L_RooSpinZeroPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4L_RooSpinZeroPdf.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" #include diff --git a/src/HZZ4L_RooSpinZeroPdf_2D.cc b/src/HZZ4L_RooSpinZeroPdf_2D.cc index b5eb026599e..4100b4447b4 100755 --- a/src/HZZ4L_RooSpinZeroPdf_2D.cc +++ b/src/HZZ4L_RooSpinZeroPdf_2D.cc @@ -1,5 +1,5 @@ #include "Riostream.h" -#include "../interface/HZZ4L_RooSpinZeroPdf_2D.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4L_RooSpinZeroPdf_2D.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" #include diff --git a/src/HZZ4L_RooSpinZeroPdf_phase.cc b/src/HZZ4L_RooSpinZeroPdf_phase.cc index 44e95e86c28..a8718836341 100755 --- a/src/HZZ4L_RooSpinZeroPdf_phase.cc +++ b/src/HZZ4L_RooSpinZeroPdf_phase.cc @@ -1,5 +1,5 @@ #include "Riostream.h" -#include "../interface/HZZ4L_RooSpinZeroPdf_phase.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4L_RooSpinZeroPdf_phase.h" #include "RooAbsReal.h" #include "RooAbsCategory.h" #include diff --git a/src/HybridNew.cc b/src/HybridNew.cc index 2dad71f25c7..72d6f4ef150 100644 --- a/src/HybridNew.cc +++ b/src/HybridNew.cc @@ -5,8 +5,8 @@ #include #include -#include "../interface/HybridNew.h" -#include "../interface/CascadeMinimizer.h" // must be early +#include "HiggsAnalysis/CombinedLimit/interface/HybridNew.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" // must be early #include #include #include @@ -30,18 +30,18 @@ #include #include #include -#include "../interface/Combine.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooFitGlobalKillSentry.h" -#include "../interface/SimplerLikelihoodRatioTestStat.h" -#include "../interface/ProfiledLikelihoodRatioTestStat.h" -#include "../interface/SimplerLikelihoodRatioTestStatExt.h" -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/BestFitSigmaTestStat.h" -#include "../interface/ToyMCSamplerOpt.h" -#include "../interface/utils.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooFitGlobalKillSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimplerLikelihoodRatioTestStat.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStat.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimplerLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/BestFitSigmaTestStat.h" +#include "HiggsAnalysis/CombinedLimit/interface/ToyMCSamplerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" #include diff --git a/src/JacknifeQuantile.cc b/src/JacknifeQuantile.cc index 2e6a7746aba..cfbee21e2fb 100644 --- a/src/JacknifeQuantile.cc +++ b/src/JacknifeQuantile.cc @@ -1,4 +1,4 @@ -#include "../interface/JacknifeQuantile.h" +#include "HiggsAnalysis/CombinedLimit/interface/JacknifeQuantile.h" #include #include #include diff --git a/src/MarkovChainMC.cc b/src/MarkovChainMC.cc index 300bdad14fa..94aae801376 100644 --- a/src/MarkovChainMC.cc +++ b/src/MarkovChainMC.cc @@ -1,4 +1,4 @@ -#include "../interface/MarkovChainMC.h" +#include "HiggsAnalysis/CombinedLimit/interface/MarkovChainMC.h" #include #include #include "TKey.h" @@ -18,15 +18,15 @@ class THnSparse; #include "RooStats/ProposalHelper.h" #include "RooStats/ProposalFunction.h" #include "RooStats/RooStatsUtils.h" -#include "../interface/Combine.h" -#include "../interface/TestProposal.h" -#include "../interface/DebugProposal.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/RooFitGlobalKillSentry.h" -#include "../interface/JacknifeQuantile.h" - -#include "../interface/ProfilingTools.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/TestProposal.h" +#include "HiggsAnalysis/CombinedLimit/interface/DebugProposal.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooFitGlobalKillSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/JacknifeQuantile.h" + +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" using namespace RooStats; using namespace std; diff --git a/src/MaxLikelihoodFit.cc b/src/MaxLikelihoodFit.cc index 634403989bd..fced9b02a3e 100644 --- a/src/MaxLikelihoodFit.cc +++ b/src/MaxLikelihoodFit.cc @@ -1,4 +1,4 @@ -#include "../interface/MaxLikelihoodFit.h" +#include "HiggsAnalysis/CombinedLimit/interface/MaxLikelihoodFit.h" #include "RooRealVar.h" #include "RooArgSet.h" #include "RooRandom.h" @@ -16,11 +16,11 @@ #include "TH2.h" #include "TFile.h" #include -#include "../interface/Combine.h" -#include "../interface/ProfileLikelihood.h" -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include diff --git a/src/MultiDimFit.cc b/src/MultiDimFit.cc index 6c73c01e283..12ff680cc17 100644 --- a/src/MultiDimFit.cc +++ b/src/MultiDimFit.cc @@ -1,4 +1,4 @@ -#include "../interface/MultiDimFit.h" +#include "HiggsAnalysis/CombinedLimit/interface/MultiDimFit.h" #include #include @@ -8,12 +8,12 @@ #include "RooRandom.h" #include "RooAbsData.h" #include "RooFitResult.h" -#include "../interface/RooMinimizerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h" #include -#include "../interface/Combine.h" -#include "../interface/CascadeMinimizer.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include #include diff --git a/src/PdfDiagonalizer.cc b/src/PdfDiagonalizer.cc index e816fa7972e..0dabb8d18cf 100644 --- a/src/PdfDiagonalizer.cc +++ b/src/PdfDiagonalizer.cc @@ -1,4 +1,4 @@ -#include "../interface/PdfDiagonalizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/PdfDiagonalizer.h" #include #include diff --git a/src/ProcessNormalization.cc b/src/ProcessNormalization.cc index 5d41d3af9b2..7ec1494e518 100644 --- a/src/ProcessNormalization.cc +++ b/src/ProcessNormalization.cc @@ -1,4 +1,4 @@ -#include "../interface/ProcessNormalization.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProcessNormalization.h" #include #include diff --git a/src/ProfileLikelihood.cc b/src/ProfileLikelihood.cc index 1ae10fbdac6..480e97a7781 100644 --- a/src/ProfileLikelihood.cc +++ b/src/ProfileLikelihood.cc @@ -1,10 +1,10 @@ -#include "../interface/ProfileLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfileLikelihood.h" #include "RooRealVar.h" #include "RooArgSet.h" #include "RooRandom.h" #include "RooDataSet.h" #include "RooFitResult.h" -#include "../interface/RooMinimizerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h" #include "TGraph.h" #include "TF1.h" #include "TFitResult.h" @@ -14,11 +14,11 @@ #include "RooStats/LikelihoodIntervalPlot.h" #include "RooStats/HypoTestResult.h" #include "RooStats/RooStatsUtils.h" -#include "../interface/Combine.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/utils.h" -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/Combine.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" #include diff --git a/src/ProfiledLikelihoodRatioTestStat.cc b/src/ProfiledLikelihoodRatioTestStat.cc index 7bbea842df5..4aa35b97d77 100644 --- a/src/ProfiledLikelihoodRatioTestStat.cc +++ b/src/ProfiledLikelihoodRatioTestStat.cc @@ -1,5 +1,5 @@ -#include "../interface/ProfiledLikelihoodRatioTestStat.h" -#include "../interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStat.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" #include #include diff --git a/src/ProfiledLikelihoodRatioTestStatExt.cc b/src/ProfiledLikelihoodRatioTestStatExt.cc index 2034e4976ca..6b61df8d50b 100644 --- a/src/ProfiledLikelihoodRatioTestStatExt.cc +++ b/src/ProfiledLikelihoodRatioTestStatExt.cc @@ -1,8 +1,8 @@ -#include "../interface/ProfiledLikelihoodRatioTestStatExt.h" -#include "../interface/CascadeMinimizer.h" -#include "../interface/CloseCoutSentry.h" -#include "../interface/CachingNLL.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfiledLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include #include #include @@ -12,7 +12,7 @@ #include #include #include -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" //---- Uncomment this and run with --perfCounters to get statistics of successful and failed fits //#define DEBUG_FIT_STATUS diff --git a/src/ProfilingTools.cc b/src/ProfilingTools.cc index 2d7f726bac2..098ec552c43 100644 --- a/src/ProfilingTools.cc +++ b/src/ProfilingTools.cc @@ -1,4 +1,4 @@ -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" // we try to stick to pure C within the signal handlers #include diff --git a/src/RooBernsteinFast.cc b/src/RooBernsteinFast.cc index c5bea3bdfa5..3b5b3eca091 100644 --- a/src/RooBernsteinFast.cc +++ b/src/RooBernsteinFast.cc @@ -33,7 +33,7 @@ #include "Riostream.h" #include "TMath.h" -#include "../interface/RooBernsteinFast.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooBernsteinFast.h" #include "RooAbsReal.h" #include "RooRealVar.h" #include "RooArgList.h" diff --git a/src/RooFitGlobalKillSentry.cc b/src/RooFitGlobalKillSentry.cc index 3ec09cfafec..238b46f71c9 100644 --- a/src/RooFitGlobalKillSentry.cc +++ b/src/RooFitGlobalKillSentry.cc @@ -1 +1 @@ -#include "../interface/RooFitGlobalKillSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooFitGlobalKillSentry.h" diff --git a/src/RooMinimizerOpt.cc b/src/RooMinimizerOpt.cc index d1bf705cafe..01a91edb98e 100644 --- a/src/RooMinimizerOpt.cc +++ b/src/RooMinimizerOpt.cc @@ -1,4 +1,4 @@ -#include "../interface/RooMinimizerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h" #include #include diff --git a/src/RooMultiPdf.cxx b/src/RooMultiPdf.cxx index b3de6e40c2b..4fd8621ac2c 100644 --- a/src/RooMultiPdf.cxx +++ b/src/RooMultiPdf.cxx @@ -10,7 +10,7 @@ #include "Riostream.h" #include -#include "../interface/RooMultiPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMultiPdf.h" #include "RooRealVar.h" #include "RooAddPdf.h" #include diff --git a/src/RooScaleLOSM.cc b/src/RooScaleLOSM.cc index 5a048c31119..aac3b252a31 100644 --- a/src/RooScaleLOSM.cc +++ b/src/RooScaleLOSM.cc @@ -1,6 +1,6 @@ using namespace std; -#include "../interface/RooScaleLOSM.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooScaleLOSM.h" const double RooScaleLOSM::mt_ = 172.50; const double RooScaleLOSM::mW_ = 80.398; diff --git a/src/RooSimultaneousOpt.cc b/src/RooSimultaneousOpt.cc index 431e4ed67d4..bbe312d41f4 100644 --- a/src/RooSimultaneousOpt.cc +++ b/src/RooSimultaneousOpt.cc @@ -1,5 +1,5 @@ -#include "../interface/RooSimultaneousOpt.h" -#include "../interface/CachingNLL.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h" #include RooAbsReal* diff --git a/src/RooSpline1D.cc b/src/RooSpline1D.cc index ca24b8e686f..248a0137568 100644 --- a/src/RooSpline1D.cc +++ b/src/RooSpline1D.cc @@ -1,4 +1,4 @@ -#include "../interface/RooSpline1D.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSpline1D.h" #include diff --git a/src/RooSplineND.cc b/src/RooSplineND.cc index 383f7961102..bfa07d39cfd 100644 --- a/src/RooSplineND.cc +++ b/src/RooSplineND.cc @@ -1,4 +1,4 @@ -#include "../interface/RooSplineND.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSplineND.h" RooSplineND::RooSplineND(const char *name, const char *title, RooArgList &vars, TTree *tree, const char *fName, double eps, std::string cutstring) : RooAbsReal(name,title), diff --git a/src/SequentialMinimizer.cc b/src/SequentialMinimizer.cc index 3a23e9b48c1..77aa05d44de 100644 --- a/src/SequentialMinimizer.cc +++ b/src/SequentialMinimizer.cc @@ -1,4 +1,4 @@ -#include "../interface/SequentialMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/SequentialMinimizer.h" #include #include @@ -12,7 +12,7 @@ #include #include #include -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" #define foreach BOOST_FOREACH #define DEBUG_ODM_printf if (0) printf diff --git a/src/SimpleCacheSentry.cc b/src/SimpleCacheSentry.cc index 90bb052c3e0..039edb45dc6 100644 --- a/src/SimpleCacheSentry.cc +++ b/src/SimpleCacheSentry.cc @@ -1,4 +1,4 @@ -#include "../interface/SimpleCacheSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h" SimpleCacheSentry::SimpleCacheSentry() : _deps("deps","deps",this) {} diff --git a/src/SimpleGaussianConstraint.cc b/src/SimpleGaussianConstraint.cc index 806be8815f9..20470a639a7 100644 --- a/src/SimpleGaussianConstraint.cc +++ b/src/SimpleGaussianConstraint.cc @@ -1,4 +1,4 @@ -#include "../interface/SimpleGaussianConstraint.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimpleGaussianConstraint.h" #include #include diff --git a/src/SimplerLikelihoodRatioTestStat.cc b/src/SimplerLikelihoodRatioTestStat.cc index a2fbdbcc5c6..912d92d9f7d 100644 --- a/src/SimplerLikelihoodRatioTestStat.cc +++ b/src/SimplerLikelihoodRatioTestStat.cc @@ -1 +1 @@ -#include "../interface/SimplerLikelihoodRatioTestStat.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimplerLikelihoodRatioTestStat.h" diff --git a/src/SimplerLikelihoodRatioTestStatExt.cc b/src/SimplerLikelihoodRatioTestStatExt.cc index e4d02bc9a34..3107369df21 100644 --- a/src/SimplerLikelihoodRatioTestStatExt.cc +++ b/src/SimplerLikelihoodRatioTestStatExt.cc @@ -1,5 +1,5 @@ -#include "../interface/SimplerLikelihoodRatioTestStatExt.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimplerLikelihoodRatioTestStatExt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" SimplerLikelihoodRatioTestStatOpt::SimplerLikelihoodRatioTestStatOpt( const RooArgSet &obs, diff --git a/src/TH1Keys.cc b/src/TH1Keys.cc index 04207ad4788..e7665f81171 100644 --- a/src/TH1Keys.cc +++ b/src/TH1Keys.cc @@ -1,4 +1,4 @@ -#include "../interface/TH1Keys.h" +#include "HiggsAnalysis/CombinedLimit/interface/TH1Keys.h" #include #include diff --git a/src/TestProposal.cc b/src/TestProposal.cc index f6df0e363b3..8104651539d 100644 --- a/src/TestProposal.cc +++ b/src/TestProposal.cc @@ -1,4 +1,4 @@ -#include "../interface/TestProposal.h" +#include "HiggsAnalysis/CombinedLimit/interface/TestProposal.h" #include #include #include diff --git a/src/ToyMCSamplerOpt.cc b/src/ToyMCSamplerOpt.cc index 04f7982b84e..965056e78d3 100644 --- a/src/ToyMCSamplerOpt.cc +++ b/src/ToyMCSamplerOpt.cc @@ -1,5 +1,5 @@ -#include "../interface/ToyMCSamplerOpt.h" -#include "../interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/ToyMCSamplerOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" #include #include #include @@ -12,7 +12,7 @@ #include #include #include -#include <../interface/ProfilingTools.h> +#include #include "RooStats/DetailedOutputAggregator.h" using namespace std; diff --git a/src/VectorizedCB.cc b/src/VectorizedCB.cc index d096537dea2..1b17979a1f1 100644 --- a/src/VectorizedCB.cc +++ b/src/VectorizedCB.cc @@ -1,7 +1,7 @@ -#include "../interface/VectorizedCB.h" +#include "HiggsAnalysis/CombinedLimit/interface/VectorizedCB.h" #include "RooMath.h" #include "vectorized.h" -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" #include #include diff --git a/src/VectorizedGaussian.cc b/src/VectorizedGaussian.cc index 8be28a8a01d..002be10f052 100644 --- a/src/VectorizedGaussian.cc +++ b/src/VectorizedGaussian.cc @@ -1,4 +1,4 @@ -#include "../interface/VectorizedGaussian.h" +#include "HiggsAnalysis/CombinedLimit/interface/VectorizedGaussian.h" #include "RooMath.h" #include "vectorized.h" #include diff --git a/src/VectorizedSimplePdfs.cc b/src/VectorizedSimplePdfs.cc index 9b26ded60eb..151d82f7e05 100644 --- a/src/VectorizedSimplePdfs.cc +++ b/src/VectorizedSimplePdfs.cc @@ -1,4 +1,4 @@ -#include "../interface/VectorizedSimplePdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/VectorizedSimplePdfs.h" #include "RooMath.h" #include "vectorized.h" #include diff --git a/src/VerticalInterpHistPdf.cc b/src/VerticalInterpHistPdf.cc index 75d87618c63..e4d99a1278e 100644 --- a/src/VerticalInterpHistPdf.cc +++ b/src/VerticalInterpHistPdf.cc @@ -1,4 +1,4 @@ -#include "../interface/VerticalInterpHistPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/VerticalInterpHistPdf.h" #include #include @@ -13,7 +13,7 @@ //#define TRACE_CALLS #ifdef TRACE_CALLS -#include "../interface/ProfilingTools.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProfilingTools.h" #define TRACEME() PerfCounter::add( __PRETTY_FUNCTION__ ); #else #define TRACEME() diff --git a/src/VerticalInterpPdf.cc b/src/VerticalInterpPdf.cc index af02b993064..5c53a00c686 100644 --- a/src/VerticalInterpPdf.cc +++ b/src/VerticalInterpPdf.cc @@ -1,4 +1,4 @@ -#include "../interface/VerticalInterpPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/VerticalInterpPdf.h" #include "RooFit.h" #include "Riostream.h" diff --git a/src/classes.h b/src/classes.h new file mode 100644 index 00000000000..28eb839640f --- /dev/null +++ b/src/classes.h @@ -0,0 +1,41 @@ +#include "HiggsAnalysis/CombinedLimit/interface/TestProposal.h" +#include "HiggsAnalysis/CombinedLimit/interface/DebugProposal.h" +#include "HiggsAnalysis/CombinedLimit/interface/VerticalInterpPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/VerticalInterpHistPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/AsymPow.h" +#include "HiggsAnalysis/CombinedLimit/interface/CombDataSetFactory.h" +#include "HiggsAnalysis/CombinedLimit/interface/TH1Keys.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/th1fmorph.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4LRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HWWLVJRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ2L2QRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HGGRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZGRooPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/SequentialMinimizer.h" +#include "HiggsAnalysis/CombinedLimit/interface/ProcessNormalization.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSpline1D.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSplineND.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooScaleLOSM.h" +#include "HiggsAnalysis/CombinedLimit/interface/rVrFLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooMultiPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooBernsteinFast.h" +#include "HiggsAnalysis/CombinedLimit/interface/SimpleGaussianConstraint.h" +#include "HiggsAnalysis/CombinedLimit/interface/AtlasPdfs.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4L_RooSpinZeroPdf.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4L_RooSpinZeroPdf_phase.h" +#include "HiggsAnalysis/CombinedLimit/interface/HZZ4L_RooSpinZeroPdf_2D.h" +#include "HiggsAnalysis/CombinedLimit/interface/HWWLVJJRooPdfs.h" + +namespace { + struct dictionary { + RooBernsteinFast<1> my_RooBernsteinFast_1; + RooBernsteinFast<2> my_RooBernsteinFast_2; + RooBernsteinFast<3> my_RooBernsteinFast_3; + RooBernsteinFast<4> my_RooBernsteinFast_4; + RooBernsteinFast<5> my_RooBernsteinFast_5; + RooBernsteinFast<6> my_RooBernsteinFast_6; + RooBernsteinFast<7> my_RooBernsteinFast_7; + }; +} diff --git a/src/classes_def.xml b/src/classes_def.xml new file mode 100644 index 00000000000..79615377297 --- /dev/null +++ b/src/classes_def.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/rVrFLikelihood.cc b/src/rVrFLikelihood.cc index 3ed4cd14189..a6fff23268c 100644 --- a/src/rVrFLikelihood.cc +++ b/src/rVrFLikelihood.cc @@ -1,4 +1,4 @@ -#include "../interface/rVrFLikelihood.h" +#include "HiggsAnalysis/CombinedLimit/interface/rVrFLikelihood.h" #include rVrFLikelihood::rVrFLikelihood(const char *name, const char *title) : diff --git a/src/th1fmorph.cc b/src/th1fmorph.cc index a072c5c05dc..7ca06bc66ca 100644 --- a/src/th1fmorph.cc +++ b/src/th1fmorph.cc @@ -1,4 +1,4 @@ -#include "../interface/th1fmorph.h" +#include "HiggsAnalysis/CombinedLimit/interface/th1fmorph.h" #include "TROOT.h" #include "TAxis.h" #include "TArrayD.h" diff --git a/src/utils.cc b/src/utils.cc index cddad242ebc..4553681c5c7 100644 --- a/src/utils.cc +++ b/src/utils.cc @@ -1,5 +1,5 @@ -#include "../interface/utils.h" -#include "../interface/RooSimultaneousOpt.h" +#include "HiggsAnalysis/CombinedLimit/interface/utils.h" +#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h" #include #include @@ -32,7 +32,7 @@ #include #include -#include "../interface/CloseCoutSentry.h" +#include "HiggsAnalysis/CombinedLimit/interface/CloseCoutSentry.h" using namespace std; From 6d2e0c08a0e82d2819ff1747493a505287d07009 Mon Sep 17 00:00:00 2001 From: Giovanni Date: Wed, 13 May 2015 15:40:19 +0200 Subject: [PATCH 2/3] Fix initialization of pointer datamembers in MaxLikelihoodFit (crashes in 742/root6) --- src/MaxLikelihoodFit.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/MaxLikelihoodFit.cc b/src/MaxLikelihoodFit.cc index fced9b02a3e..84ad5ee98f2 100644 --- a/src/MaxLikelihoodFit.cc +++ b/src/MaxLikelihoodFit.cc @@ -47,7 +47,10 @@ bool MaxLikelihoodFit::customStartingPoint_ = false; MaxLikelihoodFit::MaxLikelihoodFit() : - FitterAlgoBase("MaxLikelihoodFit specific options") + FitterAlgoBase("MaxLikelihoodFit specific options"), + globalObservables_(0), + nuisanceParameters_(0), + processNormalizations_(0) { options_.add_options() ("minos", boost::program_options::value(&minos_)->default_value(minos_), "Compute MINOS errors for: 'none', 'poi', 'all'") From d35352fa9f58bf865e85cb5429bab71e8fd5190c Mon Sep 17 00:00:00 2001 From: Giovanni Date: Wed, 13 May 2015 15:44:35 +0200 Subject: [PATCH 3/3] Make sure RooWorkspace::import calls the right overload --- python/ModelTools.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/python/ModelTools.py b/python/ModelTools.py index f829dff3359..63445fe9e57 100644 --- a/python/ModelTools.py +++ b/python/ModelTools.py @@ -5,6 +5,20 @@ ROOFIT_EXPR = "expr" ROOFIT_EXPR_PDF = "EXPR" +class SafeWorkspaceImporter(): + """Class that provides the RooWorkspace::import method, but makes sure we call the proper + overload of it, since in ROOT 6 sometimes PyROOT calls the wrong one""" + def __init__(self,wsp): + self.wsp = wsp + self.imp = getattr(wsp,"import") + def __call__(self,*args): + if len(args) != 1: + self.imp(*args) + elif args[0].Class().InheritsFrom("RooAbsReal") or args[0].Class().InheritsFrom("RooArgSet") or args[0].Class().InheritsFrom("RooAbsData"): + self.imp(args[0], ROOT.RooCmdArg()) # force the proper overload to be called + else: + self.imp(*args) + class ModelBuilderBase(): """This class defines the basic stuff for a model builder, and it's an interface on top of RooWorkspace::factory or HLF files""" def __init__(self,options): @@ -17,7 +31,8 @@ def __init__(self,options): ROOT.gSystem.Load("libHiggsAnalysisCombinedLimit") ROOT.TH1.AddDirectory(False) self.out = ROOT.RooWorkspace("w","w"); - self.out._import = getattr(self.out,"import") # workaround: import is a python keyword + #self.out._import = getattr(self.out,"import") # workaround: import is a python keyword + self.out._import = SafeWorkspaceImporter(self.out) self.out.dont_delete = [] if options.verbose == 0: ROOT.RooMsgService.instance().setGlobalKillBelow(ROOT.RooFit.ERROR) @@ -34,10 +49,13 @@ def __init__(self,options): global ROOFIT_EXPR; ROOFIT_EXPR = "cexpr" def factory_(self,X): + if self.options.verbose >= 7: + print "RooWorkspace::factory('%s')" % X if (len(X) > 1000): print "Executing factory with a string of length ",len(X)," > 1000, could trigger a bug: ",X ret = self.out.factory(X); if ret: + if self.options.verbose >= 7: print " ---> ",ret self.out.dont_delete.append(ret) return ret else: