--- UserCode/DTDPGAnalysis/interface/DefineTreeVariables.h	2010/05/12 10:03:10	1.2
+++ UserCode/DTDPGAnalysis/interface/DefineTreeVariables.h	2011/03/23 16:24:40	1.14
@@ -1,6 +1,8 @@
 //This is the list and types of the variables saved in the TTree;
 //New variables must be declared here
 
+#include "TString.h"
+
 //event variables
 int runnumber;
 int lumiblock;
@@ -23,8 +25,11 @@ float PV_yzE;
 
 float PV_normchi2;
 
-//HLT
-int triggerWord;
+//luminosity
+float lumiperblock;
+
+// HLT
+std::vector<TString> hlt_path;
 
 //digi variables
 std::vector<short> digi_wheel;
@@ -43,19 +48,22 @@ std::vector<short> segm4D_station;
 std::vector<short> segm4D_hasPhi;
 std::vector<short> segm4D_hasZed;
 
-std::vector<float> segm4D_x_loc;
-std::vector<float> segm4D_y_loc;
-std::vector<float> segm4D_phi_loc;
-std::vector<float> segm4D_theta_loc;
-std::vector<float> segm4D_eta_loc;
-
-std::vector<float> segm4D_x;
-std::vector<float> segm4D_y;
+std::vector<float> segm4D_x_pos_loc;
+std::vector<float> segm4D_y_pos_loc;
+std::vector<float> segm4D_z_pos_loc;
+std::vector<float> segm4D_x_dir_loc;
+std::vector<float> segm4D_y_dir_loc;
+std::vector<float> segm4D_z_dir_loc;
+
+std::vector<float> segm4D_cosx;
+std::vector<float> segm4D_cosy;
+std::vector<float> segm4D_cosz;
 std::vector<float> segm4D_phi;
 std::vector<float> segm4D_theta;
 std::vector<float> segm4D_eta;
 
 std::vector<float> segm4D_t0;
+std::vector<float> segm4D_vdrift;
 std::vector<float> segm4D_phinormchi2;
 std::vector<short> segm4D_phinhits;
 
@@ -63,19 +71,26 @@ std::vector<float> segm4D_znormchi2;
 std::vector<short> segm4D_znhits;
 
 TClonesArray *segm4D_phiHits_Pos;
+TClonesArray *segm4D_phiHits_PosCh;
 TClonesArray *segm4D_phiHits_PosErr;
 TClonesArray *segm4D_phiHits_Side;
+TClonesArray *segm4D_phiHits_Wire;
+TClonesArray *segm4D_phiHits_Layer;
 
 TClonesArray *segm4D_zHits_Pos;
+TClonesArray *segm4D_zHits_PosCh;
 TClonesArray *segm4D_zHits_PosErr;
 TClonesArray *segm4D_zHits_Side;
+TClonesArray *segm4D_zHits_Wire;
+TClonesArray *segm4D_zHits_Layer;
 
 //CSC segment variables
 std::vector<short> cscsegm_ring;
 std::vector<short> cscsegm_chamber;
 std::vector<short> cscsegm_station;
-std::vector<float> cscsegm_x;
-std::vector<float> cscsegm_y;
+std::vector<float> cscsegm_cosx;
+std::vector<float> cscsegm_cosy;
+std::vector<float> cscsegm_cosz;
 std::vector<float> cscsegm_phi;
 std::vector<float> cscsegm_eta;
 std::vector<float> cscsegm_normchi2;
@@ -91,6 +106,15 @@ std::vector<float> ltDCC_phi;
 std::vector<float> ltDCC_phiB;
 std::vector<short> ltDCC_is2nd;
 
+std::vector<short> ltDCC_thBx;
+std::vector<short> ltDCC_thWheel;
+std::vector<short> ltDCC_thSector;
+std::vector<short> ltDCC_thStation;
+// std::vector<float> ltDCC_thX; 
+// std::vector<float> ltDCC_thY; 
+// TMatrixD ltDCC_thTheta;
+// TMatrixD ltDCC_thCode;
+
 //DDU variables
 std::vector<short> ltDDU_wheel;
 std::vector<short> ltDDU_sector;
@@ -102,10 +126,11 @@ std::vector<short> ltDDU_is2nd;
 
 //muon variables
 std::vector<short> STAMu_isMuGlobal;
+std::vector<short> STAMu_isMuTracker;
 std::vector<int>   STAMu_numberOfChambers;
 std::vector<int>   STAMu_numberOfMatches;
 std::vector<int>   STAMu_numberOfHits;
-std::vector<short> STAMu_segmIndex;
+std::vector<int>   STAMu_segmIndex;
 
 std::vector<float> Mu_px_mu;
 std::vector<float> Mu_py_mu;
@@ -122,6 +147,9 @@ std::vector<float> GLBMu_normchi2Mu;
 std::vector<float> GLBMu_dxyMu;
 std::vector<float> GLBMu_dzMu;
 
+std::vector<int> GLBMu_numberOfPixelHits;
+std::vector<int> GLBMu_numberOfTrackerHits;
+
 std::vector<float> GLBMu_tkIsoR03;
 std::vector<float> GLBMu_ntkIsoR03;
 std::vector<float> GLBMu_emIsoR03;
@@ -149,3 +177,9 @@ std::vector<float> gmt_cands_eta;
 std::vector<float> gmt_cands_pt;
 std::vector<short> gmt_cands_qual;
 std::vector<short> gmt_cands_ismatched;
+
+//GT
+std::vector<short> gt_algo_bx;
+std::vector<short> gt_algo_bit;
+std::vector<short> gt_tt_bx;
+std::vector<short> gt_tt_bit;