Changeset 5a69ba1d in git for classes

Timestamp:

Jan 12, 2018, 5:43:01 PM (7 years ago)

Author:

Ulrike Schnoor <schnooru@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

3037765

Parents:

ae061c1 (diff), 1f7223c (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.

Message:

Merge branch 'master' of github.com:delphes/delphes

Location:

classes

Files:

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

classes/DelphesClasses.cc

@@ -179 +179 @@
   Tau[3] = 0.0;
   Tau[4] = 0.0;
+
+  SoftDroppedJet.SetXYZT(0.0, 0.0, 0.0, 0.0);
+  SoftDroppedSubJet1.SetXYZT(0.0, 0.0, 0.0, 0.0);
+  SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
+
   for(i = 0; i < 5; ++i)
   {
@@ -355 +360 @@
   object.NSubJetsSoftDropped = NSubJetsSoftDropped;
 
+  object.SoftDroppedJet =SoftDroppedJet;
+  object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
+  object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
+
   object.fFactory = fFactory;
   object.fArray = 0;
@@ -461 +470 @@
   Tau[4] = 0.0;
 
+  SoftDroppedJet.SetXYZT(0.0, 0.0, 0.0, 0.0);
+  SoftDroppedSubJet1.SetXYZT(0.0, 0.0, 0.0, 0.0);
+  SoftDroppedSubJet2.SetXYZT(0.0, 0.0, 0.0, 0.0);
+
+
   for(i = 0; i < 5; ++i)
   {

classes/DelphesClasses.h

@@ -388 +388 @@
   Float_t Tau[5]; // N-subjettiness
 
+  TLorentzVector SoftDroppedJet;
+  TLorentzVector SoftDroppedSubJet1;
+  TLorentzVector SoftDroppedSubJet2;
+
   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
@@ -631 +635 @@
   // Other Substructure variables
 
+  TLorentzVector SoftDroppedJet;
+  TLorentzVector SoftDroppedSubJet1;
+  TLorentzVector SoftDroppedSubJet2;
+
   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