ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/MitPhysics/Utils/interface/JetTools.h
(Generate patch)

Comparing UserCode/MitPhysics/Utils/interface/JetTools.h (file contents):
Revision 1.5 by ceballos, Mon Jan 17 17:32:52 2011 UTC vs.
Revision 1.7 by ceballos, Tue Jan 18 16:41:16 2011 UTC

# Line 13 | Line 13
13   #include "MitAna/DataUtil/interface/Debug.h"
14   #include "MitAna/DataTree/interface/Names.h"
15   #include "MitAna/DataTree/interface/ParticleCol.h"
16 + #include "MitAna/DataTree/interface/PFCandidateCol.h"
17   #include "MitAna/DataTree/interface/JetCol.h"
18 + <<<<<<< JetTools.h
19   #include "MitAna/DataTree/interface/Jet.h"
20 + #include "MitAna/DataTree/interface/PFJet.h"
21 + =======
22 + >>>>>>> 1.6
23   #include "MitPhysics/Init/interface/ModNames.h"
24   #include "MitAna/DataCont/interface/ObjArray.h"
25   #include "MitAna/DataTree/interface/TrackCol.h"
# Line 26 | Line 31
31  
32   namespace mithep {
33    class JetTools {
34 + <<<<<<< JetTools.h
35      public:
36        JetTools();
37        virtual ~JetTools();
# Line 41 | Line 47 | namespace mithep {
47        static Double_t CosineOmega(const Particle *particles0, const Particle *particles1);
48        static Double_t MtHiggs(const ParticleOArr *leptons, const Met *met, double metFraction[2], int nsel);
49        static void     Alpha(Double_t AlphaVar[2], const TrackCol *tracks, Jet *jet, const VertexCol *vertices, Double_t  delta_z, Double_t delta_cone);
50 <
51 <      ClassDef(JetTools, 0)
50 >      static void     Alpha(Double_t AlphaVar[2], const PFJet *jet, const VertexCol *vertices, Double_t  delta_z);
51 > =======
52 >  public:
53 >    JetTools();
54 >    virtual ~JetTools();
55 >    
56 >    static Double_t NJettiness(const ParticleOArr *particles, const JetOArr *jets, double Q = 1, double Y = 0.0);
57 >    static Double_t NJettiness(const PFCandidateOArr *particles, const JetOArr *jets, double Q = 1, double Y = 0.0);
58 >    static Double_t NJettiness(const TrackOArr *tracks, const JetOArr *jets, double Q = 1, double Y = 0.0);
59 >    static Double_t NJettiness(const JetOArr *jetsS, const JetOArr *jets, double Q = 1, double Y = 0.0);
60 >    static Double_t NJettiness(const CaloTowerOArr *calos, const JetOArr *jets, double Q = 1, double Y = 0.0);
61 >    
62 >    static Double_t M_r(const ParticleOArr *particles);
63 >    static Double_t Beta_r(const ParticleOArr *particles);
64 >    static Double_t M_r_t(const ParticleOArr *particles, const Met *met);
65 >    static Double_t Razor(const ParticleOArr *particles, const Met *met);
66 >    static Double_t CosineOmega(const Particle *particles0, const Particle *particles1);
67 >    static Double_t MtHiggs(const ParticleOArr *leptons, const Met *met, double metFraction[2], int nsel);
68 >    static void     Alpha(Double_t AlphaVar[2], const TrackCol *tracks, Jet *jet, const VertexCol *vertices, Double_t  delta_z, Double_t delta_cone);
69 >    
70 >    ClassDef(JetTools, 0)
71    };
72 + >>>>>>> 1.6
73 +
74   }
75  
76   #endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines