Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 77758
b: "refs/heads/CMSSW_7_1_X"
c: de28575
h: "refs/heads/CMSSW_7_1_X"
v: v3
  • Loading branch information
Colin Bernet committed Nov 12, 2009
1 parent e95097a commit 217d642
Show file tree
Hide file tree
Showing 6 changed files with 182 additions and 148 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
refs/heads/gh-pages: 09c786f70121f131b3715aaf3464996502bbeb7e
"refs/heads/CMSSW_7_1_X": 5792bca511a8465fb558befd7d873a3b470e827b
"refs/heads/CMSSW_7_1_X": de285759e05828cc14fa943ea3bb000fa44bbb4b
1 change: 0 additions & 1 deletion trunk/DQMOffline/PFTau/interface/METBenchmark.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class METBenchmark : public Benchmark {

protected:


TH1F* pt_;
TH1F* phi_;
TH1F* sumEt_;
Expand Down
21 changes: 19 additions & 2 deletions trunk/DQMOffline/PFTau/interface/MatchMETBenchmark.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@

#include "DataFormats/METReco/interface/METFwd.h"

// is this include necessary?
// check all includes

// integrate and check your benchmarks in PFRootEvent (take PFCandidateManager as an example)

// integrate and check your benchmarks Validation/RecoParticleFlow (take PFCandidateManager as an example)

// remove the old benchmarks from these 2 packages (python files, C++ code, ...)

#include <vector>

class MatchMETBenchmark : public Benchmark {
Expand All @@ -26,15 +35,23 @@ class MatchMETBenchmark : public Benchmark {


protected:

TH2F* delta_et_Over_et_VS_et_;
// next 3: add to MatchCandidateBenchmark?

// (rec - true) / true = rec/true - 1
TH2F* delta_et_VS_et_;
TH2F* delta_et_Over_et_VS_et_;

TH2F* delta_phi_VS_et_;

TH1F* delta_ex_;

// True and Rec: remove. remove the following histo?
TH2F* RecEt_VS_TrueEt_;
TH2F* delta_set_VS_set_;
TH2F* delta_set_Over_set_VS_set_;
TH2F* delta_ex_VS_set_;

// remove the following histo?
TH2F* RecSet_Over_TrueSet_VS_TrueSet_;

};
Expand Down
5 changes: 4 additions & 1 deletion trunk/DQMOffline/PFTau/src/MatchMETBenchmark.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ void MatchMETBenchmark::setup() {
dphiPS = PhaseSpace( 100, -3.2, 3.2);
dptPS = PhaseSpace( 100, -500, 500);
setPS = PhaseSpace( 300, 0.0, 3000);
dsetPS = PhaseSpace( 300, 0.-1000, 1000);
dsetPS = PhaseSpace( 200, 0.-1000, 1000);
setOvsetPS = PhaseSpace( 500,0., 2.);
break;
case DQMOFFLINE:
Expand All @@ -46,6 +46,8 @@ void MatchMETBenchmark::setup() {
break;
}

// variable bins to be done here, as they will save a lot of memory.

//float ptBins[11] = {0, 1, 2, 5, 10, 20, 50, 100, 200, 400, 1000};

delta_et_Over_et_VS_et_ = book2D("delta_et_Over_et_VS_et_",
Expand Down Expand Up @@ -98,6 +100,7 @@ void MatchMETBenchmark::fillOne(const reco::MET& cand,

if( !isInRange(cand.pt(), cand.eta(), cand.phi() ) ) return;

// in case it happens, print an error message LogWarning
if ( matchedCand.pt()>0.001 ) delta_et_Over_et_VS_et_->Fill( matchedCand.pt(), (cand.pt() - matchedCand.pt())/matchedCand.pt() );
delta_et_VS_et_->Fill( matchedCand.pt(), cand.pt() - matchedCand.pt() );
delta_phi_VS_et_->Fill( matchedCand.pt(), cand.phi() - matchedCand.phi() );
Expand Down
14 changes: 14 additions & 0 deletions trunk/Validation/RecoParticleFlow/interface/TH2Analyzer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,14 @@ class TH2;
class TH1D;
class TH2D;

// EN FAIT NON ?
// check why white window in colin's case
// are you making copies of histograms without changing the name?
// names could be handled in the following way:
// - give a name to each instance of TH2Analyzer in constructor
// - all histograms of the corresponding TH2Analyzer are created with a name (key)
// which starts with name_RMS

class TH2Analyzer : public TObject {

public:
Expand Down Expand Up @@ -48,9 +56,15 @@ class TH2Analyzer : public TObject {
TH1D* SigmaGauss() { return sigmaGauss_; }
TH1D* MeanX() { return meanXslice_; }

// add an histo for chi2 / ndof
// add a function FitSlice(int i)
// not now: work along Y

private:

void ProcessSlices( const TH2D* histo );

// no need for const, because i is copied
void ProcessSlice(const int i, TH1D* histo ) const;

const TH2* hist2D_;
Expand Down
Loading

0 comments on commit 217d642

Please sign in to comment.