Changeset 5658083 in git for modules/VertexFinder.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/VertexFinder.cc (modified) (17 diffs)

modules/VertexFinder.cc

@@ -3 +3 @@
  *  Cluster vertices from tracks
  *
- *  \author M. Selvaggi - UCL, Louvain-la-Neuve
+ *  \authors A. Hart, M. Selvaggi
  *
  */
@@ -32 +32 @@
 #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;
 
 //------------------------------------------------------------------------------
@@ -78 +78 @@
 //------------------------------------------------------------------------------
 //
-bool VertexFinder::secondAscending (pair<unsigned, double> pair0, pair<unsigned, double> pair1)
+Bool_t VertexFinder::secondAscending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
 {
   return (pair0.second < pair1.second);
 }
 
-bool VertexFinder::secondDescending (pair<unsigned, double> pair0, pair<unsigned, double> pair1)
+Bool_t VertexFinder::secondDescending (pair<UInt_t, Double_t> pair0, pair<UInt_t, Double_t> pair1)
 {
   return (pair0.second > pair1.second);
@@ -116 +116 @@
 ////////////////////////////////////////////////////////////////////////////////
   sort (clusterSumPT2.begin (), clusterSumPT2.end (), secondDescending);
-  for (vector<pair<unsigned, double> >::const_iterator cluster = clusterSumPT2.begin (); cluster != clusterSumPT2.end (); cluster++)
+  for (vector<pair<UInt_t, Double_t> >::const_iterator cluster = clusterSumPT2.begin (); cluster != clusterSumPT2.end (); cluster++)
     {
       // Skip the cluster if it no longer has any tracks
@@ -129 +129 @@
       // otherwise, mark the seed track as claimed
       
-      if ((int) clusterIDToInt.at (cluster->first).at ("ndf") < fMinNDF)
-        {
-          for (map<unsigned, map<string, int> >::iterator track = trackIDToInt.begin (); track != trackIDToInt.end (); track++)
+      if ((Int_t) clusterIDToInt.at (cluster->first).at ("ndf") < fMinNDF)
+        {
+          for (map<UInt_t, map<string, Int_t> >::iterator track = trackIDToInt.begin (); track != trackIDToInt.end (); track++)
             {
-              if (track->second.at ("clusterIndex") != (int) cluster->first)
+              if (track->second.at ("clusterIndex") != (Int_t) cluster->first)
                 continue;
               track->second["clusterIndex"] = -1;
@@ -162 +162 @@
 ////////////////////////////////////////////////////////////////////////////////
   clusterSumPT2.clear ();
-  for (map<unsigned, map<string, int> >::const_iterator cluster = clusterIDToInt.begin (); cluster != clusterIDToInt.end (); cluster++)
+  for (map<UInt_t, map<string, Int_t> >::const_iterator cluster = clusterIDToInt.begin (); cluster != clusterIDToInt.end (); cluster++)
   {
     
@@ -171 +171 @@
   sort (clusterSumPT2.begin (), clusterSumPT2.end (), secondDescending);
   
-  for (vector<pair<unsigned, double> >::const_iterator cluster = clusterSumPT2.begin (); cluster != clusterSumPT2.end (); cluster++)
+  for (vector<pair<UInt_t, Double_t> >::const_iterator cluster = clusterSumPT2.begin (); cluster != clusterSumPT2.end (); cluster++)
   {
     DelphesFactory *factory = GetFactory();
@@ -192 +192 @@
 {
   Candidate *candidate;
-  unsigned clusterIndex = 0, maxSeeds = 0;
+  UInt_t clusterIndex = 0, maxSeeds = 0;
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -224 +224 @@
 ////////////////////////////////////////////////////////////////////////////////
   sort (trackPT.begin (), trackPT.end (), secondDescending);
-  for (vector<pair<unsigned, double> >::const_iterator track = trackPT.begin (); track != trackPT.end (); track++, maxSeeds++)
+  for (vector<pair<UInt_t, Double_t> >::const_iterator track = trackPT.begin (); track != trackPT.end (); track++, maxSeeds++)
     {
       if (track->second < fSeedMinPT)
@@ -242 +242 @@
 // Create the seeds from the SeedMinPT highest pt tracks.
 ////////////////////////////////////////////////////////////////////////////////
-  for (vector<pair<unsigned, double> >::const_iterator track = trackPT.begin (); track != trackPT.end (); track++, clusterIndex++)
+  for (vector<pair<UInt_t, Double_t> >::const_iterator track = trackPT.begin (); track != trackPT.end (); track++, clusterIndex++)
     {
       addTrackToCluster (track->first, clusterIndex);
@@ -251 +251 @@
 
 void
-VertexFinder::growCluster (const unsigned clusterIndex)
-{
-  bool done = false;
-  unsigned nearestID;
-  int oldClusterIndex;
-  double nearestDistance;
-  vector<unsigned> nearTracks;
+VertexFinder::growCluster (const UInt_t clusterIndex)
+{
+  Bool_t done = false;
+  UInt_t nearestID;
+  Int_t oldClusterIndex;
+  Double_t nearestDistance;
+  vector<UInt_t> nearTracks;
   nearTracks.clear ();
 
@@ -277 +277 @@
         {
         
-            for (map<unsigned, map<string, double> >::const_iterator track = trackIDToDouble.begin (); track != trackIDToDouble.end (); track++)
+            for (map<UInt_t, map<string, Double_t> >::const_iterator track = trackIDToDouble.begin (); track != trackIDToDouble.end (); track++)
             {
-              if (trackIDToBool.at (track->first).at ("claimed") || trackIDToInt.at (track->first).at ("clusterIndex") == (int) clusterIndex)
+              if (trackIDToBool.at (track->first).at ("claimed") || trackIDToInt.at (track->first).at ("clusterIndex") == (Int_t) clusterIndex)
                 continue;
                 
@@ -285 +285 @@
               Double_t sz_vt =  clusterIDToDouble.at (clusterIndex).at ("ez") *  clusterIDToDouble.at (clusterIndex).at ("z");
                 
-              double distance = fabs (clusterIDToDouble.at (clusterIndex).at ("z") - track->second.at ("z")) / hypot (clusterIDToDouble.at (clusterIndex).at ("ez"), track->second.at ("ez"));
-              //double distance = fabs (clusterIDToDouble.at (clusterIndex).at ("z") - track->second.at ("z")) / hypot (sz_vt, sz_tr);
+              Double_t distance = fabs (clusterIDToDouble.at (clusterIndex).at ("z") - track->second.at ("z")) / hypot (clusterIDToDouble.at (clusterIndex).at ("ez"), track->second.at ("ez"));
               if (nearestDistance < 0.0 || distance < nearestDistance)
                 {
@@ -299 +298 @@
       else
         {
-          for (vector<unsigned>::const_iterator track = nearTracks.begin (); track != nearTracks.end (); track++)
+          for (vector<UInt_t>::const_iterator track = nearTracks.begin (); track != nearTracks.end (); track++)
             {
-              if (trackIDToBool.at (*track).at ("claimed") || trackIDToInt.at (*track).at ("clusterIndex") == (int) clusterIndex)
+              if (trackIDToBool.at (*track).at ("claimed") || trackIDToInt.at (*track).at ("clusterIndex") == (Int_t) clusterIndex)
                 continue;
-              double distance = fabs (clusterIDToDouble.at (clusterIndex).at ("z") - trackIDToDouble.at (*track).at ("z")) / hypot (clusterIDToDouble.at (clusterIndex).at ("ez"), trackIDToDouble.at (*track).at ("ez"));
+              Double_t distance = fabs (clusterIDToDouble.at (clusterIndex).at ("z") - trackIDToDouble.at (*track).at ("z")) / hypot (clusterIDToDouble.at (clusterIndex).at ("ez"), trackIDToDouble.at (*track).at ("ez"));
               if (nearestDistance < 0.0 || distance < nearestDistance)
                 {
@@ -334 +333 @@
 }
 
-double
-VertexFinder::weight (const unsigned trackID)
+Double_t
+VertexFinder::weight (const UInt_t trackID)
 {
   return ((trackIDToDouble.at (trackID).at ("pt") / (trackIDToDouble.at (trackID).at ("ept") * trackIDToDouble.at (trackID).at ("ez"))) * (trackIDToDouble.at (trackID).at ("pt") / (trackIDToDouble.at (trackID).at ("ept") * trackIDToDouble.at (trackID).at ("ez"))));
@@ -341 +340 @@
 
 void
-VertexFinder::removeTrackFromCluster (const unsigned trackID, const unsigned clusterID)
-{
-  double wz = weight (trackID);
+VertexFinder::removeTrackFromCluster (const UInt_t trackID, const UInt_t clusterID)
+{
+  Double_t wz = weight (trackID);
 
   trackIDToInt[trackID]["clusterIndex"] = -1;
@@ -357 +356 @@
 
 void
-VertexFinder::addTrackToCluster (const unsigned trackID, const unsigned clusterID)
-{
-  double wz = weight (trackID);
+VertexFinder::addTrackToCluster (const UInt_t trackID, const UInt_t clusterID)
+{
+  Double_t wz = weight (trackID);
 
   if (!clusterIDToInt.count (clusterID))