Changeset 8c3ac78 in git for classes/DelphesClasses.h

Timestamp:

Apr 11, 2018, 6:26:41 PM (7 years ago)

Author:

GitHub <noreply@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

58cfe91, 900ad95

Parents:

a670493 (diff), b1d948c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michele Selvaggi <michele.selvaggi@…> (04/11/18 18:26:41)

git-committer:

GitHub <noreply@…> (04/11/18 18:26:41)

Message:

Merge pull request #54 from uschnoor/master

CLICdet cards and code additions ready for release

File:

• classes/DelphesClasses.h (modified) (2 diffs)

classes/DelphesClasses.h

@@ -396 +396 @@
   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
 
+  Double_t ExclYmerge23;
+  Double_t ExclYmerge34;
+  Double_t ExclYmerge45;
+  Double_t ExclYmerge56;
+  
   TRefArray Constituents; // references to constituents
   TRefArray Particles; // references to generated particles
@@ -641 +647 @@
   Int_t NSubJetsSoftDropped; // number of subjets soft-dropped
 
-
+  // Exclusive clustering variables
+  Double_t ExclYmerge23;
+  Double_t ExclYmerge34;
+  Double_t ExclYmerge45;
+  Double_t ExclYmerge56;
+      
   static CompBase *fgCompare; //!
   const CompBase *GetCompare() const { return fgCompare; }