Changeset b62c2da in git

Timestamp:

Jan 26, 2015, 2:57:46 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

2d494a6

Parents:

7f9ae0a

Message:

added isolation variables to Candidate and Electrons, Muons, Photons classes

Files:

• classes/DelphesClasses.cc (modified) (4 diffs)
• classes/DelphesClasses.h (modified) (5 diffs)
• modules/Isolation.cc (modified) (1 diff)
• modules/TrackPileUpSubtractor.cc (modified) (1 diff)

classes/DelphesClasses.cc

@@ -120 +120 @@
   PID(0), Status(0), M1(-1), M2(-1), D1(-1), D2(-1),
   Charge(0), Mass(0.0),
-  IsPU(0), IsConstituent(0),
+  IsPU(0), IsRecoPU(0), IsConstituent(0),
   BTag(0), TauTag(0), Eem(0.0), Ehad(0.0),
   DeltaEta(0.0), DeltaPhi(0.0),
@@ -133 +133 @@
   MeanSqDeltaR(0),
   PTD(0),
+  IsolationVar(-999),
+  IsolationVarRhoCorr(-999),
+  SumPtCharged(-999),
+  SumPtNeutral(-999),
+  SumPtChargedPU(-999),
+  SumPt(-999),
   fFactory(0),
   fArray(0)
@@ -249 +255 @@
   object.MeanSqDeltaR = MeanSqDeltaR;
   object.PTD = PTD;
+  
+  object.IsolationVar = IsolationVar;
+  object.IsolationVarRhoCorr = IsolationVarRhoCorr;
+  object.SumPtCharged = SumPtCharged;
+  object.SumPtNeutral = SumPtNeutral;
+  object.SumPtChargedPU = SumPtChargedPU;
+  object.SumPt = SumPt;
+
   object.FracPt[0] = FracPt[0];
   object.FracPt[1] = FracPt[1];
@@ -311 +325 @@
   MeanSqDeltaR = 0.0;
   PTD = 0.0;
+  
+  IsolationVar = -999;
+  IsolationVarRhoCorr = -999;
+  SumPtCharged = -999;
+  SumPtNeutral = -999;
+  SumPtChargedPU = -999;
+  SumPt = -999;
+  
   FracPt[0] = 0.0;
   FracPt[1] = 0.0;

classes/DelphesClasses.h

@@ -231 +231 @@
   TRefArray Particles; // references to generated particles
 
+  // Isolation variables
+  
+  Float_t IsolationVar;
+  Float_t IsolationVarRhoCorr;
+  Float_t SumPtCharged;
+  Float_t SumPtNeutral;
+  Float_t SumPtChargedPU;
+  Float_t SumPt;
+
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }
@@ -257 +266 @@
   TRef Particle; // reference to generated particle
 
+  // Isolation variables
+  
+  Float_t IsolationVar;
+  Float_t IsolationVarRhoCorr;
+  Float_t SumPtCharged;
+  Float_t SumPtNeutral;
+  Float_t SumPtChargedPU;
+  Float_t SumPt;
+
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }
@@ -280 +298 @@
 
   TRef Particle; // reference to generated particle
+
+   // Isolation variables
+  
+  Float_t IsolationVar;
+  Float_t IsolationVarRhoCorr;
+  Float_t SumPtCharged;
+  Float_t SumPtNeutral;
+  Float_t SumPtChargedPU;
+  Float_t SumPt;
 
   static CompBase *fgCompare; //!
@@ -452 +479 @@
 
   Int_t IsPU;
+  Int_t IsRecoPU;
+  
   Int_t IsConstituent;
 
@@ -482 +511 @@
   Float_t  FracPt[5];
 
+  // Isolation variables
+  
+  Float_t IsolationVar;
+  Float_t IsolationVarRhoCorr;
+  Float_t SumPtCharged;
+  Float_t SumPtNeutral;
+  Float_t SumPtChargedPU;
+  Float_t SumPt;
+
   // N-subjettiness variables
 

modules/Isolation.cc

@@ -234 +234 @@
     ratioRhoCorr = sumRhoCorr/candidateMomentum.Pt();
     
-    candidate->IsolationVarDBeta = ratioDBeta;
+    candidate->IsolationVar = ratioDBeta;
     candidate->IsolationVarRhoCorr = ratioRhoCorr;
-    candidate->chargedEnergy = sumChargedHadron;
-    candidate->neutralEnergy = sumNeutral;
-    candidate->chargedPUEnergy = sumChargedPU;
-    candidate->allParticleEnergy = sumAllParticles;
+    candidate->SumPtCharged = sumCharged;
+    candidate->SumPtNeutral = sumNeutral;
+    candidate->SumPtChargedPU = sumChargedPU;
+    candidate->SumPt = sumAllParticles;
 
     if((fUsePTSum && sumDBeta > fPTSumMax) || ratioDBeta > fPTRatioMax) continue;

modules/TrackPileUpSubtractor.cc

@@ -148 +148 @@
       // assume perfect pile-up subtraction for tracks outside fZVertexResolution
       
-      if(candidate->IsPU && TMath::Abs(z-PVZ) > fZVertexResolution) candidate->IsRecoPU = 1;
+      if(candidate->IsPU && TMath::Abs(z-zvtx) > fZVertexResolution) candidate->IsRecoPU = 1;
       else 
       {