ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/HbbAnalysis/interface/Objects.hh
(Generate patch)

Comparing UserCode/HbbAnalysis/interface/Objects.hh (file contents):
Revision 1.8 by amagnan, Thu Apr 29 09:33:48 2010 UTC vs.
Revision 1.11 by amagnan, Wed May 19 17:24:44 2010 UTC

# Line 14 | Line 14 | namespace HbbAnalysis {
14      double E;
15      double pT;
16      double eta;
17 +    double y;
18      double phi;
19      int pdgId;
20      int status;
21    };
22  
23 +  struct HLTVars {
24 +    float pT;
25 +    float eta;
26 +    float phi;
27 +    int id;
28 +    float mass;
29 +  };
30 +
31 +  struct L1Vars {
32 +    //type:
33 +    //0 = empty
34 +    //1 = central jet
35 +    //2 = tau jet
36 +    //3 = forward jet
37 +    unsigned int type;
38 +    int bx;
39 +    float pT;
40 +    float ET;
41 +    float eta;
42 +    float phi;
43 +  };
44 +
45    struct GenVars {
46      bool valid;
47      double E;
48      double pT;
49      double eta;
50 +    double y;
51      double phi;
52      int charge;
53      int pdgId;
# Line 38 | Line 62 | namespace HbbAnalysis {
62      double E;
63      double pT;
64      double eta;
65 +    double y;
66      double phi;
67      float charge;
68      double vx;
# Line 95 | Line 120 | namespace HbbAnalysis {
120      unsigned int nMatchesTight;
121    };
122  
123 <  struct TauLeadTrkVars{
123 >  struct TrkVars{
124      double pT;
125      double eta;
126      double phi;
# Line 187 | Line 212 | namespace HbbAnalysis {
212      float etaEtaMoment;
213      float phiPhiMoment;
214      float etaPhiMoment;
215 +    bool l1Match;
216 +    bool hltMatch;
217      //double rawEta;
218      //double rawPhi;
219    };
# Line 208 | Line 235 | namespace HbbAnalysis {
235      double n60;
236    };
237  
238 <  struct PFJetVars{
238 >  struct JPTJetVars{
239 >    float zspCorrection;
240 >    int elecMultiplicity;
241 >    std::vector<TrkVars> pionsInCone;
242 >    std::vector<TrkVars> pionsCurledOut;
243 >    std::vector<TrkVars> pionsCurledIn;
244 >    std::vector<TrkVars> elecsInCone;
245 >    std::vector<TrkVars> elecsCurledOut;
246 >    std::vector<TrkVars> elecsCurledIn;
247 >    std::vector<TrkVars> muonsInCone;
248 >    std::vector<TrkVars> muonsCurledOut;
249 >    std::vector<TrkVars> muonsCurledIn;
250 >  };
251 >
252 >  struct JPTPFJetVars{
253      double chargedHadronEnergy;
254      double chargedHadronEnergyFraction;
255      double neutralHadronEnergy;
256      double neutralHadronEnergyFraction;
257      double chargedEmEnergy;
258      double chargedEmEnergyFraction;
218 –    double chargedMuEnergy;
219 –    double chargedMuEnergyFraction;
259      double neutralEmEnergy;
260      double neutralEmEnergyFraction;
261      double chargedMultiplicity;
223 –    double neutralMultiplicity;
262      double muonMultiplicity;
263    };
264  
265 +  struct PFJetVars{
266 +    double chargedMuEnergy;
267 +    double chargedMuEnergyFraction;
268 +    double neutralMultiplicity;
269 +  };
270 +
271    struct JetBtagVars{
272      double cSV;
273      double cSVMVA;
# Line 245 | Line 289 | namespace HbbAnalysis {
289    struct JetIDVars{
290      double fHPD;
291      double fRBX;
292 <    double n90Hits;
292 >    int n90Hits;
293      //double fSubDetector1;
294      //double fSubDetector2;
295      //double fSubDetector3;
296      //double fSubDetector4;
297 <    //double restrictedEMF;
298 <    //int    nHCALTowers;
299 <    //int    nECALTowers;
297 >    double restrictedEMF;
298 >    int    nHCALTowers;
299 >    int    nECALTowers;
300      //double approximatefHPD;
301      //double approximatefRBX;
302 <    //int    hitsInN90;
302 >    int hitsInN90;
303      // muon hits id
304      //int numberOfHits2RPC;
305      //int numberOfHits3RPC;
# Line 324 | Line 368 | namespace HbbAnalysis {
368                                               double mEx,
369                                               double mEy);
370  
371 +  double EtaDetector(const BaseVars & v1);
372 +  double EtaDetector(const GenVars & v1);
373 +
374   }//namespace
375  
376   #endif

Diff Legend

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