Update KBasicJet

Two energy fractions are removed as they are redundant:
neutralEMFraction = photonFraction + HFEMFraction
chargedEMFraction = electronFraction
Use floats as the reco format also uses floats.

DataFormats/interface/KJetMET.h

@@ -28,13 +28,13 @@ typedef std::vector<KCaloJet> KCaloJets;
 
 struct KBasicJet : public KLV
 {
-	double area;
-	float neutralEMFraction, chargedEMFraction;
-	float neutralHadFraction, chargedHadFraction;
+	float area;
+
+	float neutralHadronFraction, chargedHadronFraction;
 	float muonFraction, photonFraction, electronFraction;
-	float HFHadFraction, HFEMFraction;
+	float hfHadronFraction, hfEMFraction;
 
-	int nConst, nCharged;
+	int nConstituents, nCharged;
 };
 typedef std::vector<KBasicJet> KBasicJets;
 

DataFormats/test/KDebug.cpp

@@ -61,9 +61,10 @@ std::ostream &operator<<(std::ostream &os, const KCaloJet &jet)
 std::ostream &operator<<(std::ostream &os, const KBasicJet &jet)
 {
 	os << static_cast<const KLV>(jet) << std::endl;
-	os << "\tCharged (em,had): " << jet.chargedEMFraction << ", " << jet.chargedHadFraction << std::endl;
-	os << "\tNeutral (em,had): " << jet.neutralEMFraction << ", " << jet.neutralHadFraction << std::endl;
-	return os << "\t#Const=" << jet.nConst << " #Charged=" << jet.nCharged << " area=" << jet.area;
+	os << "\tCHF=" << jet.chargedHadronFraction << " NHF=" << jet.neutralHadronFraction << std::endl;
+	os << "\teF=" << jet.electronFraction << " photF=" << jet.photonFraction << " muF=" << jet.muonFraction << std::endl;
+	os << "\tHFHadF=" << jet.hfHadronFraction << " HFEMF=" << jet.hfEMFraction << std::endl;
+	return os << "\tnConst=" << jet.nConstituents << " nCharged=" << jet.nCharged << " area=" << jet.area;
 }
 
 std::ostream &operator<<(std::ostream &os, const KJet &jet)

Producers/interface/KBasicJetProducer.h

@@ -25,17 +25,15 @@ class KBasicJetProducer : public KBaseMultiLVProducer<reco::PFJetCollection, std
 		copyP4(in, out.p4);
 
 		out.area = in.jetArea();
-		out.nConst = in.nConstituents();
+		out.nConstituents = in.nConstituents();
 		out.nCharged = in.chargedMultiplicity();
-		out.neutralEMFraction = in.neutralEmEnergyFraction();
-		out.chargedEMFraction = in.chargedEmEnergyFraction();
-		out.neutralHadFraction = in.neutralHadronEnergyFraction();
-		out.chargedHadFraction = in.chargedHadronEnergyFraction();
+		out.neutralHadronFraction = in.neutralHadronEnergyFraction();
+		out.chargedHadronFraction = in.chargedHadronEnergyFraction();
 		out.muonFraction = in.muonEnergyFraction();
 		out.photonFraction = in.photonEnergyFraction();
 		out.electronFraction = in.electronEnergyFraction();
-		out.HFHadFraction = in.HFHadronEnergyFraction();
-		out.HFEMFraction = in.HFEMEnergyFraction();
+		out.hfHadronFraction = in.HFHadronEnergyFraction();
+		out.hfEMFraction = in.HFEMEnergyFraction();
 	}
 };
 

Producers/interface/KJetProducer.h

@@ -152,17 +152,15 @@ class KJetProducer : public KBaseMultiLVProducer<reco::PFJetCollection, KJets>
 		copyP4(in, out.p4);
 
 		out.area = in.jetArea();
-		out.nConst = in.nConstituents();
+		out.nConstituents = in.nConstituents();
 		out.nCharged = in.chargedMultiplicity();
-		out.neutralEMFraction = in.neutralEmEnergyFraction();
-		out.chargedEMFraction = in.chargedEmEnergyFraction();
-		out.neutralHadFraction = in.neutralHadronEnergyFraction();
-		out.chargedHadFraction = in.chargedHadronEnergyFraction();
+		out.neutralHadronFraction = in.neutralHadronEnergyFraction();
+		out.chargedHadronFraction = in.chargedHadronEnergyFraction();
 		out.muonFraction = in.muonEnergyFraction();
 		out.photonFraction = in.photonEnergyFraction();
 		out.electronFraction = in.electronEnergyFraction();
-		out.HFHadFraction = in.HFHadronEnergyFraction();
-		out.HFEMFraction = in.HFEMEnergyFraction();
+		out.hfHadronFraction = in.HFHadronEnergyFraction();
+		out.hfEMFraction = in.HFEMEnergyFraction();
 	}
 
 private: