Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix errors in standalone compilation #950

Merged
merged 3 commits into from
May 21, 2024
Merged

Fix errors in standalone compilation #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76d10e7
Use relative imports in `RandStartPtr`
guitargeek Apr 18, 2024
c17f082
Make `MultiDimFit::GridType` public
guitargeek Apr 18, 2024
14123c4
Add missing `TTree` include
guitargeek May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions interface/MultiDimFit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
Expand Down
4 changes: 2 additions & 2 deletions interface/RandStartPt.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/HybridNew.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 4 additions & 4 deletions src/RandStartPt.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Loading