Changeset fe0273c in git

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

Files:

• Makefile (modified) (7 diffs)
• classes/DelphesClasses.cc (modified) (3 diffs)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/BTagging.cc (modified) (9 diffs)
• modules/BTaggingCMS.cc (deleted)
• modules/BTaggingCMS.h (deleted)
• modules/JetFlavorAssociation.cc (modified) (9 diffs)
• modules/ModulesLinkDef.h (modified) (2 diffs)
• modules/TreeWriter.cc (modified) (2 diffs)

Makefile

@@ -322 +322 @@
         modules/UniqueObjectFinder.h \
         modules/TrackCountingBTagging.h \
-        modules/BTaggingCMS.h \
         modules/BTagging.h \
         modules/TauTagging.h \
@@ -546 +545 @@
         external/ExRootAnalysis/ExRootFilter.h \
         external/ExRootAnalysis/ExRootClassifier.h
-tmp/modules/BTaggingCMS.$(ObjSuf): \
-        modules/BTaggingCMS.$(SrcSuf) \
-        modules/BTaggingCMS.h \
-        classes/DelphesClasses.h \
-        classes/DelphesFactory.h \
-        classes/DelphesFormula.h \
-        external/ExRootAnalysis/ExRootResult.h \
-        external/ExRootAnalysis/ExRootFilter.h \
-        external/ExRootAnalysis/ExRootClassifier.h
 tmp/modules/Calorimeter.$(ObjSuf): \
         modules/Calorimeter.$(SrcSuf) \
@@ -907 +897 @@
         tmp/modules/AngularSmearing.$(ObjSuf) \
         tmp/modules/BTagging.$(ObjSuf) \
-        tmp/modules/BTaggingCMS.$(ObjSuf) \
         tmp/modules/Calorimeter.$(ObjSuf) \
         tmp/modules/Cloner.$(ObjSuf) \
@@ -1396 +1385 @@
         display/Delphes3DGeometry.$(SrcSuf) \
         display/Delphes3DGeometry.h \
-        external/ExRootAnalysis/ExRootConfReader.h \
-        classes/DelphesClasses.h
+        classes/DelphesClasses.h \
+        external/ExRootAnalysis/ExRootConfReader.h
 tmp/display/DelphesBranchElement.$(ObjSuf): \
         display/DelphesBranchElement.$(SrcSuf) \
@@ -1410 +1399 @@
 tmp/display/DelphesEventDisplay.$(ObjSuf): \
         display/DelphesEventDisplay.$(SrcSuf) \
-        external/ExRootAnalysis/ExRootConfReader.h \
-        external/ExRootAnalysis/ExRootTreeReader.h \
         display/DelphesCaloData.h \
         display/DelphesBranchElement.h \
         display/Delphes3DGeometry.h \
         display/DelphesEventDisplay.h \
-        classes/DelphesClasses.h
+        display/DelphesDisplay.h \
+        display/Delphes3DGeometry.h \
+        display/DelphesHtmlSummary.h \
+        display/DelphesPlotSummary.h \
+        classes/DelphesClasses.h \
+        external/ExRootAnalysis/ExRootConfReader.h \
+        external/ExRootAnalysis/ExRootTreeReader.h
 tmp/display/DelphesHtmlSummary.$(ObjSuf): \
         display/DelphesHtmlSummary.$(SrcSuf) \
@@ -1737 +1730 @@
         @touch $@
 
-display/DelphesEventDisplay.h: \
-        external/ExRootAnalysis/ExRootTreeReader.h \
-        display/DelphesDisplay.h \
-        display/Delphes3DGeometry.h \
-        display/DelphesHtmlSummary.h \
-        display/DelphesPlotSummary.h
-        @touch $@
-
 modules/TauTagging.h: \
         classes/DelphesModule.h \
@@ -1771 +1756 @@
 modules/UniqueObjectFinder.h: \
         classes/DelphesModule.h
-        @touch $@
-
-modules/BTaggingCMS.h: \
-        classes/DelphesModule.h \
-        classes/DelphesClasses.h
         @touch $@
 

classes/DelphesClasses.cc

@@ -121 +121 @@
   Charge(0), Mass(0.0),
   IsPU(0), IsRecoPU(0), IsConstituent(0),
