Changeset de6d698 in git for classes

Timestamp:

Mar 16, 2015, 4:39:51 PM (9 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

986d9d5

Parents:

666d795

Message:

added Trimming, Pruning and SoftDrop in FastJetFinder

Location:

classes

Files:

• DelphesClasses.cc (modified) (4 diffs)
• DelphesClasses.h (modified) (3 diffs)

classes/DelphesClasses.cc

@@ -129 +129 @@
   NCharged(0),
   NNeutrals(0),
+  NSubJetsTrimmed(0),
+  NSubJetsPruned(0), 
+  NSubJetsSoftDropped(0), 
   Beta(0),
   BetaStar(0),
@@ -157 +160 @@
   Tau[3] = 0.0;
   Tau[4] = 0.0;
+  TrimmedP4[0] = 0.0;
+  TrimmedP4[1] = 0.0;
+  TrimmedP4[2] = 0.0;
+  TrimmedP4[3] = 0.0;
+  TrimmedP4[4] = 0.0;
+  PrunedP4[0] = 0.0;
+  PrunedP4[1] = 0.0;
+  PrunedP4[2] = 0.0;
+  PrunedP4[3] = 0.0;
+  PrunedP4[4] = 0.0;
+  SoftDroppedP4[0] = 0.0;
+  SoftDroppedP4[1] = 0.0;
+  SoftDroppedP4[2] = 0.0;
+  SoftDroppedP4[3] = 0.0;
+  SoftDroppedP4[4] = 0.0;
 }
 
@@ -274 +292 @@
   object.Tau[3] = Tau[3];
   object.Tau[4] = Tau[4];
+  
+  object.TrimmedP4[0] = TrimmedP4[0];
+  object.TrimmedP4[1] = TrimmedP4[1];
+  object.TrimmedP4[2] = TrimmedP4[2];
+  object.TrimmedP4[3] = TrimmedP4[3];
+  object.TrimmedP4[4] = TrimmedP4[4];
+  object.PrunedP4[0] = PrunedP4[0];
+  object.PrunedP4[1] = PrunedP4[1];
+  object.PrunedP4[2] = PrunedP4[2];
+  object.PrunedP4[3] = PrunedP4[3];
+  object.PrunedP4[4] = PrunedP4[4];
+  object.SoftDroppedP4[0] = SoftDroppedP4[0];
+  object.SoftDroppedP4[1] = SoftDroppedP4[1];
+  object.SoftDroppedP4[2] = SoftDroppedP4[2];
+  object.SoftDroppedP4[3] = SoftDroppedP4[3];
+  object.SoftDroppedP4[4] = SoftDroppedP4[4];
+
+  object.NSubJetsTrimmed     = NSubJetsTrimmed;
+  object.NSubJetsPruned      = NSubJetsPruned;
+  object.NSubJetsSoftDropped = NSubJetsSoftDropped;
 
   object.fFactory = fFactory;
   object.fArray = 0;
-
 
   // Copy cluster timing info
@@ -351 +388 @@
   Tau[3] = 0.0;
   Tau[4] = 0.0;
-
+  
+  TrimmedP4[0]= 0.0;
+  TrimmedP4[1]= 0.0;
+  TrimmedP4[2]= 0.0;
+  TrimmedP4[3]= 0.0;
+  TrimmedP4[4]= 0.0;
+  PrunedP4[0]= 0.0;
+  PrunedP4[1]= 0.0;
+  PrunedP4[2]= 0.0;
+  PrunedP4[3]= 0.0;
+  PrunedP4[4]= 0.0;
+  SoftDroppedP4[0]= 0.0;
+  SoftDroppedP4[1]= 0.0;
+  SoftDroppedP4[2]= 0.0;
+  SoftDroppedP4[3]= 0.0;
+  SoftDroppedP4[4]= 0.0;
+  NSubJetsTrimmed     = 0;
+  NSubJetsPruned      = 0;
+  NSubJetsSoftDropped = 0;
+  
   fArray = 0;
 }

classes/DelphesClasses.h

@@ -349 +349 @@
 
   Float_t Tau[5]; // N-subjettiness
- 
+  
+  TLorentzVector TrimmedP4[5]; //first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
+  TLorentzVector PrunedP4[5]; //first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
+  TLorentzVector SoftDroppedP4[5]; //first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
+  
+  Int_t    NSubJetsTrimmed; // number of subjets trimmed 
+  Int_t    NSubJetsPruned; // number of subjets pruned 
+  Int_t    NSubJetsSoftDropped; // number of subjets soft-dropped 
+   
   TRefArray Constituents; // references to constituents
   TRefArray Particles; // references to generated particles
@@ -527 +535 @@
   Float_t Tau[5];
   
-  
-  
+  // Other Substructure variables
+  
+  TLorentzVector TrimmedP4[5]; //first entry (i = 0) is the total Trimmed Jet 4-momenta and from i = 1 to 4 are the trimmed subjets 4-momenta
+  TLorentzVector PrunedP4[5]; //first entry (i = 0) is the total Pruned Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
+  TLorentzVector SoftDroppedP4[5]; //first entry (i = 0) is the total SoftDropped Jet 4-momenta and from i = 1 to 4 are the pruned subjets 4-momenta
+ 
+  Int_t    NSubJetsTrimmed; // number of subjets trimmed 
+  Int_t    NSubJetsPruned; // number of subjets pruned 
+  Int_t    NSubJetsSoftDropped; // number of subjets soft-dropped 
+
 
   static CompBase *fgCompare; //!
@@ -548 +564 @@
   void SetFactory(DelphesFactory *factory) { fFactory = factory; }
 
-  ClassDef(Candidate, 2)
+  ClassDef(Candidate, 3)
 };