Changeset 8d4d51b in git for modules

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

Location:

modules

Files:

• FastJetFinder.cc (modified) (1 diff)
• TreeWriter.cc (modified) (1 diff)

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++)
     {