diff --git a/Core/include/Acts/Seeding/GbtsDataStorage.hpp b/Core/include/Acts/Seeding/GbtsDataStorage.hpp index defd6c43f08..350d000158b 100644 --- a/Core/include/Acts/Seeding/GbtsDataStorage.hpp +++ b/Core/include/Acts/Seeding/GbtsDataStorage.hpp @@ -31,17 +31,22 @@ struct GbtsSP { int combined_ID; bool m_isPixel; float m_phi; - float m_r; - float m_ClusterWidth ; - GbtsSP(const space_point_t *sp, int id, int combined_id, bool isPixel, float ClusterWidth) - : SP(sp), gbtsID(id), combined_ID{combined_id}, m_isPixel(isPixel), m_ClusterWidth(ClusterWidth) { + float m_r; + float m_ClusterWidth; + GbtsSP(const space_point_t *sp, int id, int combined_id, bool isPixel, + 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())) ; + m_r = std::sqrt((SP->x() * SP->x()) + (SP->y() * SP->y())); }; bool isPixel() const { return m_isPixel; } bool isSCT() const { return !m_isPixel; } float phi() const { return m_phi; } - float r() const {return m_r;} + float r() const { return m_r; } float ClusterWidth() const { return m_ClusterWidth; } }; @@ -165,7 +170,7 @@ class GbtsDataStorage { float max_tau = 100.0; // can't do this bit yet as dont have cluster width if (useClusterWidth) { - float cluster_width = sp.ClusterWidth(); + float cluster_width = sp.ClusterWidth(); min_tau = 6.7 * (cluster_width - 0.2); max_tau = 1.6 + 0.15 / (cluster_width + 0.2) + 6.1 * (cluster_width - 0.2); @@ -176,7 +181,7 @@ class GbtsDataStorage { sp, min_tau, max_tau)); // adding ftf member to nodes } else { if (useClusterWidth) { - float cluster_width = sp.ClusterWidth(); + float cluster_width = sp.ClusterWidth(); if (cluster_width > 0.2) { return -3; } diff --git a/Core/include/Acts/Seeding/SeedFinderGbts.ipp b/Core/include/Acts/Seeding/SeedFinderGbts.ipp index 3c35a2d86a1..d45816e7181 100644 --- a/Core/include/Acts/Seeding/SeedFinderGbts.ipp +++ b/Core/include/Acts/Seeding/SeedFinderGbts.ipp @@ -307,12 +307,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; diff --git a/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp index 0d1b5a5b541..c256c50d8ba 100644 --- a/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp +++ b/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp @@ -86,15 +86,15 @@ ActsExamples::ProcessCode ActsExamples::GbtsSeedingAlgorithm::execute( MakeGbtsSpacePoints(ctx, m_cfg.ActsGbtsMap); for (auto sp : GbtsSpacePoints) { - ACTS_DEBUG("Gbts space points: " << " Gbts_id: " << sp.gbtsID << " z: " - << sp.SP->z() << " r: " << sp.r() - << " ACTS volume: " - << sp.SP->sourceLinks() - .front() - .get() - .geometryId() - .volume() - << "\n"); + ACTS_DEBUG("Gbts space points: " + << " Gbts_id: " << sp.gbtsID << " z: " << sp.SP->z() + << " r: " << sp.r() << " ACTS volume: " + << sp.SP->sourceLinks() + .front() + .get() + .geometryId() + .volume() + << "\n"); } // this is now calling on a core algorithm @@ -219,18 +219,21 @@ ActsExamples::GbtsSeedingAlgorithm::MakeGbtsSpacePoints( // access IDs from map 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 = false ; + + // check if SP is pixel, dependent of type of SP so must be done in + // examples + bool isPixel = false; if (sourceLink.size() == 1) { // pixels have 1 SL isPixel = true; } else { isPixel = false; } - float ClusterWidth = 0 ; //false input as this is not available in examples + 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, ClusterWidth); //make new GbtsSP here ! + gbtsSpacePoints.emplace_back(&spacePoint, Gbts_id, combined_id, isPixel, + ClusterWidth); // make new GbtsSP here ! } } ACTS_VERBOSE("Space points successfully assigned Gbts ID"); diff --git a/Examples/Python/src/TrackFinding.cpp b/Examples/Python/src/TrackFinding.cpp index be1f442d276..753574b7de7 100644 --- a/Examples/Python/src/TrackFinding.cpp +++ b/Examples/Python/src/TrackFinding.cpp @@ -272,10 +272,9 @@ void addTrackFinding(Context& ctx) { ACTS_PYTHON_DECLARE_ALGORITHM( ActsExamples::GbtsSeedingAlgorithm, mex, "GbtsSeedingAlgorithm", - inputSpacePoints, outputSeeds, seedFinderConfig, - seedFinderOptions, layerMappingFile, geometrySelection, trackingGeometry, - ActsGbtsMap, fill_module_csv, inputClusters); //temp removed seedFilterConfig, - + inputSpacePoints, outputSeeds, seedFinderConfig, seedFinderOptions, + layerMappingFile, geometrySelection, trackingGeometry, ActsGbtsMap, + fill_module_csv, inputClusters); ACTS_PYTHON_DECLARE_ALGORITHM( ActsExamples::HoughTransformSeeder, mex, "HoughTransformSeeder",