Commit c69093c2 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'typo' into 'master'

Fix typo at printing cluster coordinates: was x/y/x instead of x/y/z

See merge request !184
parents e708e6dc 972c3f88
Pipeline #1169703 passed with stages
in 21 minutes and 53 seconds
...@@ -46,9 +46,9 @@ namespace corryvreckan { ...@@ -46,9 +46,9 @@ namespace corryvreckan {
template <typename T> inline std::string to_string_impl(const ROOT::Math::DisplacementVector3D<T>& vec, empty_tag) { template <typename T> inline std::string to_string_impl(const ROOT::Math::DisplacementVector3D<T>& vec, empty_tag) {
std::string res; std::string res;
res += std::to_string(vec.x()); res += std::to_string(vec.x());
res += ","; res += ", ";
res += std::to_string(vec.y()); res += std::to_string(vec.y());
res += ","; res += ", ";
res += std::to_string(vec.z()); res += std::to_string(vec.z());
return res; return res;
} }
...@@ -73,7 +73,7 @@ namespace corryvreckan { ...@@ -73,7 +73,7 @@ namespace corryvreckan {
template <typename T> inline std::string to_string_impl(const ROOT::Math::DisplacementVector2D<T>& vec, empty_tag) { template <typename T> inline std::string to_string_impl(const ROOT::Math::DisplacementVector2D<T>& vec, empty_tag) {
std::string res; std::string res;
res += std::to_string(vec.x()); res += std::to_string(vec.x());
res += ","; res += ", ";
res += std::to_string(vec.y()); res += std::to_string(vec.y());
return res; return res;
} }
...@@ -123,28 +123,28 @@ namespace corryvreckan { ...@@ -123,28 +123,28 @@ namespace corryvreckan {
*/ */
template <typename T, typename U> template <typename T, typename U>
inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::DisplacementVector3D<T, U>& vec) { inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::DisplacementVector3D<T, U>& vec) {
return os << "(" << vec.x() << "," << vec.y() << "," << vec.z() << ")"; return os << "(" << vec.x() << ", " << vec.y() << ", " << vec.z() << ")";
} }
/** /**
* @brief Overload output stream operator to display ROOT 2D displacement vector * @brief Overload output stream operator to display ROOT 2D displacement vector
*/ */
template <typename T, typename U> template <typename T, typename U>
inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::DisplacementVector2D<T, U>& vec) { inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::DisplacementVector2D<T, U>& vec) {
return os << "(" << vec.x() << "," << vec.y() << ")"; return os << "(" << vec.x() << ", " << vec.y() << ")";
} }
/** /**
* @brief Overload output stream operator to display ROOT 3D position vector * @brief Overload output stream operator to display ROOT 3D position vector
*/ */
template <typename T, typename U> template <typename T, typename U>
inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::PositionVector3D<T, U>& vec) { inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::PositionVector3D<T, U>& vec) {
return os << "(" << vec.x() << "," << vec.y() << "," << vec.z() << ")"; return os << "(" << vec.x() << ", " << vec.y() << ", " << vec.z() << ")";
} }
/** /**
* @brief Overload output stream operator to display ROOT 2D position vector * @brief Overload output stream operator to display ROOT 2D position vector
*/ */
template <typename T, typename U> template <typename T, typename U>
inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::PositionVector2D<T, U>& vec) { inline std::ostream& operator<<(std::ostream& os, const ROOT::Math::PositionVector2D<T, U>& vec) {
return os << "(" << vec.x() << "," << vec.y() << ")"; return os << "(" << vec.x() << ", " << vec.y() << ")";
} }
} // namespace corryvreckan } // namespace corryvreckan
......
...@@ -57,7 +57,7 @@ const Pixel* Cluster::getSeedPixel() const { ...@@ -57,7 +57,7 @@ const Pixel* Cluster::getSeedPixel() const {
} }
void Cluster::print(std::ostream& out) const { void Cluster::print(std::ostream& out) const {
out << "Cluster " << this->m_local.x() << ", " << this->m_local.y() << ", " << this->m_global.x() << ", " out << "Cluster " << this->m_local.x() << ", " << this->m_local.y() << ", " << this->m_global << ", " << this->m_charge
<< this->m_global.y() << ", " << this->m_global.x() << ", " << this->m_charge << ", " << this->m_split << ", " << ", " << this->m_split << ", " << this->m_pixels.size() << ", " << this->m_columnWidth << ", " << this->m_rowWidth
<< this->m_pixels.size() << ", " << this->m_columnWidth << ", " << this->m_rowWidth << ", " << this->timestamp(); << ", " << this->timestamp();
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment