--- UserCode/kiesel/TreeWriter/TreeObjects.h	2013/04/13 09:53:45	1.3
+++ UserCode/kiesel/TreeWriter/TreeObjects.h	2013/05/02 08:33:04	1.8
@@ -11,18 +11,31 @@ class Particle {
 
 class Photon : public Particle {
 	public:
-		float r9, sigmaIetaIeta, hadTowOverEm, pixelseed;
+		bool isGenPhoton() { return genInformationBit == 1; }
+		bool isGenElectron() { return genInformationBit == 2; }
+		bool isGenJet() { return genInformationBit == 3; }
+
+		void matchGenPhoton() { genInformationBit = 1; }
+		void matchGenElectron() { genInformationBit = 2; }
+		void matchGenJet() { genInformationBit = 3; }
+
+		float ptJet;
+		float r9, sigmaIetaIeta, hadTowOverEm;
 		float chargedIso, neutralIso, photonIso;
+		bool conversionSafeVeto;
+		int pixelseed;
+	private:
+		int genInformationBit;
 };
 
 class Jet : public Particle{
 	public:
 		float bCSV;
+		float chargedHadronEnergy,neutralHadronEnergy,photonEnergy,electronEnergy,muonEnergy,HFHadronEnergy,HFEMEnergy,chargedEmEnergy,chargedMuEnergy,neutralEmEnergy;
 };
 
 bool EtGreater(const tree::Particle, const tree::Particle);
 
-
 } // end namespace definition
 
 #endif