Changeset 49234af in git for modules/FastJetFinder.cc

Timestamp:

Dec 9, 2014, 1:27:13 PM (10 years ago)

Author:

Michele <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

37deb3b, 9e991f8

Parents:

f6b6ee7 (diff), e7e90df (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 'TestFastJet310b1'

File:

• modules/FastJetFinder.cc (modified) (3 diffs)

modules/FastJetFinder.cc

@@ -241 +241 @@
   Candidate *candidate, *constituent;
   TLorentzVector momentum;
+  
+  TLorentzVector constmomentum;
+  
   Double_t deta, dphi, detaMax, dphiMax;
   Double_t time, weightTime, avTime;
@@ -304 +307 @@
   for(itOutputList = outputList.begin(); itOutputList != outputList.end(); ++itOutputList)
   {
-    momentum.SetPxPyPzE(itOutputList->px(), itOutputList->py(), itOutputList->pz(), itOutputList->E());
+    jet = *itOutputList;
+    if(fJetAlgorithm == 7) jet = join(jet.constituents());
+    
+    momentum.SetPxPyPzE(jet.px(), jet.py(), jet.pz(), jet.E());
+    
     area.reset(0.0, 0.0, 0.0, 0.0);
     if(fAreaDefinition) area = itOutputList->area_4vector();
@@ -315 +322 @@
     inputList.clear();
     inputList = sequence->constituents(*itOutputList);
+
+    constmomentum.SetPxPyPzE(0.0,0.0,0.0,0.0);;
 
     for(itInputList = inputList.begin(); itInputList != inputList.end(); ++itInputList)
     {
       constituent = static_cast<Candidate*>(fInputArray->At(itInputList->user_index()));
+
+      constmomentum += constituent->Momentum;
 
       deta = TMath::Abs(momentum.Eta() - constituent->Momentum.Eta());