Changes in modules/TreeWriter.cc [9040259:cab38f6] in git

File:

• modules/TreeWriter.cc (modified) (9 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;
 
     FillParticles(candidate, &entry->Particles);
@@ -404 +403 @@
     entry->T = position.T()*1.0E-3/c_light;
 
-    // Isolation variables
-
-    entry->IsolationVar = candidate->IsolationVar;
-    entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
-    entry->SumPtCharged = candidate->SumPtCharged ;
-    entry->SumPtNeutral = candidate->SumPtNeutral ;
-    entry->SumPtChargedPU = candidate->SumPtChargedPU ;
-    entry->SumPt = candidate->SumPt ;
-
     entry->EhadOverEem = candidate->Eem > 0.0 ? candidate->Ehad/candidate->Eem : 999.9;
 
@@ -452 +442 @@
     entry->T = position.T()*1.0E-3/c_light;
 
-    // Isolation variables
-
-    entry->IsolationVar = candidate->IsolationVar;
-    entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
-    entry->SumPtCharged = candidate->SumPtCharged ;
-    entry->SumPtNeutral = candidate->SumPtNeutral ;
-    entry->SumPtChargedPU = candidate->SumPtChargedPU ;
-    entry->SumPt = candidate->SumPt ;
-
-
     entry->Charge = candidate->Charge;
 
@@ -508 +488 @@
     entry->T = position.T()*1.0E-3/c_light;
 
-    // Isolation variables
-
-    entry->IsolationVar = candidate->IsolationVar;
-    entry->IsolationVarRhoCorr = candidate->IsolationVarRhoCorr ;
-    entry->SumPtCharged = candidate->SumPtCharged ;
-    entry->SumPtNeutral = candidate->SumPtNeutral ;
-    entry->SumPtChargedPU = candidate->SumPtChargedPU ;
-    entry->SumPt = candidate->SumPt ;
-
     entry->Charge = candidate->Charge;
 
@@ -533 +504 @@
   Double_t ecalEnergy, hcalEnergy;
   const Double_t c_light = 2.99792458E8;
-  Int_t i;
 
   array->Sort();
@@ -562 +532 @@
     entry->Mass = momentum.M();
 
-    entry->Area = candidate->Area;
-
     entry->DeltaEta = candidate->DeltaEta;
     entry->DeltaPhi = candidate->DeltaPhi;
 
     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;
 
@@ -610 +561 @@
     entry->MeanSqDeltaR = candidate->MeanSqDeltaR;
     entry->PTD = candidate->PTD;
-
-    //--- Sub-structure variables ----
-
-    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->SoftDroppedP4[i] = candidate -> SoftDroppedP4[i];
-    }
-
+    entry->FracPt[0] = candidate->FracPt[0];
+    entry->FracPt[1] = candidate->FracPt[1];
+    entry->FracPt[2] = candidate->FracPt[2];
+    entry->FracPt[3] = candidate->FracPt[3];
+    entry->FracPt[4] = candidate->FracPt[4];
+   
+    //--- N-subjettiness variables ----
+    
+    entry->Tau1 = candidate->Tau[0];
+    entry->Tau2 = candidate->Tau[1];
+    entry->Tau3 = candidate->Tau[2];
+    entry->Tau4 = candidate->Tau[3];
+    entry->Tau5 = candidate->Tau[4];
+   
     FillParticles(candidate, &entry->Particles);
   }