-  BTag(0), BTagAlgo(0), BTagDefault(0), BTagPhysics(0), BTagNearest2(0), BTagNearest3(0), BTagHeaviest(0), BTagHighestPt(0),
-  FlavorAlgo(0), FlavorDefault(0), FlavorPhysics(0), FlavorNearest2(0), FlavorNearest3(0), FlavorHeaviest(0), FlavorHighestPt(0),
+  Flavor(0), FlavorAlgo(0), FlavorPhys(0),
+  BTag(0), BTagAlgo(0), BTagPhys(0),
   TauTag(0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
@@ -243 +243 @@
   object.IsPU = IsPU;
   object.IsConstituent = IsConstituent;
+  object.Flavor = Flavor;
+  object.FlavorAlgo = FlavorAlgo;
+  object.FlavorPhys = FlavorPhys;
   object.BTag = BTag;
   object.BTagAlgo = BTagAlgo;
-  object.BTagDefault = BTagDefault;
-  object.BTagPhysics = BTagPhysics;
-  object.BTagNearest2 = BTagNearest2;
-  object.BTagNearest3 = BTagNearest3;
-  object.BTagHeaviest = BTagHeaviest;
-  object.BTagHighestPt = BTagHighestPt;
-  object.FlavorAlgo = FlavorAlgo;
-  object.FlavorDefault = FlavorDefault;
-  object.FlavorPhysics = FlavorPhysics;
-  object.FlavorNearest2 = FlavorNearest2;
-  object.FlavorNearest3 = FlavorNearest3;
-  object.FlavorHeaviest = FlavorHeaviest;
-  object.FlavorHighestPt = FlavorHighestPt;
+  object.BTagPhys = BTagPhys;
   object.TauTag = TauTag;
   object.Eem = Eem;
@@ -352 +343 @@
   IsPU = 0;
   IsConstituent = 0;
+  Flavor = 0;
+  FlavorAlgo = 0;
+  FlavorPhys = 0;
   BTag = 0;
   BTagAlgo = 0;
-  BTagDefault = 0;
-  BTagPhysics = 0;
-  BTagNearest2 = 0;
-  BTagNearest3 = 0;
-  BTagHeaviest = 0;
-  BTagHighestPt = 0;
-  FlavorAlgo = 0;
-  FlavorDefault = 0;
-  FlavorPhysics = 0;
-  FlavorNearest2 = 0;
-  FlavorNearest3 = 0;
-  FlavorHeaviest = 0;
-  FlavorHighestPt = 0;
+  BTagPhys = 0;
   TauTag = 0;
   Eem = 0.0;

classes/DelphesClasses.h

@@ -344 +344 @@
   Float_t DeltaPhi;  // jet radius in azimuthal angle
 
+  UInt_t Flavor;
+  UInt_t FlavorAlgo;
+  UInt_t FlavorPhys;
+
   UInt_t BTag; // 0 or 1 for a jet that has been tagged as containing a heavy quark
-
   UInt_t BTagAlgo;
-  UInt_t BTagDefault;
-  UInt_t BTagPhysics;
-  UInt_t BTagNearest2;
-  UInt_t BTagNearest3;
-  UInt_t BTagHeaviest;
-  UInt_t BTagHighestPt;
-
-  UInt_t FlavorAlgo;
-  UInt_t FlavorDefault;
-  UInt_t FlavorPhysics;
-  UInt_t FlavorNearest2;
-  UInt_t FlavorNearest3;
-  UInt_t FlavorHeaviest;
-  UInt_t FlavorHighestPt;
+  UInt_t BTagPhys;
 
   UInt_t TauTag; // 0 or 1 for a jet that has been tagged as a tau
@@ -517 +507 @@
   Int_t IsConstituent;
 
+  UInt_t Flavor;
+  UInt_t FlavorAlgo;
+  UInt_t FlavorPhys;
+
   UInt_t BTag;
-
   UInt_t BTagAlgo;
-  UInt_t BTagDefault;
-  UInt_t BTagPhysics;
-  UInt_t BTagNearest2;
-  UInt_t BTagNearest3;
-  UInt_t BTagHeaviest;
-  UInt_t BTagHighestPt;
-
-  UInt_t FlavorAlgo;
-  UInt_t FlavorDefault;
-  UInt_t FlavorPhysics;
-  UInt_t FlavorNearest2;
-  UInt_t FlavorNearest3;
-  UInt_t FlavorHeaviest;
-  UInt_t FlavorHighestPt;
+  UInt_t BTagPhys;
 
   UInt_t TauTag;

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;
+  }
+}
+
+//------------------------------------------------------------------------------

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;
       }

modules/ModulesLinkDef.h

@@ -42 +42 @@
 #include "modules/UniqueObjectFinder.h"
 #include "modules/TrackCountingBTagging.h"
-#include "modules/BTaggingCMS.h"
 #include "modules/BTagging.h"
 #include "modules/TauTagging.h"
@@ -85 +84 @@
 #pragma link C++ class UniqueObjectFinder+;
 #pragma link C++ class TrackCountingBTagging+;
-#pragma link C++ class BTaggingCMS+;
 #pragma link C++ class BTagging+;
 #pragma link C++ class TauTagging+;

modules/TreeWriter.cc

@@ -490 +490 @@
     const TLorentzVector &position = candidate->Position;
 
-
     pt = momentum.Pt();
     cosTheta = TMath::Abs(momentum.CosTheta());
@@ -567 +566 @@
     entry->DeltaPhi = candidate->DeltaPhi;
 
+    entry->Flavor = candidate->Flavor;
+    entry->FlavorAlgo = candidate->FlavorAlgo;
+    entry->FlavorPhys = candidate->FlavorPhys;
+
     entry->BTag = candidate->BTag;
 
     entry->BTagAlgo = candidate->BTagAlgo;
-    entry->BTagDefault = candidate->BTagDefault;
-    entry->BTagPhysics = candidate->BTagPhysics;
-    entry->BTagNearest2 = candidate->BTagNearest2;
-    entry->BTagNearest3 = candidate->BTagNearest3;
-    entry->BTagHeaviest = candidate->BTagHeaviest;
-    entry->BTagHighestPt = candidate->BTagHighestPt;
-
-    entry->FlavorAlgo = candidate->FlavorAlgo;
-    entry->FlavorDefault = candidate->FlavorDefault;
-    entry->FlavorPhysics = candidate->FlavorPhysics;
-    entry->FlavorNearest2 = candidate->FlavorNearest2;
-    entry->FlavorNearest3 = candidate->FlavorNearest3;
-    entry->FlavorHeaviest = candidate->FlavorHeaviest;
-    entry->FlavorHighestPt = candidate->FlavorHighestPt;
+    entry->BTagPhys = candidate->BTagPhys;
 
     entry->TauTag = candidate->TauTag;