Changeset 5658083 in git for modules/VertexSorter.cc

Timestamp:

May 18, 2016, 11:39:09 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

bc4bff0

Parents:

641cb3d

Message:

changed datatype to ROOT compliant

File:

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

modules/VertexSorter.cc

@@ -1 +1 @@
 /** \class VertexSorter
  *
- *  Merges particles from pile-up sample into event
- *
- *
- *  $Date: 2013-02-12 15:13:59 +0100 (Tue, 12 Feb 2013) $
- *  $Revision: 907 $
- *
- *
- *  \author M. Selvaggi - UCL, Louvain-la-Neuve
- *
- */
+ *
+ *  Sorts vertices according to different criteria
+ *
+ *  \authors A. Hart, M. Selvaggi
+ *
+ *
+*/
 
 #include <unordered_map>
 #include "modules/VertexSorter.h"
-
-//#include "CLHEP/Units/GlobalSystemOfUnits.h"
-//#include "CLHEP/Units/GlobalPhysicalConstants.h"
 
 #include "classes/DelphesClasses.h"
@@ -37 +31 @@
 #include "TVector3.h"
 
-static const double mm  = 1.;
-static const double m = 1000.*mm;
-static const double ns  = 1.;
-static const double s = 1.e+9 *ns;
-static const double c_light   = 2.99792458e+8 * m/s;
+static const Double_t mm  = 1.;
+static const Double_t m = 1000.*mm;
+static const Double_t ns  = 1.;
+static const Double_t s = 1.e+9 *ns;
+static const Double_t c_light   = 2.99792458e+8 * m/s;
 
 //------------------------------------------------------------------------------
@@ -96 +90 @@
 //------------------------------------------------------------------------------
 //
-bool VertexSorter::secondDescending (pair<unsigned, double> pair0, pair<unsigned, double> pair1)
+Bool_t VertexSorter::secondDescending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
 {
   return (pair0.second > pair1.second);
 }
-bool VertexSorter::secondAscending (pair<unsigned, double> pair0, pair<unsigned, double> pair1)
+Bool_t VertexSorter::secondAscending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
 {
   return (pair0.second < pair1.second);
@@ -108 +102 @@
 {
   Candidate *candidate, *jetCandidate, *beamSpotCandidate;
-  unordered_map<int, unsigned> clusterIDToIndex;
-  unordered_map<int, double> clusterIDToSumPT2;
-  vector<pair<int, double> > sortedClusterIDs;
-
-  for (int iCluster = 0; iCluster < fInputArray->GetEntries (); iCluster++)
+  unordered_map<Int_t, UInt_t> clusterIDToIndex;
+  unordered_map<Int_t, Double_t> clusterIDToSumPT2;
+  vector<pair<Int_t, Double_t> > sortedClusterIDs;
+
+  for (Int_t iCluster = 0; iCluster < fInputArray->GetEntries (); iCluster++)
     {
       const Candidate &cluster = *((Candidate *) fInputArray->At (iCluster));
@@ -135 +129 @@
             continue;
           TLorentzVector p (candidate->Momentum.Px (), candidate->Momentum.Py (), candidate->Momentum.Pz (), candidate->Momentum.E ());
-          bool isInJet = false;
+          Bool_t isInJet = false;
 
           fItJetInputArray->Reset();
@@ -173 +167 @@
 
       beamSpotCandidate = (Candidate *) fBeamSpotInputArray->At (0);
-      for (int iCluster = 0; iCluster < fInputArray->GetEntries (); iCluster++)
+      for (Int_t iCluster = 0; iCluster < fInputArray->GetEntries (); iCluster++)
         {
           const Candidate &cluster = *((Candidate *) fInputArray->At (iCluster));