Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: name change of FTF -> GBTS seeding #2853

Merged
merged 14 commits into from
Jan 9, 2024
Merged

refactor: name change of FTF -> GBTS seeding #2853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
cdbdc26
print statements for debugging
Rosie-Hasan Oct 24, 2023
25fbf28
adding print statements to debug FPE error
Rosie-Hasan Oct 26, 2023
59d5f4b
Merge remote-tracking branch 'upstream/main' into main
Rosie-Hasan Oct 26, 2023
538e63b
Merge remote-tracking branch 'upstream/main' into main
Rosie-Hasan Nov 14, 2023
abfc418
resolving conflicts
Rosie-Hasan Dec 21, 2023
056e3d6
Name change to Gbts
Rosie-Hasan Dec 21, 2023
27d2199
fixing include mistake
Rosie-Hasan Dec 21, 2023
ac4c5aa
running clang format
Rosie-Hasan Dec 21, 2023
2546a86
Merge branch 'main' into GBTS
AJPfleger Jan 8, 2024
bf1485c
Changing variable names
Rosie-Hasan Jan 9, 2024
3f46e92
fixing variable name
Rosie-Hasan Jan 9, 2024
103ffd7
Apply suggestions from code review
Rosie-Hasan Jan 9, 2024
ab152bd
fixing variable names
Rosie-Hasan Jan 9, 2024
1e72a53
Merge branch 'main' into GBTS
AJPfleger Jan 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions Core/include/Acts/Seeding/TrigBase.hpp → Core/include/Acts/Seeding/GbtsBase.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#pragma once

// TODO: update to C++17 style
#include "Acts/Seeding/GNN_TrackingFilter.hpp"
#include "Acts/Seeding/GbtsTrackingFilter.hpp"

#include <cmath>

Expand All @@ -23,23 +23,23 @@ class TrigInDetTriplet {
public:
TrigInDetTriplet() = delete; // to prevent creation w/o initialization

TrigInDetTriplet(Acts::FTF_SP<space_point_t> s1,
Acts::FTF_SP<space_point_t> s2,
Acts::FTF_SP<space_point_t> s3, float Q)
TrigInDetTriplet(Acts::GbtsSP<space_point_t> s1,
Acts::GbtsSP<space_point_t> s2,
Acts::GbtsSP<space_point_t> s3, float Q)
: m_s1(std::move(s1)), m_s2(std::move(s2)), m_s3(std::move(s3)), m_Q(Q) {}

TrigInDetTriplet(TrigInDetTriplet* t)
: m_s1(t->m_s1), m_s2(t->m_s2), m_s3(t->m_s3), m_Q(t->m_Q) {}

const Acts::FTF_SP<space_point_t>& s1() const { return m_s1; }
const Acts::FTF_SP<space_point_t>& s2() const { return m_s2; }
const Acts::FTF_SP<space_point_t>& s3() const { return m_s3; }
const Acts::GbtsSP<space_point_t>& s1() const { return m_s1; }
const Acts::GbtsSP<space_point_t>& s2() const { return m_s2; }
const Acts::GbtsSP<space_point_t>& s3() const { return m_s3; }
float Q() const { return m_Q; }
void Q(double newQ) { m_Q = newQ; }

protected:
Acts::FTF_SP<space_point_t> m_s1;
Acts::FTF_SP<space_point_t> m_s2;
Acts::FTF_SP<space_point_t> m_s3;
Acts::GbtsSP<space_point_t> m_s1;
Acts::GbtsSP<space_point_t> m_s2;
Acts::GbtsSP<space_point_t> m_s3;
float m_Q; // Quality
};
107 changes: 51 additions & 56 deletions .../include/Acts/Seeding/GNN_DataStorage.hpp → .../include/Acts/Seeding/GbtsDataStorage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

// TODO: update to C++17 style
#include "Acts/Definitions/Algebra.hpp"
#include "Acts/Seeding/GNN_Geometry.hpp"
#include "Acts/Seeding/GbtsGeometry.hpp"

