Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
dimitra97 committed Jun 28, 2024
1 parent 2e642d8 commit 812cd2c
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 2,549 deletions.
22 changes: 11 additions & 11 deletions Core/include/Acts/Seeding/HoughVectors.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ class MultiIndexedVector2D {

public:
MultiIndexedVector2D() : m_d1(0), m_d2(0) {
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::WARNING);
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
}

MultiIndexedVector2D(std::size_t d1, std::size_t d2, T const& t = T())
: m_d1(d1), m_d2(d2), m_data(d1 * d2, t) {
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::WARNING);
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
}

std::size_t size(int dim) const {
Expand All @@ -43,7 +43,7 @@ class MultiIndexedVector2D {
if (dim == 1) {
return m_d2;
} else {
ACTS_WARNING("MultiIndexedVector2D: Argument to size() must be 0 or 1");
ACTS_ERROR("MultiIndexedVector2D: Argument to size() must be 0 or 1");
return 0;
}
}
Expand All @@ -59,7 +59,7 @@ class MultiIndexedVector2D {
std::stringstream s;
s << "MultiIndexedVector2D out of bounds: request (" << i << "," << j
<< ") size (" << m_d1 << "," << m_d2 << ")";
ACTS_WARNING(s.str());
ACTS_ERROR(s.str());
}
return m_data[i * m_d2 + j];
}
Expand All @@ -72,7 +72,7 @@ class MultiIndexedVector2D {
std::stringstream s;
s << "MultiIndexedVector2D out of bounds: request (" << i << "," << j
<< ") size (" << m_d1 << "," << m_d2 << ")";
ACTS_WARNING(s.str());
ACTS_ERROR(s.str());
}
return m_data[i * m_d2 + j];
}
Expand All @@ -86,7 +86,7 @@ class MultiIndexedVector2D {
std::stringstream s;
s << "MultiIndexedVector2D out of bounds: request " << i << " size ("
<< m_d1 << "," << m_d2 << ")";
ACTS_WARNING(s.str());
ACTS_ERROR(s.str());
}
return m_data.data() + (i * m_d2);
}
Expand All @@ -96,7 +96,7 @@ class MultiIndexedVector2D {
std::stringstream s;
s << "MultiIndexedVector2D out of bounds: request " << i << " size ("
<< m_d1 << "," << m_d2 << ")";
ACTS_WARNING(s.str());
ACTS_ERROR(s.str());
}
return m_data.data() + (i * m_d2);
}
Expand All @@ -121,21 +121,21 @@ class MultiIndexedVector3D {

public:
MultiIndexedVector3D() : m_d1(0), m_d2(0), m_d3(0) {
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::WARNING);
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
}

MultiIndexedVector3D(std::size_t d1, std::size_t d2, std::size_t d3,
T const& t = T())
: m_d1(d1), m_d2(d2), m_d3(d3), m_data(d1 * d2 * d3, t) {
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::WARNING);
m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
}

T& operator()(std::size_t i, std::size_t j, std::size_t k) {
if (i >= m_d1 || j >= m_d2 || k >= m_d3) {
std::stringstream s;
s << "MultiIndexedVector3D out of bounds: request (" << i << "," << j
<< "," << k << ") size (" << m_d1 << "," << m_d2 << "," << m_d3 << ")";
ACTS_WARNING(s.str());
ACTS_ERROR(s.str());
}
return m_data[i * m_d2 * m_d3 + j * m_d3 + k];
}
Expand All @@ -145,7 +145,7 @@ class MultiIndexedVector3D {
std::stringstream s;
s << "MultiIndexedVector3D out of bounds: request (" << i << "," << j
<< "," << k << ") size (" << m_d1 << "," << m_d2 << "," << m_d3 << ")";
ACTS_WARNING(s.str());
ACTS_ERROR(s.str());
}
return m_data[i * m_d2 * m_d3 + j * m_d3 + k];
}
Expand Down
1 change: 0 additions & 1 deletion Tests/UnitTests/Core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ add_unittest(Version VersionTests.cpp)
add_subdirectory(Clusterization)
add_subdirectory(Definitions)
add_subdirectory(Detector)
add_subdirectory(EventData)
add_subdirectory(Geometry)
add_subdirectory(MagneticField)
add_subdirectory(Material)
Expand Down
Loading

0 comments on commit 812cd2c

Please sign in to comment.