Merge pull request #793 from guitargeek/112x_headers

Some updates to header files and includes
cms-analysis · Dec 7, 2022 · ea3dc9c · ea3dc9c
2 parents 4d2dde0 + d04117c
commit ea3dc9c
Show file tree

Hide file tree

Showing 131 changed files with 345 additions and 337 deletions.
diff --git a/Makefile b/Makefile
@@ -91,7 +91,7 @@ $(OBJ_DIR):
 	@mkdir -p $(OBJ_DIR)/a
 
 $(OBJ_DIR)/a/$(DICTNAME).cc: $(SRC_DIR)/classes_def.xml | $(OBJ_DIR)
-	genreflex $(SRC_DIR)/classes.h -s $< -o $@ --deep --fail_on_warnings --rootmap=$(OBJ_DIR)/a/$(DICTNAME).rootmap --rootmap-lib=$(SONAME) -I$(PARENT_DIR) 
+	genreflex $(SRC_DIR)/classes.h -s $< -o $@ --deep --fail_on_warnings --rootmap=$(OBJ_DIR)/a/$(DICTNAME).rootmap --rootmap-lib=$(SONAME) -I$(PARENT_DIR)
 	mv $(OBJ_DIR)/a/$(DICTNAME).rootmap $(LIB_DIR)/
 	mv $(OBJ_DIR)/a/$(DICTNAME)_rdict.pcm $(LIB_DIR)/
 

diff --git a/interface/AsimovUtils.h b/interface/AsimovUtils.h
@@ -1,3 +1,6 @@
+#ifndef HiggsAnalysis_CombinedLimit_AsimovUtils_h
+#define HiggsAnalysis_CombinedLimit_AsimovUtils_h
+
 class RooAbsData;
 class RooAbsCollection;
 namespace RooStats { class ModelConfig; }
@@ -9,3 +12,4 @@ namespace asimovutils {
     RooAbsData * asimovDatasetWithFit(RooStats::ModelConfig *mc, RooAbsData &realdata, RooAbsCollection &snapshot, bool needsFit, double poiValue=0.0, int verbose=0) ;
 }
 
+#endif
diff --git a/interface/AsymptoticLimits.h b/interface/AsymptoticLimits.h
@@ -8,8 +8,8 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
-#include "HiggsAnalysis/CombinedLimit/interface/utils.h"
+#include "LimitAlgo.h"
+#include "utils.h"
 #include <memory>
 class RooRealVar;
 #include <RooAbsReal.h>

diff --git a/interface/BayesianFlatPrior.h b/interface/BayesianFlatPrior.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+#include "LimitAlgo.h"
 
 class BayesianFlatPrior : public LimitAlgo {
 public:

diff --git a/interface/BayesianToyMC.h b/interface/BayesianToyMC.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+#include "LimitAlgo.h"
 class RooArgSet; 
 
 class BayesianToyMC : public LimitAlgo {

diff --git a/interface/BestFitSigmaTestStat.h b/interface/BestFitSigmaTestStat.h
@@ -9,8 +9,8 @@ class RooMinimizer;
 #include <RooAbsData.h>
 #include <RooArgSet.h>
 #include <RooStats/TestStatistic.h>
-#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h"
+#include "RooSimultaneousOpt.h"
+#include "CachingNLL.h"
 
 class BestFitSigmaTestStat : public RooStats::TestStatistic {
     public:

diff --git a/interface/CMSHistErrorPropagator.h b/interface/CMSHistErrorPropagator.h
@@ -9,10 +9,10 @@
 #include "RooRealProxy.h"
 #include "Rtypes.h"
 #include "TH1F.h"
-#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate_Old.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistFunc.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistV.h"
+#include "FastTemplate_Old.h"
+#include "SimpleCacheSentry.h"
+#include "CMSHistFunc.h"
+#include "CMSHistV.h"
 
 class CMSHistErrorPropagator : public RooAbsReal {
 private:

diff --git a/interface/CMSHistFunc.h b/interface/CMSHistFunc.h
@@ -12,9 +12,9 @@
 #include "Rtypes.h"
 #include "TH1F.h"
 #include "TMatrix.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistV.h"
-#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate_Old.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h"
+#include "CMSHistV.h"
+#include "FastTemplate_Old.h"
+#include "SimpleCacheSentry.h"
 
 class CMSHistFuncWrapper;
 

diff --git a/interface/CMSHistFuncWrapper.h b/interface/CMSHistFuncWrapper.h
@@ -9,11 +9,11 @@
 #include "RooRealProxy.h"
 #include "RooArgProxy.h"
 #include "Rtypes.h"
-#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate_Old.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistErrorPropagator.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistFunc.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistV.h"
+#include "FastTemplate_Old.h"
+#include "SimpleCacheSentry.h"
+#include "CMSHistErrorPropagator.h"
+#include "CMSHistFunc.h"
+#include "CMSHistV.h"
 
 class CMSHistFuncWrapper : public RooAbsReal {
  public:

diff --git a/interface/CMSHistSum.h b/interface/CMSHistSum.h
@@ -9,10 +9,10 @@
 #include "RooRealProxy.h"
 #include "Rtypes.h"
 #include "TH1F.h"
-#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate_Old.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistFunc.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CMSHistV.h"
+#include "FastTemplate_Old.h"
+#include "SimpleCacheSentry.h"
+#include "CMSHistFunc.h"
+#include "CMSHistV.h"
 
 class CMSHistSum : public RooAbsReal {
 private:

diff --git a/interface/CachingMultiPdf.h b/interface/CachingMultiPdf.h
@@ -1,8 +1,8 @@
 #ifndef CachingMultiPdf_h
 #define CachingMultiPdf_h
 
-#include "HiggsAnalysis/CombinedLimit/interface/RooMultiPdf.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h"
+#include "RooMultiPdf.h"
+#include "CachingNLL.h"
 #include <RooAbsData.h>
 #include <RooAddPdf.h>
 #include <RooProduct.h>

diff --git a/interface/CachingNLL.h b/interface/CachingNLL.h
@@ -15,9 +15,9 @@
 #include <RooGaussian.h>
 #include <RooPoisson.h>
 #include <RooProduct.h>
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleGaussianConstraint.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimplePoissonConstraint.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleConstraintGroup.h"
+#include "SimpleGaussianConstraint.h"
+#include "SimplePoissonConstraint.h"
+#include "SimpleConstraintGroup.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class RooMultiPdf;

diff --git a/interface/CascadeMinimizer.h b/interface/CascadeMinimizer.h
@@ -7,7 +7,7 @@ class RooRealVar;
 #include <RooArgSet.h>
 #include <RooListProxy.h>
 #include <RooSetProxy.h>
-//#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h"
+//#include "RooMinimizerOpt.h"
 #include "RooMinimizer.h"
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string.hpp>

diff --git a/interface/ChannelCompatibilityCheck.h b/interface/ChannelCompatibilityCheck.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h"
+#include "FitterAlgoBase.h"
 
 class ChannelCompatibilityCheck : public FitterAlgoBase {
 public:

diff --git a/interface/FastTemplate.hpp b/interface/FastTemplate.hpp
@@ -1,4 +1,7 @@
-#include "HiggsAnalysis/CombinedLimit/interface/Accumulators.h"
+#ifndef HiggsAnalysis_CombinedLimit_FastTemplate_hpp
+#define HiggsAnalysis_CombinedLimit_FastTemplate_hpp
+
+#include "Accumulators.h"
 
 #include <cmath>
 #include <cstdlib>
@@ -361,3 +364,4 @@ typedef FastHistoAxis_d FastHistoAxis;
 // typedef FastHisto2D_d FastHisto2D;
 // typedef FastHisto3D_d FastHisto3D;
 
+#endif
diff --git a/interface/FitDiagnostics.h b/interface/FitDiagnostics.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h"
+#include "FitterAlgoBase.h"
 #include <TTree.h>
 #include <RooArgList.h>
 #include <RooFitResult.h>

diff --git a/interface/FitterAlgoBase.h b/interface/FitterAlgoBase.h
@@ -8,8 +8,8 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
-#include "HiggsAnalysis/CombinedLimit/interface/Significance.h"
+#include "LimitAlgo.h"
+#include "Significance.h"
 class RooFitResult;
 class RooMinimizer;
 class RooCmdArg;

diff --git a/interface/GenerateOnly.h b/interface/GenerateOnly.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+#include "LimitAlgo.h"
 
 class RooAbsPdf; class RooRealVar; class RooAbsData; class RooArgSet;
 

diff --git a/interface/GoodnessOfFit.h b/interface/GoodnessOfFit.h
@@ -8,8 +8,8 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
-#include "HiggsAnalysis/CombinedLimit/interface/Significance.h"
+#include "LimitAlgo.h"
+#include "Significance.h"
 
 class TDirectory;
 

diff --git a/interface/HybridNew.h b/interface/HybridNew.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+#include "LimitAlgo.h"
 #include <algorithm> 
 #include <RooStats/ModelConfig.h>
 #include <RooStats/HybridCalculator.h>

diff --git a/interface/JacknifeQuantile.h b/interface/JacknifeQuantile.h
@@ -1,3 +1,6 @@
+#ifndef HiggsAnalysis_CombinedLimit_JacknifeQuantile_h
+#define HiggsAnalysis_CombinedLimit_JacknifeQuantile_h
+
 #include <vector>
 #include <algorithm>
 #include <random>
@@ -33,3 +36,4 @@ class QuantileCalculator {
 
 };
 
+#endif
diff --git a/interface/Logger.h b/interface/Logger.h
@@ -1,3 +1,6 @@
+#ifndef HiggsAnalysis_CombinedLimit_Logger_h
+#define HiggsAnalysis_CombinedLimit_Logger_h
+
 /* 
  * Logger adapted from 
  * Professional C++, 2nd Edition, Oct 2011
@@ -72,3 +75,5 @@ class Logger
 	Logger& operator=(const Logger&);
 	static std::mutex sMutex;
 };
+
+#endif
diff --git a/interface/MarkovChainMC.h b/interface/MarkovChainMC.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+#include "LimitAlgo.h"
 #include <TList.h>
 class RooArgSet;
 namespace RooStats { class MarkovChain; }

diff --git a/interface/MultiDimFit.h b/interface/MultiDimFit.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/FitterAlgoBase.h"
+#include "FitterAlgoBase.h"
 #include <RooRealVar.h>
 #include "TFile.h"
 #include <vector>

diff --git a/interface/ProfiledLikelihoodRatioTestStatExt.h b/interface/ProfiledLikelihoodRatioTestStatExt.h
@@ -9,8 +9,8 @@ class RooMinimizer;
 #include <RooAbsData.h>
 #include <RooArgSet.h>
 #include <RooStats/TestStatistic.h>
-#include "HiggsAnalysis/CombinedLimit/interface/RooSimultaneousOpt.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h"
+#include "RooSimultaneousOpt.h"
+#include "CachingNLL.h"
 
 namespace nllutils {
     bool robustMinimize(RooAbsReal &nll, RooMinimizer &minimizer, int verbosity=0, bool zeroPoint=false);

diff --git a/interface/RooMorphingPdf.h b/interface/RooMorphingPdf.h
@@ -9,8 +9,8 @@
 #include "RooAbsReal.h"
 #include "TH1F.h"
 #include "Rtypes.h"
-#include "HiggsAnalysis/CombinedLimit/interface/VerticalInterpHistPdf.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h"
+#include "VerticalInterpHistPdf.h"
+#include "SimpleCacheSentry.h"
 
 class RooMorphingPdf : public RooAbsPdf {
  protected:

diff --git a/interface/Significance.h b/interface/Significance.h
@@ -8,7 +8,7 @@
  *
  *
  */
-#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+#include "LimitAlgo.h"
 
 class RooAbsPdf; class RooRealVar; class RooAbsData; class RooArgSet;
 

diff --git a/interface/SimpleConstraintGroup.h b/interface/SimpleConstraintGroup.h
@@ -1,8 +1,8 @@
 #ifndef SimpleGaussianConstraintGroup_h
 #define SimpleGaussianConstraintGroup_h
 
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleGaussianConstraint.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimplePoissonConstraint.h"
+#include "SimpleGaussianConstraint.h"
+#include "SimplePoissonConstraint.h"
 #include "RooSetProxy.h"
 
 class SimpleConstraintGroup : public RooAbsReal {

diff --git a/interface/VectorizedHistFactoryPdfs.h b/interface/VectorizedHistFactoryPdfs.h
@@ -4,7 +4,7 @@
 #include <RooHistFunc.h>
 #include <RooStats/HistFactory/ParamHistFunc.h>
 #include <RooStats/HistFactory/PiecewiseInterpolation.h>
-#include "HiggsAnalysis/CombinedLimit/interface/CachingNLL.h"
+#include "CachingNLL.h"
 
 namespace cacheutils {
     class VectorizedHistFunc : public CachingPdfBase {

diff --git a/interface/VectorizedSimplePdfs.h b/interface/VectorizedSimplePdfs.h
@@ -3,7 +3,7 @@
 
 #include <RooExponential.h>
 #include <RooAbsData.h>
-#include "HiggsAnalysis/CombinedLimit/interface/HGGRooPdfs.h"
+#include "HGGRooPdfs.h"
 #include <vector>
 
 class VectorizedExponential {

diff --git a/interface/VerticalInterpHistPdf.h b/interface/VerticalInterpHistPdf.h
@@ -8,8 +8,8 @@
 #include "RooRealProxy.h"
 #include "RooListProxy.h"
 #include "TH1.h"
-#include "HiggsAnalysis/CombinedLimit/interface/SimpleCacheSentry.h"
-#include "HiggsAnalysis/CombinedLimit/interface/FastTemplate_Old.h"
+#include "SimpleCacheSentry.h"
+#include "FastTemplate_Old.h"
 #include <cmath>
 
 class FastVerticalInterpHistPdf;

diff --git a/interface/th1fmorph.h b/interface/th1fmorph.h
@@ -1,3 +1,6 @@
+#ifndef HiggsAnalysis_CombinedLimit_th1fmorph_h
+#define HiggsAnalysis_CombinedLimit_th1fmorph_h
+
 #include "TH1.h"
 
 TH1F *th1fmorph(const char *chname, 
@@ -70,3 +73,4 @@ TH1D *th1fmorph(const char *chname,
   //   well-tested).
   // *------------------------------------------------------------------------
 
+#endif
diff --git a/src/AsimovUtils.cc b/src/AsimovUtils.cc
@@ -1,4 +1,4 @@
-#include "HiggsAnalysis/CombinedLimit/interface/AsimovUtils.h"
+#include "../interface/AsimovUtils.h"
 
 #include <memory>
 #include <stdexcept>
@@ -7,11 +7,11 @@
 #include <RooArgSet.h>
 #include <RooProdPdf.h>
 #include <RooUniform.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"
-#include "HiggsAnalysis/CombinedLimit/interface/Logger.h"
+#include "../interface/utils.h"
+#include "../interface/ToyMCSamplerOpt.h"
+#include "../interface/CloseCoutSentry.h"
+#include "../interface/CascadeMinimizer.h"
+#include "../interface/Logger.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
@@ -1,4 +1,4 @@
-#include "HiggsAnalysis/CombinedLimit/interface/AsymPow.h"
+#include "../interface/AsymPow.h"
 
 #include <cmath>
 #include <cassert>
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,7 @@ @@
      *
      *
      */
-    #include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
+    #include "LimitAlgo.h"
     class BayesianFlatPrior : public LimitAlgo {
     public:
@@ Expand Down @@