Update KCaloJet

nConst is now nConstituents. Use floats as the reco data format also uses floats.
KIT-CMS · Nov 30, 2014 · 93d17b3 · 93d17b3
1 parent 395bd6a
commit 93d17b3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/DataFormats/interface/KJetMET.h b/DataFormats/interface/KJetMET.h
@@ -14,10 +14,15 @@
 
 struct KCaloJet : public KLV
 {
-	double area;
-	double fHPD, fRBX;
-	double fEM, fHO;
-	int nConst, n90Hits;
+	float area;          //< jet area
+
+	float fEM;           //< energy fraction in the ECAL
+	float fHO;           //< energy fraction in HO
+	float fHPD;          //< energy fraction from dominant hybrid photo diode
+	float fRBX;          //< energy fraction from dominant readout box
+
+	short nConstituents; //< number of constituents (calo towers)
+	short n90Hits;       //< number of hits 90% of the jet energy
 };
 typedef std::vector<KCaloJet> KCaloJets;
 

diff --git a/DataFormats/test/KDebug.cpp b/DataFormats/test/KDebug.cpp
@@ -53,7 +53,7 @@ std::ostream &operator<<(std::ostream &os, const KElectron &e)
 std::ostream &operator<<(std::ostream &os, const KCaloJet &jet)
 {
 	os << static_cast<const KLV>(jet) << std::endl;
-	os << "\t#Const=" << jet.nConst << " n90Hits=" << jet.n90Hits << std::endl;
+	os << "\tnConstituents=" << jet.nConstituents << " n90Hits=" << jet.n90Hits << std::endl;
 	os << "\tfHPD=" << jet.fHPD << " fRBX=" << jet.fRBX << std::endl;
 	return os << "\tfEM=" << jet.fEM << " fHO=" << jet.fHO << " area=" << jet.area;
 }

diff --git a/Producers/interface/KCaloJetProducer.h b/Producers/interface/KCaloJetProducer.h
@@ -36,7 +36,7 @@ class KCaloJetProducer : public KBaseMultiLVProducer<reco::CaloJetCollection, KC
 		copyP4(in, out.p4);
 		out.area = in.jetArea();
 		out.fEM = in.emEnergyFraction();
-		out.nConst = in.getJetConstituents().size();
+		out.nConstituents = in.getJetConstituents().size();
 
 		// Jet ID variables
 		out.n90Hits = -2;
@@ -48,11 +48,8 @@ class KCaloJetProducer : public KBaseMultiLVProducer<reco::CaloJetCollection, KC
 			edm::RefToBase<reco::Jet> jetRef(edm::Ref<reco::CaloJetCollection>(handle, this->nCursor));
 			const reco::JetID &jetID = (*hJetID)[jetRef];
 			out.n90Hits = (int)(jetID.n90Hits);
-			// energy fraction from dominant hybrid photo diode
 			out.fHPD = jetID.fHPD;
-			// energy fraction from dominant readout box
 			out.fRBX = jetID.fRBX;
-			// energy fraction in HO
 			out.fHO = jetID.fHO;
 		}
 	}