8000 Update KMET · KIT-CMS/Kappa@845b3e3 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit 845b3e3

Browse files
JoramBergerJoramBerger
committed
Update KMET
Consistent naming inside Kappa and with CMSSW. Do not use type6 and type7 anymore. Use floats as the reco data format has floats.
1 parent 0ba7640 commit 845b3e3

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎DataFormats/interface/KJetMET.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ struct KJet : public KBasicJet
7777
};
7878
typedef std::vector<KJet> KJets;
7979

80+
8081
struct KBasicMET : public KLV
8182
{
8283
double sumEt;
83-
8484
ROOT::Math::SMatrix<double, 2, 2, ROOT::Math::MatRepSym<double, 2> > significance;
8585
};
8686

8787
struct KMET : public KBasicMET
8888
{
89-
double chargedEMEtFraction, chargedHadEtFraction;
90-
double neutralEMEtFraction, neutralHadEtFraction;
91-
double muonEtFraction;
92-
double type6EtFraction, type7EtFraction;
89+
float photonFraction, electronFraction;
90+
float neutralHadronFraction, chargedHadronFraction;
91+
float muonFraction;
92+
float hfHadronFraction, hfEMFraction;
9393
};
9494

9595
struct KHCALNoiseSummary

‎DataFormats/test/KDebug.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ std::ostream &operator<<(std::ostream &os, const KBasicMET &met)
2828
std::ostream &operator<<(std::ostream &os, const KMET &met)
2929
{
3030
os << static_cast<const KBasicMET>(met) << std::endl;
31-
os << "\tCharged (em,had): " << met.chargedEMEtFraction << ", " << met.chargedHadEtFraction << std::endl;
32-
os << "\tNeutral (em,had): " << met.neutralEMEtFraction << ", " << met.neutralHadEtFraction << std::endl;
33-
os << "\tMuonF=" << met.muonEtFraction << " type6F=" << met.type6EtFraction << " type7F=" << met.type7EtFraction;
31+
os << "\tCHF=" << met.chargedHadronFraction << " NHF=" << met.neutralHadronFraction << std::endl;
32+
os << "\teF=" << met.electronFraction << " photF=" << met.photonFraction << " muF=" << met.muonFraction << std::endl;
33+
os << "\tHFHadF=" << met.hfHadronFraction << " HFEMF=" << met.hfEMFraction;
3434
return os;
3535
}
3636

‎Producers/interface/KMETProducer.h

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,14 @@ class KMETProducer : public KBaseMultiProducer<edm::View<reco::PFMET>, KMET>
3131
copyP4(in.at(0), out.p4);
3232
out.sumEt = in.at(0).sumEt();
3333

34-
out.chargedEMEtFraction = in.at(0).ChargedEMEtFraction();
35-
out.chargedHadEtFraction = in.at(0).ChargedHadEtFraction();
36-
out.muonEtFraction = in.at(0).MuonEtFraction();
37-
out.neutralEMEtFraction = in.at(0).NeutralEMEtFraction();
38-
out.neutralHadEtFraction = in.at(0).NeutralHadEtFraction();
39-
out.type6EtFraction = in.at(0).Type6EtFraction();
40-
out.type7EtFraction = in.at(0).Type7EtFraction();
34+
out.photonFraction = in.at(0).photonEtFraction();
35+
out.neutralHadronFraction = in.at(0).neutralHadronEtFraction();
36+
out.electronFraction = in.at(0).electronEtFraction();
37+
out.chargedHadronFraction = in.at(0).chargedHadronEtFraction();
38+
out.muonFraction = in.at(0).muonEtFraction();
39+
out.hfHadronFraction = in.at(0).HFHadronEtFraction();
40+
out.hfEMFraction = in.at(0).HFEMEtFraction();
41+
4142

4243
TMatrixD mat = in.at(0).getSignificanceMatrix();
4344
if (mat(0,1) != mat(1,0))

0 commit comments

Comments
 (0)
0