Changeset 9040259 in git for modules/TreeWriter.cc

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

File:

• modules/TreeWriter.cc (modified) (8 diffs)

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