Changeset 9040259 in git for modules

Timestamp:

Jun 17, 2015, 4:36:20 PM (9 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

a446115

Parents:

edf10ba

Message:

add BTaggingCMS and rename JetFlavourAssociation to JetFlavorAssociation

Location:

modules

Files:

• BTaggingCMS.cc (added)
• BTaggingCMS.h (added)
• JetFlavorAssociation.cc (moved) (moved from modules/JetFlavourAssociation.cc ) (14 diffs)
• JetFlavorAssociation.h (moved) (moved from modules/JetFlavourAssociation.h ) (4 diffs)
• ModulesLinkDef.h (modified) (4 diffs)
• TreeWriter.cc (modified) (8 diffs)

modules/JetFlavorAssociation.cc

@@ -18 +18 @@
 
 
-/** \class JetFlavourAssociation
+/** \class JetFlavorAssociation
  *
  *  Find origin of jet && evaluate jet flavor
@@ -26 +26 @@
  */
 
-#include "modules/JetFlavourAssociation.h"
+#include "modules/JetFlavorAssociation.h"
 
 #include "classes/DelphesClasses.h"
@@ -117 +117 @@
 //------------------------------------------------------------------------------
 
-JetFlavourAssociation::JetFlavourAssociation() :
+JetFlavorAssociation::JetFlavorAssociation() :
   fClassifier(0), fFilter(0),
   fItPartonInputArray(0), fItPartonInputArrayLHEF(0),
   fItJetInputArray(0), fItParticleInputArray(0)
 {
-  fClassifier    = new PartonClassifier;
+  fClassifier = new PartonClassifier;
   fClassifierLHEF = new PartonClassifierLHEF;
 }
@@ -128 +128 @@
 //------------------------------------------------------------------------------
 
-JetFlavourAssociation::~JetFlavourAssociation()
+JetFlavorAssociation::~JetFlavorAssociation()
 {
   if(fClassifier) delete fClassifier;
@@ -136 +136 @@
 //------------------------------------------------------------------------------
 
-void JetFlavourAssociation::Init()
+void JetFlavorAssociation::Init()
 {
   ExRootConfParam param;
@@ -168 +168 @@
 //------------------------------------------------------------------------------
 
-void JetFlavourAssociation::Finish()
+void JetFlavorAssociation::Finish()
 {
   if(fFilter) delete fFilter;
@@ -181 +181 @@
 //------------------------------------------------------------------------------
 
-void JetFlavourAssociation::Process(){
+void JetFlavorAssociation::Process(){
 
   Candidate *jet;
@@ -205 +205 @@
   {
     // get standard flavor
-    GetAlgoFlavour(jet, itPartonArray, itPartonLHEFArray);
-    GetPhysicsFlavour(jet, itPartonArray, itPartonLHEFArray);
+    GetAlgoFlavor(jet, itPartonArray, itPartonLHEFArray);
+    GetPhysicsFlavor(jet, itPartonArray, itPartonLHEFArray);
   }
 }
@@ -214 +214 @@
 // https://cmssdt.cern.ch/SDT/lxr/source/PhysicsTools/JetMCAlgos/plugins/JetPartonMatcher.cc?v=CMSSW_7_3_0_pre1
 
-void JetFlavourAssociation::GetAlgoFlavour(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
+void JetFlavorAssociation::GetAlgoFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
 {
   float maxPt = 0;
@@ -254 +254 @@
       {
         // partons are only quarks || gluons
-        int daughterFlavour1 = -1;
-        int daughterFlavour2 = -1;
-        if(parton->D1 != -1) daughterFlavour1 = TMath::Abs(static_cast<Candidate *>(fParticleInputArray->At(parton->D1))->PID);
-        if(parton->D2 != -1) daughterFlavour2 = TMath::Abs(static_cast<Candidate *>(fParticleInputArray->At(parton->D2))->PID);
-        if((daughterFlavour1 == 1 || daughterFlavour1 == 2 || daughterFlavour1 == 3 || daughterFlavour1 == 4 || daughterFlavour1 == 5 || daughterFlavour1 == 21)) daughterCounter++;
-        if((daughterFlavour2 == 1 || daughterFlavour2 == 2 || daughterFlavour2 == 3 || daughterFlavour2 == 4 || daughterFlavour1 == 5 || daughterFlavour2 == 21)) daughterCounter++;
+        int daughterFlavor1 = -1;
+        int daughterFlavor2 = -1;
+        if(parton->D1 != -1) daughterFlavor1 = TMath::Abs(static_cast<Candidate *>(fParticleInputArray->At(parton->D1))->PID);
+        if(parton->D2 != -1) daughterFlavor2 = TMath::Abs(static_cast<Candidate *>(fParticleInputArray->At(parton->D2))->PID);
+        if((daughterFlavor1 == 1 || daughterFlavor1 == 2 || daughterFlavor1 == 3 || daughterFlavor1 == 4 || daughterFlavor1 == 5 || daughterFlavor1 == 21)) daughterCounter++;
+        if((daughterFlavor2 == 1 || daughterFlavor2 == 2 || daughterFlavor2 == 3 || daughterFlavor2 == 4 || daughterFlavor1 == 5 || daughterFlavor2 == 21)) daughterCounter++;
       }
       if(daughterCounter > 0) continue;
@@ -296 +296 @@
 //------------------------------------------------------------------------------
 
-void JetFlavourAssociation::GetPhysicsFlavour(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
+void JetFlavorAssociation::GetPhysicsFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonLHEFArray)
 {
   float minDr = 1000;
@@ -303 +303 @@
   float dist;
   bool isGoodCandidate;
-  int contaminatingFlavour = 0;
+  int contaminatingFlavor = 0;
   int motherCounter = 0;
   Candidate *parton, *partonLHEF, *mother1, *mother2;
@@ -372 +372 @@
     {
       parton = *itContaminations;
-      contaminatingFlavour = TMath::Abs(parton->PID);
+      contaminatingFlavor = TMath::Abs(parton->PID);
       motherCounter = 0;
       if(parton->M1 != -1) motherCounter++;
@@ -391 +391 @@
       {
         // keep association --> the initialParton is a c --> the contaminated parton is a c
-        if(contaminatingFlavour == 4) continue;
+        if(contaminatingFlavor == 4) continue;
         jet->FlavorPhysics = 0; // all the other cases reject!
         break;

modules/JetFlavorAssociation.h

@@ -17 +17 @@
  */
 
-#ifndef JetFlavourAssociation_h
-#define JetFlavourAssociation_h
+#ifndef JetFlavorAssociation_h
+#define JetFlavorAssociation_h
 
-/** \class JetFlavourAssociation
+/** \class JetFlavorAssociation
  *
- *  Find origin of jet and evaluate jet flavour
+ *  Find origin of jet and evaluate jet flavor
  *
  *  \author P. Demin - UCL, Louvain-la-Neuve
@@ -39 +39 @@
 class PartonClassifierLHEF;
 
-class JetFlavourAssociation: public DelphesModule
+class JetFlavorAssociation: public DelphesModule
 {
 public:
 
-  JetFlavourAssociation();
-  ~JetFlavourAssociation();
+  JetFlavorAssociation();
+  ~JetFlavorAssociation();
 
   void Init();
@@ -50 +50 @@
   void Finish();
 
-  void GetAlgoFlavour(Candidate *jet, TIter &itPartonArray, TIter &itPartonArrayLHEF);
-  void GetPhysicsFlavour(Candidate *jet, TIter &itPartonArray, TIter &itPartonArrayLHEF);
+  void GetAlgoFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonArrayLHEF);
+  void GetPhysicsFlavor(Candidate *jet, TIter &itPartonArray, TIter &itPartonArrayLHEF);
 
 private:
@@ -73 +73 @@
   const TObjArray *fParticleInputArray; //!
 
-  ClassDef(JetFlavourAssociation, 1)
+  ClassDef(JetFlavorAssociation, 1)
 };
 

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"
@@ -59 +60 @@
 #include "modules/Hector.h"
 #include "modules/RunPUPPI.h"
-#include "modules/JetFlavourAssociation.h"
+#include "modules/JetFlavorAssociation.h"
 #include "modules/ExampleModule.h"
 
@@ -84 +85 @@
 #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+;
@@ -101 +103 @@
 #pragma link C++ class Hector+;
 #pragma link C++ class RunPUPPI+;
-#pragma link C++ class JetFlavourAssociation+;
+#pragma link C++ class JetFlavorAssociation+;
 #pragma link C++ class ExampleModule+;
 

modules/TreeWriter.cc

@@ -291 +291 @@
     entry->ZOuter = position.Z();
     entry->TOuter = position.T()*1.0E-3/c_light;
-    
+
     entry->Dxy = candidate->Dxy;
     entry->SDxy = candidate->SDxy ;
@@ -297 +297 @@
     entry->Yd = candidate->Yd;
     entry->Zd = candidate->Zd;
-   
+
     const TLorentzVector &momentum = candidate->Momentum;
 
@@ -362 +362 @@
 
     entry->T = position.T()*1.0E-3/c_light;
-    entry->Ntimes = candidate->Ntimes;    
+    entry->Ntimes = candidate->Ntimes;
 
     FillParticles(candidate, &entry->Particles);
@@ -405 +405 @@
 
     // Isolation variables
-       
+
     entry->IsolationVar = candidate->IsolationVar;
     entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
@@ -453 +453 @@
 
     // Isolation variables
-       
+
     entry->IsolationVar = candidate->IsolationVar;
     entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
@@ -507 +507 @@
 
     entry->T = position.T()*1.0E-3/c_light;
-    
+
     // Isolation variables
-       
+
     entry->IsolationVar = candidate->IsolationVar;
     entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
@@ -568 +568 @@
 
     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->TauTag = candidate->TauTag;
 
@@ -593 +610 @@
     entry->MeanSqDeltaR = candidate->MeanSqDeltaR;
     entry->PTD = candidate->PTD;
-    
+
     //--- Sub-structure variables ----
-    
-    entry->NSubJetsTrimmed     = candidate->NSubJetsTrimmed;
-    entry->NSubJetsPruned      = candidate->NSubJetsPruned; 
+
+    entry->NSubJetsTrimmed = candidate->NSubJetsTrimmed;
+    entry->NSubJetsPruned = candidate->NSubJetsPruned;
     entry->NSubJetsSoftDropped = candidate->NSubJetsSoftDropped;
-    
+
     for(i = 0; i < 5; i++)
     {
-      entry->FracPt[i]        = candidate -> FracPt[i];
-      entry->Tau[i]           = candidate -> Tau[i];
-      entry->TrimmedP4[i]     = candidate -> TrimmedP4[i];
-      entry->PrunedP4[i]      = candidate -> PrunedP4[i];
+      entry->FracPt[i] = candidate -> FracPt[i];
+      entry->Tau[i] = candidate -> Tau[i];
+      entry->TrimmedP4[i] = candidate -> TrimmedP4[i];
+      entry->PrunedP4[i] = candidate -> PrunedP4[i];
       entry->SoftDroppedP4[i] = candidate -> SoftDroppedP4[i];
     }
-   
+
     FillParticles(candidate, &entry->Particles);
   }