27 |
|
|
28 |
|
#include "UserCode/JetFitAnalyzer/interface/JetFitAnalyzer.h" |
29 |
|
|
30 |
– |
#include <vector> |
31 |
– |
|
30 |
|
JetFitAnalyzer::JetFitAnalyzer(const edm::ParameterSet& iConfig) |
33 |
– |
: user_minuit(0) |
31 |
|
{ |
32 |
|
// get parameters from iConfig |
36 |
– |
ignorezero_ = iConfig.getUntrackedParameter("ignorezero", false); |
37 |
– |
rebinX_ = iConfig.getUntrackedParameter("rebinX", 1); |
38 |
– |
rebinY_ = iConfig.getUntrackedParameter("rebinY", 1); |
33 |
|
P_cutoff_val_ = iConfig.getUntrackedParameter("P_cutoff_val", 0.5); |
40 |
– |
|
41 |
– |
jetfit::set_ignorezero(ignorezero_); |
34 |
|
} |
35 |
|
|
36 |
|
|
53 |
|
{ |
54 |
|
using namespace edm; |
55 |
|
|
56 |
< |
jetfit::results r; std::vector<jetfit::trouble> t; |
56 |
> |
HistoFitter histoFitter; |
57 |
> |
std::vector<HistoFitter::Trouble> t; |
58 |
|
|
59 |
|
TH2D *histo = make_histo(iEvent, iSetup); |
60 |
|
if (histo != 0) { |
61 |
< |
jetfit::model_def &_mdef = make_model_def(iEvent, iSetup, histo); |
62 |
< |
jetfit::set_model_def(&_mdef); |
63 |
< |
r = jetfit::fit_histo(histo, t, user_minuit, _mdef.get_n_special_par_sets(), |
71 |
< |
rebinX_, rebinY_, P_cutoff_val_); |
61 |
> |
HistoFitter::ModelDefinition &_mdef = make_model_def(iEvent, iSetup, histo); |
62 |
> |
histoFitter.set_ModelDefinition(&_mdef); |
63 |
> |
HistoFitter::FitResults r(histoFitter.fit_histo(histo, t, 1, P_cutoff_val_)); |
64 |
|
analyze_results(r, t, histo); |
65 |
|
} |
66 |
|
else { |
67 |
< |
cerr << "Fitting not performed" << endl; |
67 |
> |
std::cerr << "Fitting not performed" << std::endl; |
68 |
|
} |
69 |
|
} |
70 |
|
|