ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/JetFitAnalyzer/src/JetFitAnalyzer.cc
(Generate patch)

Comparing UserCode/JetFitAnalyzer/src/JetFitAnalyzer.cc (file contents):
Revision 1.2 by dnisson, Wed Oct 14 02:46:26 2009 UTC vs.
Revision 1.5 by dnisson, Wed Nov 11 22:24:41 2009 UTC

# Line 28 | Line 28
28   #include "UserCode/JetFitAnalyzer/interface/JetFitAnalyzer.h"
29  
30   #include <vector>
31 + #include <iostream>
32  
33   JetFitAnalyzer::JetFitAnalyzer(const edm::ParameterSet& iConfig)
34    : user_minuit(0)
# Line 61 | Line 62 | JetFitAnalyzer::analyze(const edm::Event
62   {
63     using namespace edm;
64  
65 <   jetfit::results r; std::vector<jetfit::trouble> t;
65 >   std::vector<jetfit::trouble> t;
66  
67     TH2D *histo = make_histo(iEvent, iSetup);
68     if (histo != 0) {
69       jetfit::model_def &_mdef = make_model_def(iEvent, iSetup, histo);
70 <     jetfit::set_model_def(&_mdef);
71 <     r = jetfit::fit_histo(histo, t, user_minuit, _mdef.get_n_special_par_sets(),
72 <                           rebinX_, rebinY_, P_cutoff_val_);
70 >     jetfit::results r(fit_histo(histo, t, user_minuit,
71 >                                 _mdef.get_n_special_par_sets(),
72 >                                 rebinX_, rebinY_, P_cutoff_val_));
73       analyze_results(r, t, histo);
74     }
75     else {
76 <     cerr << "Fitting not performed" << endl;
76 >     std::cerr << "Fitting not performed" << std::endl;
77     }
78   }
79  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines