Merge pull request #950 from guitargeek/compiler_errors

Fix errors in standalone compilation
cms-analysis · May 21, 2024 · 43e6579 · 43e6579
2 parents c5f0dfa + 14123c4
commit 43e6579
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/interface/MultiDimFit.h b/interface/MultiDimFit.h
@@ -23,15 +23,14 @@ class MultiDimFit : public FitterAlgoBase {
   }
   virtual void applyOptions(const boost::program_options::variables_map &vm) ;
 
-  friend class RandStartPt;
+  enum GridType { G1x1, G3x3 };
 
 protected:
   virtual bool runSpecific(RooWorkspace *w, RooStats::ModelConfig *mc_s, RooStats::ModelConfig *mc_b, RooAbsData &data, double &limit, double &limitErr, const double *hint);
 
   enum Algo { None, Singles, Cross, Grid, RandomPoints, Contour2D, Stitch2D, FixedPoint, Impact };
   static Algo algo_;
 
-  enum GridType { G1x1, G3x3 };
   static GridType gridType_;
 
   static std::vector<std::string>  poi_;

diff --git a/interface/RandStartPt.h b/interface/RandStartPt.h
@@ -1,8 +1,8 @@
 #ifndef HiggsAnalysis_CombinedLimit_RandStartPt_h
 #define HiggsAnalaysis_CombinedLimit_RandStartPt_h
 
-#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h"
-#include "HiggsAnalysis/CombinedLimit/interface/MultiDimFit.h"
+#include "../interface/CascadeMinimizer.h"
+#include "../interface/MultiDimFit.h"
 
 #include <vector>
 #include <string>

diff --git a/src/HybridNew.cc b/src/HybridNew.cc
@@ -15,6 +15,7 @@
 #include <TGraphErrors.h>
 #include <TStopwatch.h>
 #include <TRandom3.h>
+#include <TTree.h>
 #include "RooRealVar.h"
 #include "RooArgSet.h"
 #include "RooAbsPdf.h"

diff --git a/src/RandStartPt.cc b/src/RandStartPt.cc
@@ -1,7 +1,7 @@
-#include "HiggsAnalysis/CombinedLimit/interface/RandStartPt.h"
-#include "HiggsAnalysis/CombinedLimit/interface/Combine.h"
-#include "HiggsAnalysis/CombinedLimit/interface/utils.h"
-#include "HiggsAnalysis/CombinedLimit/interface/CascadeMinimizer.h"
+#include "../interface/RandStartPt.h"
+#include "../interface/Combine.h"
+#include "../interface/utils.h"
+#include "../interface/CascadeMinimizer.h"
 
 #include <vector>
 #include <iostream>