--- UserCode/MitPhysics/Utils/interface/JetTools.h	2011/01/18 16:41:16	1.7
+++ UserCode/MitPhysics/Utils/interface/JetTools.h	2012/05/14 09:42:26	1.15
@@ -1,11 +1,3 @@
-//-------------------
-//
-// Jet Tools
-//
-// S Markson
-//
-//-------------------
-
 #ifndef MITPHYSICS_UTILS_JETTOOLS_H
 #define MITPHYSICS_UTILS_JETTOOLS_H
 
@@ -15,11 +7,7 @@
 #include "MitAna/DataTree/interface/ParticleCol.h"
 #include "MitAna/DataTree/interface/PFCandidateCol.h"
 #include "MitAna/DataTree/interface/JetCol.h"
-<<<<<<< JetTools.h
-#include "MitAna/DataTree/interface/Jet.h"
-#include "MitAna/DataTree/interface/PFJet.h"
-=======
->>>>>>> 1.6
+#include "MitAna/DataTree/interface/PFJetCol.h"
 #include "MitPhysics/Init/interface/ModNames.h"
 #include "MitAna/DataCont/interface/ObjArray.h"
 #include "MitAna/DataTree/interface/TrackCol.h"
@@ -31,24 +19,6 @@
 
 namespace mithep {
   class JetTools {
-<<<<<<< JetTools.h
-    public:
-      JetTools();
-      virtual ~JetTools();
-
-      static Double_t NJettiness(const ParticleOArr *particles, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
-      static Double_t NJettiness(const TrackOArr *tracks, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
-      static Double_t NJettiness(const JetOArr *jetsS, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
-      static Double_t NJettiness(const CaloTowerOArr *calos, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
-      static Double_t M_r(const ParticleOArr *particles);
-      static Double_t Beta_r(const ParticleOArr *particles);
-      static Double_t M_r_t(const ParticleOArr *particles, const Met *met);
-      static Double_t Razor(const ParticleOArr *particles, const Met *met);
-      static Double_t CosineOmega(const Particle *particles0, const Particle *particles1);
-      static Double_t MtHiggs(const ParticleOArr *leptons, const Met *met, double metFraction[2], int nsel);
-      static void     Alpha(Double_t AlphaVar[2], const TrackCol *tracks, Jet *jet, const VertexCol *vertices, Double_t  delta_z, Double_t delta_cone);
-      static void     Alpha(Double_t AlphaVar[2], const PFJet *jet, const VertexCol *vertices, Double_t  delta_z);
-=======
   public:
     JetTools();
     virtual ~JetTools();
@@ -65,11 +35,24 @@ namespace mithep {
     static Double_t Razor(const ParticleOArr *particles, const Met *met);
     static Double_t CosineOmega(const Particle *particles0, const Particle *particles1);
     static Double_t MtHiggs(const ParticleOArr *leptons, const Met *met, double metFraction[2], int nsel);
-    static void     Alpha(Double_t AlphaVar[2], const TrackCol *tracks, Jet *jet, const VertexCol *vertices, Double_t  delta_z, Double_t delta_cone);
-    
+    static Double_t Beta(const TrackCol *tracks, Jet *jet, const Vertex *vertex, Double_t  delta_z, Double_t delta_cone);
+    static Double_t Beta(const PFJet *jet, const Vertex *vertex, Double_t  delta_z);
+    static Bool_t   PassBetaVertexAssociationCut(const PFJet *jet, const Vertex *referenceVertex, const VertexCol *vertices, Double_t delta_z);
+    static Double_t Beta2(const PFJet *jet, const Vertex *vertex, Double_t  delta_z);
+    static Bool_t   PassBeta2VertexAssociationCut(const PFJet *jet, const Vertex *referenceVertex, const VertexCol *vertices, Double_t delta_z);
+    static Int_t    MaxBetaVertexIndex(const PFJet *jet, const VertexCol *vertices, Double_t  delta_z);
+    static Int_t    MaxBeta2VertexIndex(const PFJet *jet, const VertexCol *vertices, Double_t  delta_z);    
+    static Int_t    JetToPVAssociation(const PFJet *jet, const VertexCol *vertices, Double_t  delta_z);    
+
+    static Double_t           impactParameter(const PFJet *iJet,const Vertex *iVertex,bool iDZ=false);
+    static const PFCandidate* leadCand       (const PFJet *iJet,int iPFType,bool i2nd=false);
+    static Double_t           dRMean         (const PFJet *iJet,int iPFType);
+    static Double_t           dR2Mean        (const PFJet *iJet,int iPFType);
+    static Double_t           frac           (const PFJet *iJet,Double_t iDRMax,Double_t iDRMin,Int_t iPFType);
+    static Double_t           betaStar       (const PFJet *iJet,const Vertex *iVertex,const VertexCol* iVertices,Double_t iDZCut=0.2);
+    static Bool_t             passPFLooseId  (const PFJet *iJet);
     ClassDef(JetTools, 0)
   };
->>>>>>> 1.6
 
 }