Changeset 95b4e9f in git for modules/VertexSorter.cc

Timestamp:

Aug 31, 2016, 4:25:59 PM (8 years ago)

Author:

Pavel Demin <pavel.demin@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

4154bbd

Parents:

b195ba1

Message:

reorganize includes in vertexing modules

File:

• modules/VertexSorter.cc (modified) (4 diffs)

modules/VertexSorter.cc

@@ -29 +29 @@
 #include "TMatrixT.h"
 #include "TVector3.h"
+
+#include <utility>
+#include <algorithm>
+#include <stdexcept>
+#include <iostream>
+#include <vector>
+#include <map>
+#include <string>
+
+using namespace std;
 
 static const Double_t mm  = 1.;
@@ -76 +86 @@
   fOutputArray = ExportArray(GetString("OutputArray", "clusters"));
 
-  fMethod = GetString ("Method", "BTV");
+  fMethod = GetString("Method", "BTV");
 }
 
@@ -88 +98 @@
 
 //------------------------------------------------------------------------------
-//
-Bool_t VertexSorter::secondDescending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
+
+static Bool_t secondDescending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
 {
   return (pair0.second > pair1.second);
 }
-Bool_t VertexSorter::secondAscending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
+
+static Bool_t secondAscending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
 {
   return (pair0.second < pair1.second);
 }
 
+//------------------------------------------------------------------------------
+
 void VertexSorter::Process()
 {
   Candidate *candidate, *jetCandidate, *beamSpotCandidate;
-  unordered_map<Int_t, UInt_t> clusterIDToIndex;
-  unordered_map<Int_t, Double_t> clusterIDToSumPT2;
+  map<Int_t, UInt_t> clusterIDToIndex;
+  map<Int_t, Double_t> clusterIDToSumPT2;
   vector<pair<Int_t, Double_t> > sortedClusterIDs;
 
@@ -112 +125 @@
     }
 
-  if (fMethod == "BTV")
+  if(fMethod == "BTV")
     {
       if (!fJetInputArray)