ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/UserCode/HbbAnalysis/src/JetFlavour.cc
(Generate patch)

Comparing UserCode/HbbAnalysis/src/JetFlavour.cc (file contents):
Revision 1.5 by amagnan, Thu Sep 17 19:39:52 2009 UTC vs.
Revision 1.7 by amagnan, Fri Mar 26 18:11:19 2010 UTC

# Line 64 | Line 64 | namespace HbbAnalysis {
64  
65      if (debug_) std::cout << "* nMC = " << lNMC << std::endl;
66  
67 <    //loop on MC part to find b and bbar initial particles.
67 >    //loop on MC part to find any initial partons.
68      for (unsigned int imc(0); imc < lNMC; imc++){//loop on MC particles
69        const reco::GenParticle & lPart = (*aGenParticles).at(imc);
70        //break loop if W events
# Line 76 | Line 76 | namespace HbbAnalysis {
76               abs(lPart.pdgId()) == 16 ) ) {
77          isW = true;
78          nWEvts_++;
79 <        if (!isZ) break;
79 >        //if (!isZ) break;
80        }
81        //record when Z event
82        if ( lPart.status() == 3 && lPart.numberOfMothers() > 1 &&
# Line 90 | Line 90 | namespace HbbAnalysis {
90        //looking for the final-states partons, which will have 2 parents being the 2 initial states partons.
91        if (lPart.status() == 3 && lPart.numberOfMothers() > 1 &&
92            ( ( flavour_ == 45 && (abs(lPart.pdgId()) == 4 || abs(lPart.pdgId()) == 5) ) ||
93 <            ( flavour_ > 3 && flavour_ < 22 && abs(lPart.pdgId()) == flavour_) ||
94 <            ( flavour_ == 3 && ( (abs(lPart.pdgId()) <= flavour_ ||
93 >            ( flavour_ > 3 && flavour_ < 22 && static_cast<unsigned int>(abs(lPart.pdgId())) == flavour_) ||
94 >            ( flavour_ == 3 && ( (static_cast<unsigned int>(abs(lPart.pdgId())) <= flavour_ ||
95                                    lPart.pdgId() == 21)
96                                   )
97                )
# Line 114 | Line 114 | namespace HbbAnalysis {
114      }//loop on MC particles
115  
116      //if (isW == isZ) std::cout << "*** WARNING *** isW = " << isW << ", isZ = " << isZ << std::endl;
117 <    if ((flavour_ > 3 && flavour_ != 21) && !isZ) return 0;
117 >    //if ((flavour_ > 3 && flavour_ != 21) && !isZ) return 0;
118  
119      if (debug_) {
120        std::cout << "nQuarks = " << n_quarks << ", n_antiQuarks = " << n_antiquarks << std::endl;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines