Changeset 28027d5 in git for modules/BTagging.cc

Timestamp:

Jun 26, 2015, 3:13:55 PM (9 years ago)

Author:

Pavel Demin <pavel-demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

f3c4047

Parents:

f53a4d2 (diff), fe0273c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge pull request #15 from delphes/mergeCMS

merge with the CMS code

File:

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

modules/BTagging.cc

@@ -22 +22 @@
  *  Determines origin of jet,
  *  applies b-tagging efficiency (miss identification rate) formulas
- *  and sets b-tagging flags 
+ *  and sets b-tagging flags
  *
  *  \author P. Demin - UCL, Louvain-la-Neuve
@@ -46 +46 @@
 #include "TLorentzVector.h"
 
-#include <algorithm> 
+#include <algorithm>
 #include <stdexcept>
 #include <iostream>
@@ -62 +62 @@
 
   Int_t GetCategory(TObject *object);
-  
+
   Double_t fEtaMax, fPTMin;
 };
@@ -75 +75 @@
 
   if(momentum.Pt() <= fPTMin || TMath::Abs(momentum.Eta()) > fEtaMax) return -1;
-  
+
   pdgCode = TMath::Abs(parton->PID);
   if(pdgCode != 21 && pdgCode > 5) return -1;
@@ -117 +117 @@
   param = GetParam("EfficiencyFormula");
   size = param.GetSize();
-  
+
   fEfficiencyMap.clear();
   for(i = 0; i < size/2; ++i)
@@ -143 +143 @@
 
   fFilter = new ExRootFilter(fPartonInputArray);
-  
+
   fJetInputArray = ImportArray(GetString("JetInputArray", "FastJetFinder/jets"));
   fItJetInputArray = fJetInputArray->MakeIterator();
@@ -170 +170 @@
 void BTagging::Process()
 {
-  Candidate *jet, *parton;
+  Candidate *jet;
   Double_t pt, eta, phi, e;
   TObjArray *partonArray;
   map< Int_t, DelphesFormula * >::iterator itEfficiencyMap;
   DelphesFormula *formula;
-  Int_t pdgCode, pdgCodeMax;
 
   // select quark and gluons
   fFilter->Reset();
   partonArray = fFilter->GetSubArray(fClassifier, 0);
-  
+
   if(partonArray == 0) return;
 
   TIter itPartonArray(partonArray);
-  
+
   // loop over all input jets
   fItJetInputArray->Reset();
@@ -190 +189 @@
   {
     const TLorentzVector &jetMomentum = jet->Momentum;
-    pdgCodeMax = -1;
     eta = jetMomentum.Eta();
     phi = jetMomentum.Phi();
     pt = jetMomentum.Pt();
     e = jetMomentum.E();
-    
-    // loop over all input partons
-    itPartonArray.Reset();
-    while((parton = static_cast<Candidate*>(itPartonArray.Next())))
-    {
-      pdgCode = TMath::Abs(parton->PID);
-      if(pdgCode == 21) pdgCode = 0;
-      if(jetMomentum.DeltaR(parton->Momentum) <= fDeltaR)
-      {
-        if(pdgCodeMax < pdgCode) pdgCodeMax = pdgCode;
-      }
-    }
-    if(pdgCodeMax == 0) pdgCodeMax = 21;
-    if(pdgCodeMax == -1) pdgCodeMax = 0;
 
     // find an efficency formula
-    itEfficiencyMap = fEfficiencyMap.find(pdgCodeMax);
+    itEfficiencyMap = fEfficiencyMap.find(jet->Flavor);
     if(itEfficiencyMap == fEfficiencyMap.end())
     {
@@ -220 +204 @@
     // apply an efficency formula
     jet->BTag |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
-  }
-}
-
-//------------------------------------------------------------------------------
+
+    // find an efficency formula for algo flavor definition
+    itEfficiencyMap = fEfficiencyMap.find(jet->FlavorAlgo);
+    if(itEfficiencyMap == fEfficiencyMap.end())
+    {
+      itEfficiencyMap = fEfficiencyMap.find(0);
+    }
+    formula = itEfficiencyMap->second;
+
+    // apply an efficency formula
+    jet->BTagAlgo |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
+
+    // find an efficency formula for phys flavor definition
+    itEfficiencyMap = fEfficiencyMap.find(jet->FlavorPhys);
+    if(itEfficiencyMap == fEfficiencyMap.end())
+    {
+      itEfficiencyMap = fEfficiencyMap.find(0);
+    }
+    formula = itEfficiencyMap->second;
+
+    // apply an efficency formula
+    jet->BTagPhys |= (gRandom->Uniform() <= formula->Eval(pt, eta, phi, e)) << fBitNumber;
+  }
+}
+
+//------------------------------------------------------------------------------