Changeset 8d4d51b in git

Timestamp:

Dec 5, 2017, 8:36:29 PM (7 years ago)

Author:

Michele Selvaggi (michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

6d1fff5

Parents:

27cd45c (diff), 6965fe1 (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

Files:

• classes/DelphesClasses.cc (modified) (3 diffs)
• classes/DelphesClasses.h (modified) (2 diffs)
• modules/FastJetFinder.cc (modified) (1 diff)
• modules/TreeWriter.cc (modified) (1 diff)

classes/DelphesClasses.cc

@@ -175 +175 @@
   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)
   {
@@ -351 +356 @@
   object.NSubJetsSoftDropped = NSubJetsSoftDropped;
 
+  object.SoftDroppedJet =SoftDroppedJet;
+  object.SoftDroppedSubJet1 = SoftDroppedSubJet1;
+  object.SoftDroppedSubJet2 = SoftDroppedSubJet2;
+
   object.fFactory = fFactory;
   object.fArray = 0;
@@ -457 +466 @@
   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
@@ -625 +629 @@
   // 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

modules/FastJetFinder.cc

@@ -520 +520 @@
       candidate->NSubJetsSoftDropped = softdrop_jet.pieces().size();
 
+      candidate->SoftDroppedJet = candidate->SoftDroppedP4[0];
+
       for (size_t i = 0; i < subjets.size()  and i < 4; i++)
       {
             if(subjets.at(i).pt() < 0) continue ; 
             candidate->SoftDroppedP4[i+1].SetPtEtaPhiM(subjets.at(i).pt(), subjets.at(i).eta(), subjets.at(i).phi(), subjets.at(i).m());
+            if(i==0) candidate->SoftDroppedSubJet1 = candidate->SoftDroppedP4[i+1];
+            if(i==1) candidate->SoftDroppedSubJet2 = candidate->SoftDroppedP4[i+1];
       }
     }

modules/TreeWriter.cc

@@ -681 +681 @@
     entry->NSubJetsSoftDropped = candidate->NSubJetsSoftDropped;
 
+    entry->SoftDroppedJet     = candidate->SoftDroppedJet ;
+    entry->SoftDroppedSubJet1 = candidate->SoftDroppedSubJet1 ;
+    entry->SoftDroppedSubJet2 = candidate->SoftDroppedSubJet2;
+
+
     for(i = 0; i < 5; i++)
     {