--- UserCode/kiesel/TreeWriter/treeWriter.h	2013/04/09 08:24:40	1.2
+++ UserCode/kiesel/TreeWriter/treeWriter.h	2013/04/17 09:57:52	1.6
@@ -5,13 +5,16 @@
 #include "TTree.h"
 #include "TChain.h"
 #include "TString.h"
+#include "TH1F.h"
 
 #include "SusyEvent.h"
 #include "TreeObjects.h"
 
 class TreeWriter {
 	public :
-		TreeWriter(TString inputName, TString outputName, int loggingVerbosity_ );
+		TreeWriter(TString inputName, TString outputName, int loggingVerbosity_);
+		TreeWriter(TChain* inputName, TString outputName, int loggingVerbosity_);
+		void Init( TString outputName, int loggingVerbosity_ );
 		virtual ~TreeWriter();
 		virtual void Loop();
 
@@ -19,12 +22,14 @@ class TreeWriter {
 		void SetReportEvents(int nEvents) { reportEvery = nEvents; }
 		void SetLoggingVerbosity(int logVerb) { loggingVerbosity = logVerb; }
 		void SkimEvents(bool skim_){ skim = skim_; }
+		void PileUpWeightFile( string pileupFileName );
 
 		TChain *inputTree;
 		susy::Event *event;
 
 		TFile *outFile;
 		TTree *tree;
+		TH1F *eventNumbers;
 
 		float getPtFromMatchedJet( susy::Photon, susy::Event );
 		float deltaR( TLorentzVector, TLorentzVector );
@@ -35,12 +40,21 @@ class TreeWriter {
 		int loggingVerbosity;
 		bool skim;
 
+		// important dataset information
+		TH1F* pileupHisto;
+
 		// variables which will be stored in the tree
 		std::vector<tree::Photon> photon;
 		std::vector<tree::Jet> jet;
+		std::vector<tree::Particle> electron;
+		std::vector<tree::Particle> muon;
+
 		float met;
+		float met_phi;
+		float type1met;
+		float type1met_phi;
 		float ht;
 		int nVertex;
-		int nElectron;
+		float pu_weight;
 };