Changes in modules/FastJetGridMedianEstimator.cc [973b92a:341014c] in git

File:

• modules/FastJetGridMedianEstimator.cc (modified) (8 diffs)

modules/FastJetGridMedianEstimator.cc

@@ -17 +17 @@
  */
 
-
 /** \class FastJetGridMedianEstimator
  *
@@ -32 +31 @@
 #include "classes/DelphesFormula.h"
 
+#include "ExRootAnalysis/ExRootClassifier.h"
+#include "ExRootAnalysis/ExRootFilter.h"
 #include "ExRootAnalysis/ExRootResult.h"
-#include "ExRootAnalysis/ExRootFilter.h"
-#include "ExRootAnalysis/ExRootClassifier.h"
 
+#include "TDatabasePDG.h"
+#include "TFormula.h"
+#include "TLorentzVector.h"
 #include "TMath.h"
+#include "TObjArray.h"
+#include "TRandom3.h"
 #include "TString.h"
-#include "TFormula.h"
-#include "TRandom3.h"
-#include "TObjArray.h"
-#include "TDatabasePDG.h"
-#include "TLorentzVector.h"
 
 #include <algorithm>
-#include <stdexcept>
 #include <iostream>
 #include <sstream>
+#include <stdexcept>
+#include <utility>
 #include <vector>
-#include <utility>
 
+#include "fastjet/ClusterSequence.hh"
+#include "fastjet/ClusterSequenceArea.hh"
+#include "fastjet/JetDefinition.hh"
 #include "fastjet/PseudoJet.hh"
-#include "fastjet/JetDefinition.hh"
-#include "fastjet/ClusterSequence.hh"
+#include "fastjet/RectangularGrid.hh"
 #include "fastjet/Selector.hh"
-#include "fastjet/RectangularGrid.hh"
-#include "fastjet/ClusterSequenceArea.hh"
 #include "fastjet/tools/JetMedianBackgroundEstimator.hh"
 
 #include "fastjet/tools/GridMedianBackgroundEstimator.hh"
 
+#include "fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh"
+#include "fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh"
 #include "fastjet/plugins/SISCone/fastjet/SISConePlugin.hh"
-#include "fastjet/plugins/CDFCones/fastjet/CDFMidPointPlugin.hh"
-#include "fastjet/plugins/CDFCones/fastjet/CDFJetCluPlugin.hh"
 
-#include "fastjet/contribs/Nsubjettiness/Nsubjettiness.hh"
+#include "fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh"
 #include "fastjet/contribs/Nsubjettiness/Njettiness.hh"
 #include "fastjet/contribs/Nsubjettiness/NjettinessPlugin.hh"
-#include "fastjet/contribs/Nsubjettiness/ExtraRecombiners.hh"
+#include "fastjet/contribs/Nsubjettiness/Nsubjettiness.hh"
 
 using namespace std;
 using namespace fastjet;
 using namespace fastjet::contrib;
-
 
 //------------------------------------------------------------------------------
@@ -80 +78 @@
   fItInputArray(0)
 {
-
 }
 
@@ -87 +84 @@
 FastJetGridMedianEstimator::~FastJetGridMedianEstimator()
 {
-
 }
 
@@ -104 +100 @@
 
   fEstimators.clear();
-  for(i = 0; i < size/4; ++i)
+  for(i = 0; i < size / 4; ++i)
   {
-    rapMin = param[i*4].GetDouble();
-    rapMax = param[i*4 + 1].GetDouble();
-    drap = param[i*4 + 2].GetDouble();
-    dphi = param[i*4 + 3].GetDouble();
+    rapMin = param[i * 4].GetDouble();
+    rapMax = param[i * 4 + 1].GetDouble();
+    drap = param[i * 4 + 2].GetDouble();
+    dphi = param[i * 4 + 3].GetDouble();
     fEstimators.push_back(new GridMedianBackgroundEstimator(rapMin, rapMax, drap, dphi));
   }
@@ -125 +121 @@
 void FastJetGridMedianEstimator::Finish()
 {
-  vector< GridMedianBackgroundEstimator * >::iterator itEstimators;
+  vector<GridMedianBackgroundEstimator *>::iterator itEstimators;
 
   for(itEstimators = fEstimators.begin(); itEstimators != fEstimators.end(); ++itEstimators)
@@ -144 +140 @@
   Double_t rho = 0;
   PseudoJet jet;
-  vector< PseudoJet > inputList, outputList;
+  vector<PseudoJet> inputList, outputList;
 
-  vector< GridMedianBackgroundEstimator * >::iterator itEstimators;;
+  vector<GridMedianBackgroundEstimator *>::iterator itEstimators;
+  ;
 
   DelphesFactory *factory = GetFactory();
@@ -155 +152 @@
   fItInputArray->Reset();
   number = 0;
-  while((candidate = static_cast<Candidate*>(fItInputArray->Next())))
+  while((candidate = static_cast<Candidate *>(fItInputArray->Next())))
   {
     momentum = candidate->Momentum;