Changeset d870fc5 in git for modules/FastJetFinder.cc

Timestamp:

Dec 21, 2014, 4:03:35 PM (10 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

d77b51d

Parents:

7f12612 (diff), e5767b57 (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 remote-tracking branch 'upstream/master'

File:

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

modules/FastJetFinder.cc

@@ -2 +2 @@
  *  Delphes: a framework for fast simulation of a generic collider experiment
  *  Copyright (C) 2012-2014  Universite catholique de Louvain (UCL), Belgium
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
@@ -21 +21 @@
  *
  *  Finds jets using FastJet library.
- *
- *  $Date$
- *  $Revision$
- *
  *
  *  \author P. Demin - UCL, Louvain-la-Neuve
@@ -241 +237 @@
   Candidate *candidate, *constituent;
   TLorentzVector momentum;
-  
-  TLorentzVector constmomentum;
-  
+
   Double_t deta, dphi, detaMax, dphiMax;
-  Double_t time, weightTime, avTime;
+  Double_t time, timeWeight;
   Int_t number;
-  Double_t rho = 0;
+  Double_t rho = 0.0;
   PseudoJet jet, area;
   vector<PseudoJet> inputList, outputList;
@@ -309 +303 @@
     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();
@@ -317 +311 @@
     candidate = factory->NewCandidate();
 
-    time=0;
-    weightTime=0;
+    time = 0.0;
+    timeWeight = 0.0;
 
     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());
@@ -337 +327 @@
 
       time += TMath::Sqrt(constituent->Momentum.E())*(constituent->Position.T());
-      weightTime += TMath::Sqrt(constituent->Momentum.E());
+      timeWeight += TMath::Sqrt(constituent->Momentum.E());
 
       candidate->AddCandidate(constituent);
     }
 
-    avTime = time/weightTime;
-
     candidate->Momentum = momentum;
-    candidate->Position.SetT(avTime);
+    candidate->Position.SetT(time/timeWeight);
     candidate->Area.SetPxPyPzE(area.px(), area.py(), area.pz(), area.E());