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.10 by amagnan, Sat May 15 09:21:19 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;
# Line 24 | Line 25 | namespace HbbAnalysis {
25      double E;
26      double pT;
27      double eta;
28 +    double y;
29      double phi;
30      int charge;
31      int pdgId;
# Line 38 | Line 40 | namespace HbbAnalysis {
40      double E;
41      double pT;
42      double eta;
43 +    double y;
44      double phi;
45      float charge;
46      double vx;
# Line 95 | Line 98 | namespace HbbAnalysis {
98      unsigned int nMatchesTight;
99    };
100  
101 <  struct TauLeadTrkVars{
101 >  struct TrkVars{
102      double pT;
103      double eta;
104      double phi;
# Line 187 | Line 190 | namespace HbbAnalysis {
190      float etaEtaMoment;
191      float phiPhiMoment;
192      float etaPhiMoment;
193 +    bool l1Match;
194 +    bool hltMatch;
195      //double rawEta;
196      //double rawPhi;
197    };
# Line 208 | Line 213 | namespace HbbAnalysis {
213      double n60;
214    };
215  
216 <  struct PFJetVars{
216 >  struct JPTJetVars{
217 >    float zspCorrection;
218 >    int elecMultiplicity;
219 >    std::vector<TrkVars> pionsInCone;
220 >    std::vector<TrkVars> pionsCurledOut;
221 >    std::vector<TrkVars> pionsCurledIn;
222 >    std::vector<TrkVars> elecsInCone;
223 >    std::vector<TrkVars> elecsCurledOut;
224 >    std::vector<TrkVars> elecsCurledIn;
225 >    std::vector<TrkVars> muonsInCone;
226 >    std::vector<TrkVars> muonsCurledOut;
227 >    std::vector<TrkVars> muonsCurledIn;
228 >  };
229 >
230 >  struct JPTPFJetVars{
231      double chargedHadronEnergy;
232      double chargedHadronEnergyFraction;
233      double neutralHadronEnergy;
234      double neutralHadronEnergyFraction;
235      double chargedEmEnergy;
236      double chargedEmEnergyFraction;
218 –    double chargedMuEnergy;
219 –    double chargedMuEnergyFraction;
237      double neutralEmEnergy;
238      double neutralEmEnergyFraction;
239      double chargedMultiplicity;
223 –    double neutralMultiplicity;
240      double muonMultiplicity;
241    };
242  
243 +  struct PFJetVars{
244 +    double chargedMuEnergy;
245 +    double chargedMuEnergyFraction;
246 +    double neutralMultiplicity;
247 +  };
248 +
249    struct JetBtagVars{
250      double cSV;
251      double cSVMVA;
# Line 245 | Line 267 | namespace HbbAnalysis {
267    struct JetIDVars{
268      double fHPD;
269      double fRBX;
270 <    double n90Hits;
270 >    int n90Hits;
271      //double fSubDetector1;
272      //double fSubDetector2;
273      //double fSubDetector3;
274      //double fSubDetector4;
275 <    //double restrictedEMF;
276 <    //int    nHCALTowers;
277 <    //int    nECALTowers;
275 >    double restrictedEMF;
276 >    int    nHCALTowers;
277 >    int    nECALTowers;
278      //double approximatefHPD;
279      //double approximatefRBX;
280 <    //int    hitsInN90;
280 >    int hitsInN90;
281      // muon hits id
282      //int numberOfHits2RPC;
283      //int numberOfHits3RPC;
# Line 324 | Line 346 | namespace HbbAnalysis {
346                                               double mEx,
347                                               double mEy);
348  
349 +  double EtaDetector(const BaseVars & v1);
350 +  double EtaDetector(const GenVars & v1);
351 +
352   }//namespace
353  
354   #endif

Diff Legend

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