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.7 by ceballos, Tue Jan 18 16:41:16 2011 UTC vs.
Revision 1.10 by ceballos, Thu Feb 17 14:09:07 2011 UTC

# Line 1 | Line 1
1 – //-------------------
2 – //
3 – // Jet Tools
4 – //
5 – // S Markson
6 – //
7 – //-------------------
8 –
1   #ifndef MITPHYSICS_UTILS_JETTOOLS_H
2   #define MITPHYSICS_UTILS_JETTOOLS_H
3  
# Line 15 | Line 7
7   #include "MitAna/DataTree/interface/ParticleCol.h"
8   #include "MitAna/DataTree/interface/PFCandidateCol.h"
9   #include "MitAna/DataTree/interface/JetCol.h"
10 < <<<<<<< JetTools.h
19 < #include "MitAna/DataTree/interface/Jet.h"
20 < #include "MitAna/DataTree/interface/PFJet.h"
21 < =======
22 < >>>>>>> 1.6
10 > #include "MitAna/DataTree/interface/PFJetCol.h"
11   #include "MitPhysics/Init/interface/ModNames.h"
12   #include "MitAna/DataCont/interface/ObjArray.h"
13   #include "MitAna/DataTree/interface/TrackCol.h"
# Line 31 | Line 19
19  
20   namespace mithep {
21    class JetTools {
34 – <<<<<<< JetTools.h
35 –    public:
36 –      JetTools();
37 –      virtual ~JetTools();
38 –
39 –      static Double_t NJettiness(const ParticleOArr *particles, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
40 –      static Double_t NJettiness(const TrackOArr *tracks, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
41 –      static Double_t NJettiness(const JetOArr *jetsS, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
42 –      static Double_t NJettiness(const CaloTowerOArr *calos, const JetOArr *jets, bool UseQ = kFALSE, double Y = 0.0);
43 –      static Double_t M_r(const ParticleOArr *particles);
44 –      static Double_t Beta_r(const ParticleOArr *particles);
45 –      static Double_t M_r_t(const ParticleOArr *particles, const Met *met);
46 –      static Double_t Razor(const ParticleOArr *particles, const Met *met);
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 –      static void     Alpha(Double_t AlphaVar[2], const PFJet *jet, const VertexCol *vertices, Double_t  delta_z);
51 – =======
22    public:
23      JetTools();
24      virtual ~JetTools();
# Line 65 | Line 35 | namespace mithep {
35      static Double_t Razor(const ParticleOArr *particles, const Met *met);
36      static Double_t CosineOmega(const Particle *particles0, const Particle *particles1);
37      static Double_t MtHiggs(const ParticleOArr *leptons, const Met *met, double metFraction[2], int nsel);
38 <    static void     Alpha(Double_t AlphaVar[2], const TrackCol *tracks, Jet *jet, const VertexCol *vertices, Double_t  delta_z, Double_t delta_cone);
38 >    static Double_t Beta(const TrackCol *tracks, Jet *jet, const Vertex *vertex, Double_t  delta_z, Double_t delta_cone);
39 >    static Double_t Beta(const PFJet *jet, const Vertex *vertex, Double_t  delta_z);
40      
41      ClassDef(JetTools, 0)
42    };
72 – >>>>>>> 1.6
43  
44   }
45  

Diff Legend

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