diff --git a/Core/include/Acts/Seeding/GbtsDataStorage.hpp b/Core/include/Acts/Seeding/GbtsDataStorage.hpp index 879a5a1240c..6b481e1fef9 100644 --- a/Core/include/Acts/Seeding/GbtsDataStorage.hpp +++ b/Core/include/Acts/Seeding/GbtsDataStorage.hpp @@ -27,28 +27,22 @@ constexpr std::size_t N_SEG_CONNS = 6; // was 6 template struct GbtsSP { const space_point_t *SP; // want inside to have pointer - int gbtsID; // used to access detector layer information in connector input - // file - int combined_ID; // includes eta id which references the detector module - bool m_isPixel; + int gbtsID; + int combined_ID; float m_phi; float m_r; float m_ClusterWidth; - GbtsSP(const space_point_t *sp, int id, int combined_id, bool isPixel, - float ClusterWidth) + GbtsSP(const space_point_t *sp, int id, int combined_id, float ClusterWidth) : SP(sp), gbtsID(id), combined_ID{combined_id}, - m_isPixel(isPixel), m_ClusterWidth(ClusterWidth) { m_phi = std::atan2(SP->y(), SP->x()); m_r = std::sqrt((SP->x() * SP->x()) + (SP->y() * SP->y())); }; - bool isPixel() const { return m_isPixel; } - bool isStrip() const { return !m_isPixel; } float phi() const { return m_phi; } float r() const { return m_r; } - float ClusterWidth() const { return m_ClusterWidth; } + bool ClusterWidth() const { return m_ClusterWidth; } }; template @@ -183,6 +177,8 @@ class GbtsDataStorage { } else { if (useClusterWidth) { float cluster_width = sp.ClusterWidth(); + // if (cluster_width == 0) {continue;} //catch for casses that dont have + // cluster width available if (cluster_width > 0.2) { return -3; } diff --git a/Core/include/Acts/Seeding/SeedFinderGbts.ipp b/Core/include/Acts/Seeding/SeedFinderGbts.ipp index 4635e8457a3..855b7a386e9 100644 --- a/Core/include/Acts/Seeding/SeedFinderGbts.ipp +++ b/Core/include/Acts/Seeding/SeedFinderGbts.ipp @@ -46,10 +46,6 @@ void SeedFinderGbts::loadSpacePoints( const std::vector>& gbtsSPvect) { ACTS_VERBOSE("Loading space points"); for (const auto& gbtssp : gbtsSPvect) { - bool is_Pixel = gbtssp.isPixel(); - if (!is_Pixel) { - continue; - } m_storage->addSpacePoint(gbtssp, (m_config.m_useClusterWidth > 0)); } @@ -307,12 +303,12 @@ void SeedFinderGbts::runGbts_TrackFinder( nEdges++; } } // loop over n2 (outer) nodes - } // loop over n1 (inner) nodes - } // loop over source eta bins - } // loop over dst eta bins - } // loop over L2(L1) layers - } // loop over dst layers - } // loop over the stages of doublet making + } // loop over n1 (inner) nodes + } // loop over source eta bins + } // loop over dst eta bins + } // loop over L2(L1) layers + } // loop over dst layers + } // loop over the stages of doublet making std::vector*> vNodes; @@ -655,31 +651,32 @@ void SeedFinderGbts::createSeeds( return; } - m_triplets.clear(); // member of class , saying not declared, maybe public? + m_triplets.clear(); for (auto& track : vTracks) { for (auto& seed : track.m_seeds) { // access member of GbtsTrigTracklet - - float newQ = seed.Q(); // function of TrigInDetTriplet - if (m_config.m_LRTmode) { - // In LRT mode penalize pixels in Triplets - if (seed.s1().isPixel()) { - newQ += 1000; // functions of TrigSiSpacePointBase - } - if (seed.s2().isPixel()) { - newQ += 1000; - } - if (seed.s3().isPixel()) { - newQ += 1000; - } - } else { - // In normal (non LRT) mode penalise SSS by 1000, PSS (if enabled) and - // PPS by 10000 - if (seed.s3().isStrip()) { - newQ += seed.s1().isStrip() ? 1000.0 : 10000.0; - } - } - seed.Q(newQ); + // Currently not used, but leaving in to use concept in future development + // float newQ = seed.Q(); // function of TrigInDetTriplet + // if (m_config.m_LRTmode) { + // // In LRT mode penalize pixels in Triplets + // if (seed.s1().isPixel()) { + // newQ += 1000; // functions of TrigSiSpacePointBase + // } + // if (seed.s2().isPixel()) { + // newQ += 1000; + // } + // if (seed.s3().isPixel()) { + // newQ += 1000; + // } + // } else { + // // In normal (non LRT) mode penalise SSS by 1000, PSS (if enabled) + // and + // // PPS by 10000 + // if (seed.s3().isSCT()) { + // newQ += seed.s1().isSCT() ? 1000.0 : 10000.0; + // } + // } + // seed.Q(newQ); m_triplets.emplace_back(seed); } } diff --git a/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp b/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp index 9c62c877889..afaa7cadd07 100644 --- a/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp +++ b/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp @@ -48,7 +48,6 @@ struct SeedFinderGbtsConfig { std::vector m_layerGeometry; // for runGbts_TrackFinder - bool m_LRTmode = true; // eventually want to set from full chain bool m_useEtaBinning = true; // bool to use eta binning from geometry structure bool m_doubletFilterRZ = true; // bool applies new Z cuts on doublets diff --git a/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp index d712abe3fc8..a129a8a65d4 100644 --- a/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp +++ b/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp @@ -217,14 +217,10 @@ ActsExamples::GbtsSeedingAlgorithm::MakeGbtsSpacePoints( int eta_mod = Find->second.second; int combined_id = Gbts_id * 1000 + eta_mod; - // check if SP is pixel, dependent of type of SP so must be done in - // examples - bool isPixel = (sourceLink.size() == 1); // pixels have 1 SL - float ClusterWidth = 0; // false input as this is not available in examples // fill Gbts vector with current sapce point and ID - gbtsSpacePoints.emplace_back(&spacePoint, Gbts_id, combined_id, isPixel, + gbtsSpacePoints.emplace_back(&spacePoint, Gbts_id, combined_id, ClusterWidth); // make new GbtsSP here ! } }