Changes in modules/Merger.cc [341014c:cab38f6] in git

File:

• modules/Merger.cc (modified) (7 diffs)

modules/Merger.cc

@@ -17 +17 @@
  */
 
+
 /** \class Merger
  *
@@ -32 +33 @@
 #include "classes/DelphesFormula.h"
 
+#include "ExRootAnalysis/ExRootResult.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootClassifier.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootResult.h"
 
+#include "TMath.h"
+#include "TString.h"
+#include "TFormula.h"
+#include "TRandom3.h"
+#include "TObjArray.h"
 #include "TDatabasePDG.h"
-#include "TFormula.h"
 #include "TLorentzVector.h"
-#include "TMath.h"
-#include "TObjArray.h"
-#include "TRandom3.h"
-#include "TString.h"
 
-#include <algorithm>
+#include <algorithm> 
+#include <stdexcept>
 #include <iostream>
 #include <sstream>
-#include <stdexcept>
 
 using namespace std;
@@ -88 +89 @@
 
   fMomentumOutputArray = ExportArray(GetString("MomentumOutputArray", "momentum"));
-
+  
   fEnergyOutputArray = ExportArray(GetString("EnergyOutputArray", "energy"));
 }
@@ -96 +97 @@
 void Merger::Finish()
 {
-  vector<TIterator *>::iterator itInputList;
+  vector< TIterator * >::iterator itInputList;
   TIterator *iterator;
 
@@ -112 +113 @@
   Candidate *candidate;
   TLorentzVector momentum;
-  Double_t sumPT, sumE;
-  vector<TIterator *>::iterator itInputList;
+  Double_t sumPT, sumE;  
+  vector< TIterator * >::iterator itInputList;
   TIterator *iterator;
 
   DelphesFactory *factory = GetFactory();
-
+  
   momentum.SetPxPyPzE(0.0, 0.0, 0.0, 0.0);
   sumPT = 0;
@@ -129 +130 @@
     // loop over all candidates
     iterator->Reset();
-    while((candidate = static_cast<Candidate *>(iterator->Next())))
+    while((candidate = static_cast<Candidate*>(iterator->Next())))
     {
       const TLorentzVector &candidateMomentum = candidate->Momentum;
@@ -142 +143 @@
 
   candidate = factory->NewCandidate();
-
+  
   candidate->Position.SetXYZT(0.0, 0.0, 0.0, 0.0);
   candidate->Momentum = momentum;
-
+  
   fMomentumOutputArray->Add(candidate);
 
   candidate = factory->NewCandidate();
-
+  
   candidate->Position.SetXYZT(0.0, 0.0, 0.0, 0.0);
   candidate->Momentum.SetPtEtaPhiE(sumPT, 0.0, 0.0, sumE);
-
+  
   fEnergyOutputArray->Add(candidate);
 }