Changeset 641cb3d in git

Timestamp:

May 18, 2016, 11:25:44 AM (8 years ago)

Author:

Michele Selvaggi <michele.selvaggi@…>

Branches:

ImprovedOutputFile, Timing, dual_readout, llp, master

Children:

5658083

Parents:

786028a

Message:

removed couts

File:

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

modules/VertexFinder.cc

@@ -121 +121 @@
       if (!clusterIDToInt.at (cluster->first).at ("ndf"))
         continue;
+        
       // Grow the cluster if GrowSeeds is true
       if (fGrowSeeds)
@@ -127 +128 @@
       // If the cluster still has fewer than MinNDF tracks, release the tracks;
       // otherwise, mark the seed track as claimed
+      
       if ((int) clusterIDToInt.at (cluster->first).at ("ndf") < fMinNDF)
         {
@@ -162 +164 @@
   for (map<unsigned, map<string, int> >::const_iterator cluster = clusterIDToInt.begin (); cluster != clusterIDToInt.end (); cluster++)
   {
+    
     if (cluster->second.at ("ndf") < fMinNDF)
       continue;
@@ -167 +170 @@
   }
   sort (clusterSumPT2.begin (), clusterSumPT2.end (), secondDescending);
+  
   for (vector<pair<unsigned, double> >::const_iterator cluster = clusterSumPT2.begin (); cluster != clusterSumPT2.end (); cluster++)
   {
@@ -272 +276 @@
       if (!nearTracks.size ())
         {
-          for (map<unsigned, map<string, double> >::const_iterator track = trackIDToDouble.begin (); track != trackIDToDouble.end (); track++)
+        
+            for (map<unsigned, map<string, double> >::const_iterator track = trackIDToDouble.begin (); track != trackIDToDouble.end (); track++)
             {
               if (trackIDToBool.at (track->first).at ("claimed") || trackIDToInt.at (track->first).at ("clusterIndex") == (int) clusterIndex)
                 continue;
+                
+              Double_t sz_tr =  track->second.at ("ez") *  track->second.at ("z");
+              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);
               if (nearestDistance < 0.0 || distance < nearestDistance)
                 {
@@ -286 +296 @@
             }
         }
+      
       else
         {
@@ -300 +311 @@
             }
         }
-
+      
       // If no tracks within Sigma of the cluster were found, stop growing.
       done = nearestDistance > fSigma || nearestDistance < 0.0;