#include <algorithm>
#include <map>
Expand All @@ -23,12 +23,12 @@ constexpr std::size_t N_SEG_CONNS = 6; // was 6

// new sp struct
template <typename space_point_t>
struct FTF_SP {
struct GbtsSP {
const space_point_t *SP; // want inside to have pointer
int FTF_ID;
int gbtsID;
int combined_ID;
FTF_SP(const space_point_t *sp, int id, int combined_id)
: SP(sp), FTF_ID(id), combined_ID{combined_id} {
GbtsSP(const space_point_t *sp, int id, int combined_id)
: SP(sp), gbtsID(id), combined_ID{combined_id} {
if (SP->sourceLinks().size() == 1) { // pixels have 1 SL
m_isPixel = true;
} else {
Expand All @@ -44,18 +44,18 @@ struct FTF_SP {
};

template <typename space_point_t>
class TrigFTF_GNN_Node {
class GbtsNode {
public:
struct CompareByPhi {
bool operator()(const TrigFTF_GNN_Node<space_point_t> *n1,
const TrigFTF_GNN_Node<space_point_t> *n2) {
return (n1->m_sp_FTF.phi() < n2->m_sp_FTF.phi());
bool operator()(const GbtsNode<space_point_t> *n1,
const GbtsNode<space_point_t> *n2) {
return (n1->m_spGbts.phi() < n2->m_spGbts.phi());
}
};

TrigFTF_GNN_Node(const FTF_SP<space_point_t> &FTF_sp, float minT = -100.0,
float maxT = 100.0)
: m_sp_FTF(FTF_sp), m_minCutOnTau(minT), m_maxCutOnTau(maxT) {}
GbtsNode(const GbtsSP<space_point_t> &spGbts, float minT = -100.0,
float maxT = 100.0)
: m_spGbts(spGbts), m_minCutOnTau(minT), m_maxCutOnTau(maxT) {}

inline void addIn(int i) {
if (m_in.size() < MAX_SEG_PER_NODE) {
Expand Down Expand Up @@ -84,20 +84,20 @@ class TrigFTF_GNN_Node {
}
}

const FTF_SP<space_point_t> &m_sp_FTF;
const GbtsSP<space_point_t> &m_spGbts;

std::vector<unsigned int> m_in; // indices of the edges in the edge storage
std::vector<unsigned int> m_out;
float m_minCutOnTau, m_maxCutOnTau;
};

template <typename space_point_t>
class TrigFTF_GNN_EtaBin {
class GbtsEtaBin {
public:
TrigFTF_GNN_EtaBin() { m_vn.clear(); }
GbtsEtaBin() { m_vn.clear(); }

~TrigFTF_GNN_EtaBin() {
for (typename std::vector<TrigFTF_GNN_Node<space_point_t> *>::iterator it =
~GbtsEtaBin() {
for (typename std::vector<GbtsNode<space_point_t> *>::iterator it =
m_vn.begin();
it != m_vn.end(); ++it) {
delete (*it);
Expand All @@ -106,17 +106,17 @@ class TrigFTF_GNN_EtaBin {

void sortByPhi() {
std::sort(m_vn.begin(), m_vn.end(),
typename Acts::TrigFTF_GNN_Node<space_point_t>::CompareByPhi());
typename Acts::GbtsNode<space_point_t>::CompareByPhi());
}

bool empty() const { return m_vn.empty(); }

void generatePhiIndexing(float dphi) {
for (unsigned int nIdx = 0; nIdx < m_vn.size(); nIdx++) {
TrigFTF_GNN_Node<space_point_t> *pN = m_vn.at(nIdx);
GbtsNode<space_point_t> *pN = m_vn.at(nIdx);
// float phi = pN->m_sp.phi();
// float phi = (std::atan(pN->m_sp.x() / pN->m_sp.y()));
float phi = pN->m_sp_FTF.phi();
float phi = pN->m_spGbts.phi();
if (phi <= M_PI - dphi) {
continue;
}
Expand All @@ -126,14 +126,14 @@ class TrigFTF_GNN_EtaBin {
}

for (unsigned int nIdx = 0; nIdx < m_vn.size(); nIdx++) {
TrigFTF_GNN_Node<space_point_t> *pN = m_vn.at(nIdx);
float phi = pN->m_sp_FTF.phi();
GbtsNode<space_point_t> *pN = m_vn.at(nIdx);
float phi = pN->m_spGbts.phi();
m_vPhiNodes.push_back(std::pair<float, unsigned int>(phi, nIdx));
}

for (unsigned int nIdx = 0; nIdx < m_vn.size(); nIdx++) {
TrigFTF_GNN_Node<space_point_t> *pN = m_vn.at(nIdx);
float phi = pN->m_sp_FTF.phi();
GbtsNode<space_point_t> *pN = m_vn.at(nIdx);
float phi = pN->m_spGbts.phi();
if (phi >= -M_PI + dphi) {
break;
}
Expand All @@ -142,26 +142,25 @@ class TrigFTF_GNN_EtaBin {
}
}

std::vector<TrigFTF_GNN_Node<space_point_t> *> m_vn;
std::vector<GbtsNode<space_point_t> *> m_vn;
// TODO change to
// std::vector<std::unique_ptr<TrigFTF_GNN_Node<space_point_t>>> m_vn;
// std::vector<std::unique_ptr<GbtsNode<space_point_t>>> m_vn;
std::vector<std::pair<float, unsigned int>> m_vPhiNodes;
};

template <typename space_point_t>
class TrigFTF_GNN_DataStorage {
class GbtsDataStorage {
public:
TrigFTF_GNN_DataStorage(const TrigFTF_GNN_Geometry<space_point_t> &g)
: m_geo(g) {
GbtsDataStorage(const GbtsGeometry<space_point_t> &g) : m_geo(g) {
m_etaBins.reserve(g.num_bins());
for (int k = 0; k < g.num_bins(); k++) {
m_etaBins.emplace_back(TrigFTF_GNN_EtaBin<space_point_t>());
m_etaBins.emplace_back(GbtsEtaBin<space_point_t>());
}
}

int addSpacePoint(const FTF_SP<space_point_t> &sp, bool useClusterWidth) {
const TrigFTF_GNN_Layer<space_point_t> *pL =
m_geo.getTrigFTF_GNN_LayerByKey(sp.combined_ID);
int addSpacePoint(const GbtsSP<space_point_t> &sp, bool useClusterWidth) {
const GbtsLayer<space_point_t> *pL =
m_geo.getGbtsLayerByKey(sp.combined_ID);

if (pL == nullptr) {
return -1;
Expand All @@ -186,7 +185,7 @@ class TrigFTF_GNN_DataStorage {
1.6 + 0.15 / (cluster_width + 0.2) + 6.1 * (cluster_width - 0.2);
}

m_etaBins.at(binIndex).m_vn.push_back(new TrigFTF_GNN_Node<space_point_t>(
m_etaBins.at(binIndex).m_vn.push_back(new GbtsNode<space_point_t>(
sp, min_tau, max_tau)); // adding ftf member to nodes
} else {
if (useClusterWidth) {
Expand All @@ -195,16 +194,15 @@ class TrigFTF_GNN_DataStorage {
return -3;
}
}
m_etaBins.at(binIndex).m_vn.push_back(
new TrigFTF_GNN_Node<space_point_t>(sp));
m_etaBins.at(binIndex).m_vn.push_back(new GbtsNode<space_point_t>(sp));
}

return 0;
}

// for safety to prevent passing as copy
TrigFTF_GNN_DataStorage(const TrigFTF_GNN_DataStorage &) = delete;
TrigFTF_GNN_DataStorage &operator=(const TrigFTF_GNN_DataStorage &) = delete;
GbtsDataStorage(const GbtsDataStorage &) = delete;
GbtsDataStorage &operator=(const GbtsDataStorage &) = delete;

unsigned int numberOfNodes() const {
unsigned int n = 0;
Expand All @@ -215,13 +213,11 @@ class TrigFTF_GNN_DataStorage {
return n;
}

void getConnectingNodes(
std::vector<const TrigFTF_GNN_Node<space_point_t> *> &vn) {
void getConnectingNodes(std::vector<const GbtsNode<space_point_t> *> &vn) {
vn.clear();
vn.reserve(numberOfNodes());
for (const auto &b : m_etaBins) {
for (typename std::vector<
TrigFTF_GNN_Node<space_point_t> *>::const_iterator nIt =
for (typename std::vector<GbtsNode<space_point_t> *>::const_iterator nIt =
b.m_vn.begin();
nIt != b.m_vn.end(); ++nIt) {
if ((*nIt)->m_in.empty()) {
Expand All @@ -247,55 +243,54 @@ class TrigFTF_GNN_DataStorage {
}
}

const TrigFTF_GNN_EtaBin<space_point_t> &getEtaBin(int idx) const {
const GbtsEtaBin<space_point_t> &getEtaBin(int idx) const {
if (idx >= static_cast<int>(m_etaBins.size())) {
idx = idx - 1;
}
return m_etaBins.at(idx);
}

protected:
const TrigFTF_GNN_Geometry<space_point_t> &m_geo;
const GbtsGeometry<space_point_t> &m_geo;

std::vector<TrigFTF_GNN_EtaBin<space_point_t>> m_etaBins;
std::vector<GbtsEtaBin<space_point_t>> m_etaBins;
};

template <typename space_point_t>
class TrigFTF_GNN_Edge {
class GbtsEdge {
public:
struct CompareLevel {
public:
bool operator()(const TrigFTF_GNN_Edge *pS1, const TrigFTF_GNN_Edge *pS2) {
bool operator()(const GbtsEdge *pS1, const GbtsEdge *pS2) {
return pS1->m_level > pS2->m_level;
}
};

TrigFTF_GNN_Edge(TrigFTF_GNN_Node<space_point_t> *n1,
TrigFTF_GNN_Node<space_point_t> *n2, float p1, float p2,
float p3, float p4)
GbtsEdge(GbtsNode<space_point_t> *n1, GbtsNode<space_point_t> *n2, float p1,
float p2, float p3, float p4)
: m_n1(n1), m_n2(n2), m_level(1), m_next(1) {
m_p[0] = p1;
m_p[1] = p2;
m_p[2] = p3;
m_p[3] = p4;
}

TrigFTF_GNN_Edge() : m_n1(nullptr), m_n2(nullptr), m_level(-1), m_next(-1) {}
GbtsEdge() : m_n1(nullptr), m_n2(nullptr), m_level(-1), m_next(-1) {}

// TrigFTF_GNN_Edge(const TrigFTF_GNN_Edge<space_point_t> &e)
// GbtsEdge(const GbtsEdge<space_point_t> &e)
// : m_n1(e.m_n1), m_n2(e.m_n2) {}

// inline void initialize(TrigFTF_GNN_Node<space_point_t> *n1,
// TrigFTF_GNN_Node<space_point_t> *n2) {
// inline void initialize(GbtsNode<space_point_t> *n1,
// GbtsNode<space_point_t> *n2) {
// m_n1 = n1;
// m_n2 = n2;
// m_level = 1;
// m_next = 1;
// m_nNei = 0;
// }

TrigFTF_GNN_Node<space_point_t> *m_n1{nullptr};
TrigFTF_GNN_Node<space_point_t> *m_n2{nullptr};
GbtsNode<space_point_t> *m_n1{nullptr};
GbtsNode<space_point_t> *m_n2{nullptr};

signed char m_level{}, m_next{};

Expand Down
Loading
Loading