Test

Author: stephenswat

core/include/traccc/seeding/detail/seeding_config.hpp

@@ -191,9 +191,11 @@ struct seedfilter_config {
     float deltaInvHelixDiameter = 0.00003f / unit<float>::mm;
     // the impact parameters (d0) is multiplied by this factor and subtracted
     // from weight
-    float impactWeightFactor = 1.f;
+    float impactWeightFactor = 0.5f;
+    float zOriginWeightFactor = 0.01f;
+    float zOriginDeltaWeightFactor = 1.f;
     // seed weight increased by this value if a compatible seed has been found.
-    float compatSeedWeight = 200.f;
+    float compatSeedWeight = 3.f;
     // minimum distance between compatible seeds to be considered for weight
     // boost
     float deltaRMin = 5.f * unit<float>::mm;
@@ -202,7 +204,7 @@ struct seedfilter_config {
     unsigned int maxSeedsPerSpM = 20;
     // how often do you want to increase the weight of a seed for finding a
     // compatible seed?
-    size_t compatSeedLimit = 2;
+    size_t compatSeedLimit = 1;
     // Tool to apply experiment specific cuts on collected middle space points
 
     size_t max_triplets_per_spM = 5;

device/common/include/traccc/edm/device/device_triplet.hpp

@@ -17,6 +17,8 @@ namespace traccc::device {
 /// Triplets of bottom, middle and top spacepoints
 struct device_triplet {
     // top spacepoint location in internal spacepoint container
+    sp_location spB;
+    sp_location spM;
     sp_location spT;
 
     using link_type = device::triplet_counter_collection_types::host::size_type;

device/common/include/traccc/seeding/device/impl/find_triplets.ipp

@@ -110,8 +110,12 @@ inline void find_triplets(
 
             // Add triplet to jagged vector
             triplets.at(posTriplets++) = device_triplet(
-                {spT_loc, globalIndex, curvature,
-                 -impact_parameter * filter_config.impactWeightFactor,
+                {spB_loc, spM_loc, spT_loc, globalIndex, curvature,
+                 -impact_parameter * filter_config.impactWeightFactor -
+                     std::abs(lb.Zo()) * filter_config.zOriginWeightFactor -
+                     std::abs(lb.Zo() - lt.Zo()) *
+                         filter_config.zOriginDeltaWeightFactor +
+                     1000.f * std::abs(curvature),
                  lb.Zo()});
         }
     }

device/common/include/traccc/seeding/device/impl/select_seeds.ipp

@@ -65,8 +65,9 @@ inline void select_seeds(
     const traccc::details::spacepoint_grid_types::const_view& sp_view,
     const triplet_counter_spM_collection_types::const_view& spM_tc_view,
     const triplet_counter_collection_types::const_view& tc_view,
-    const device_triplet_collection_types::const_view& triplet_view,
-    triplet* data, edm::seed_collection::view seed_view) {
+    device_triplet_collection_types::view& triplet_view, triplet* data,
+    const vecmem::data::vector_view<const unsigned int> votes_per_triplet_view,
+    edm::seed_collection::view seed_view) {
 
     // Check if anything needs to be done.
     const triplet_counter_spM_collection_types::const_device triplet_counts_spM(
@@ -83,7 +84,9 @@ inline void select_seeds(
     const traccc::details::spacepoint_grid_types::const_device sp_device(
         sp_view);
 
-    const device_triplet_collection_types::const_device triplets(triplet_view);
+    device_triplet_collection_types::device triplets(triplet_view);
+    const vecmem::device_vector<const unsigned int> votes_per_triplet(
+        votes_per_triplet_view);
     edm::seed_collection::device seeds_device(seed_view);
 
     // Current work item = middle spacepoint
@@ -97,9 +100,14 @@ inline void select_seeds(
 
     const unsigned int end_triplets_spM =
         spM_counter.posTriplets + spM_counter.m_nTriplets;
+
     // iterate over the triplets in the bin
     for (unsigned int i = spM_counter.posTriplets; i < end_triplets_spM; ++i) {
-        device_triplet aTriplet = triplets[i];
+        device_triplet& aTriplet = triplets[i];
+
+        if (votes_per_triplet.at(i) < 3) {
+            continue;
+        }
 
         // spacepoints bottom and top for this triplet
         const sp_location spB_loc =
@@ -111,16 +119,6 @@ inline void select_seeds(
         const edm::spacepoint_collection::const_device::const_proxy_type spT =
             spacepoints.at(sp_device.bin(spT_loc.bin_idx)[spT_loc.sp_idx]);
 
-        // update weight of triplet
-        seed_selecting_helper::seed_weight(filter_config, spM, spB, spT,
-                                           aTriplet.weight);
-
-        // check if it is a good triplet
-        if (!seed_selecting_helper::single_seed_cut(filter_config, spM, spB,
-                                                    spT, aTriplet.weight)) {
-            continue;
-        }
-
         // if the number of good triplets is larger than the threshold,
         // the triplet with the lowest weight is removed
         if (n_triplets_per_spM >= filter_config.max_triplets_per_spM) {
@@ -169,18 +167,12 @@ inline void select_seeds(
             break;
         }
 
-        // check if it is a good triplet
-        if (seed_selecting_helper::cut_per_middle_sp(filter_config, spacepoints,
-                                                     sp_device, aTriplet) ||
-            n_seeds_per_spM == 0) {
+        n_seeds_per_spM++;
 
-            n_seeds_per_spM++;
-
-            seeds_device.push_back(
-                {sp_device.bin(spB_loc.bin_idx)[spB_loc.sp_idx],
-                 sp_device.bin(spM_loc.bin_idx)[spM_loc.sp_idx],
-                 sp_device.bin(spT_loc.bin_idx)[spT_loc.sp_idx]});
-        }
+        seeds_device.push_back(
+            {sp_device.bin(spB_loc.bin_idx)[spB_loc.sp_idx],
+             sp_device.bin(spM_loc.bin_idx)[spM_loc.sp_idx],
+             sp_device.bin(spT_loc.bin_idx)[spT_loc.sp_idx]});
     }
 }
 

device/common/include/traccc/seeding/device/select_seeds.hpp

@@ -41,7 +41,9 @@ inline void select_seeds(
     const triplet_counter_spM_collection_types::const_view& spM_tc_view,
     const triplet_counter_collection_types::const_view& tc_view,
     const device_triplet_collection_types::const_view& triplet_view,
-    triplet* data, edm::seed_collection::view seed_view);
+    triplet* data,
+    const vecmem::data::vector_view<const unsigned int> votes_per_triplet_view,
+    edm::seed_collection::view seed_view);
 
 }  // namespace traccc::device