Changeset fe0273c in git for modules/JetFlavorAssociation.cc

Timestamp:

Jun 26, 2015, 12:08:48 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

28027d5

Parents:

d38348d

Message:

merge BTagging and BTaggingCMS

File:

• modules/JetFlavorAssociation.cc (modified) (9 diffs)

modules/JetFlavorAssociation.cc

@@ -216 +216 @@
 {
   float maxPt = 0;
-  float minDr = 1000;
   bool isGoodParton = true;
   int daughterCounter = 0;
   Candidate *parton, *partonLHEF;
-  Candidate *tempParton = 0, *tempPartonNearest = 0, *tempPartonHighestPt = 0;
+  Candidate *tempParton = 0, *tempPartonHighestPt = 0;
   int pdgCode, pdgCodeMax = -1;
 
@@ -263 +262 @@
       if(jet->Momentum.DeltaR(parton->Momentum) <= fDeltaR)
       {
-        if(jet->Momentum.DeltaR(parton->Momentum) < minDr)
-        {
-          minDr = jet->Momentum.DeltaR(parton->Momentum);
-          tempPartonNearest = parton;
-        }
-
         // if not yet found && pdgId is a c, take as c
         if(TMath::Abs(parton->PID) == 4) tempParton = parton;
@@ -281 +274 @@
   }
 
-  jet->FlavorHeaviest = tempParton ? TMath::Abs(tempParton->PID) : 0;
-  jet->FlavorHighestPt = tempPartonHighestPt ? TMath::Abs(tempPartonHighestPt->PID) : 0;
-  jet->FlavorNearest2 = tempPartonNearest ? TMath::Abs(tempPartonNearest->PID) : 0;
   if(!tempParton) tempParton = tempPartonHighestPt;
   jet->FlavorAlgo = tempParton ? TMath::Abs(tempParton->PID) : 0;
@@ -290 +280 @@
   if(pdgCodeMax == -1) pdgCodeMax = 0;
 
-  jet->FlavorDefault = pdgCodeMax;
+  jet->Flavor = pdgCodeMax;
 }
 
@@ -297 +287 @@
 void JetFlavorAssociation::GetPhysicsFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
 {
-  float minDr = 1000;
   int partonCounter = 0;
   float biggerConeSize = 0.7;
@@ -305 +294 @@
   int motherCounter = 0;
   Candidate *parton, *partonLHEF, *mother1, *mother2;
-  Candidate *tempParton = 0, *tempPartonNearest = 0;
+  Candidate *tempParton = 0;
   vector<Candidate *> contaminations;
   vector<Candidate *>::iterator itContaminations;
@@ -315 +304 @@
   {
     dist = jet->Momentum.DeltaR(partonLHEF->Momentum); // take the DR
-    if(partonLHEF->Status == 1 && dist < minDr)
-    {
-      tempPartonNearest = partonLHEF;
-      minDr = dist;
-    }
 
     if(partonLHEF->Status == 1 && dist <= fDeltaR)
@@ -354 +338 @@
   }
 
-  jet->FlavorNearest3 = tempPartonNearest ? TMath::Abs(tempPartonNearest->PID) : 0;
-
   if(partonCounter != 1)
   {
-    jet->FlavorPhysics = 0;
+    jet->FlavorPhys = 0;
   }
   else if(contaminations.size() == 0)
   {
-    jet->FlavorPhysics = TMath::Abs(tempParton->PID);
+    jet->FlavorPhys = TMath::Abs(tempParton->PID);
   }
   else if(contaminations.size() > 0)
   {
-    jet->FlavorPhysics = TMath::Abs(tempParton->PID);
+    jet->FlavorPhys = TMath::Abs(tempParton->PID);
 
     for(itContaminations = contaminations.begin(); itContaminations != contaminations.end(); ++itContaminations)
@@ -391 +373 @@
         // keep association --> the initialParton is a c --> the contaminated parton is a c
         if(contaminatingFlavor == 4) continue;
-        jet->FlavorPhysics = 0; // all the other cases reject!
+        jet->FlavorPhys = 0; // all the other cases reject!
         break;
       }