Merge pull request #191 from gpetruc/74x-root6

Fixes to make the code run in ROOT 6.02

Author: gpetruc

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 <memory>
 class RooRealVar;
 #include <RooAbsReal.h>

interface/AsymptoticNew.h

@@ -9,7 +9,7 @@
  *
  */
 
-#include "../interface/LimitAlgo.h"
+#include "HiggsAnalysis/CombinedLimit/interface/LimitAlgo.h"
 #include <memory>
 class RooRealVar;
 

interface/BayesianFlatPrior.h

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

interface/BayesianToyMC.h

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

interface/BestFitSigmaTestStat.h

@@ -9,8 +9,8 @@ class RooMinimizer;
 #include <RooAbsData.h>
 #include <RooArgSet.h>
 #include <RooStats/TestStatistic.h>
-#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:

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 <RooAbsData.h>
 #include <RooAddPdf.h>
 #include <vector>

interface/CachingNLL.h

@@ -14,7 +14,7 @@
 #include <RooSimultaneous.h>
 #include <RooGaussian.h>
 #include <RooProduct.h>
-#include "../interface/SimpleGaussianConstraint.h"
+#include "HiggsAnalysis/CombinedLimit/interface/SimpleGaussianConstraint.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 class RooMultiPdf;

interface/CascadeMinimizer.h

@@ -7,7 +7,7 @@ class RooRealVar;
 #include <RooArgSet.h>
 #include <RooListProxy.h>
 #include <RooSetProxy.h>
-#include "../interface/RooMinimizerOpt.h"
+#include "HiggsAnalysis/CombinedLimit/interface/RooMinimizerOpt.h"
 #include <boost/program_options.hpp>
 
 class CascadeMinimizer {

interface/ChannelCompatibilityCheck.h

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

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;