Commit 5a1fd158 authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Analysis/Detector: fix GCC warnings

parent 6748ecfa
......@@ -418,7 +418,7 @@ void Analysis::run() {
// Print statistics:
Tracks* tracks = reinterpret_cast<Tracks*>(m_clipboard->get("tracks"));
m_tracks += (tracks == nullptr ? 0 : tracks->size());
m_tracks += (tracks == nullptr ? 0 : static_cast<int>(tracks->size()));
bool update_progress = false;
if(m_events % 100 == 0 && m_events != events_prev) {
......
......@@ -153,10 +153,9 @@ void Detector::initialise() {
Rotation3D rotations;
if(m_orientation_mode == "xyz") {
rotations = Rotation3D(ROOT::Math::RotationZ(m_orientation.Z()) * ROOT::Math::RotationY(m_orientation.Y()) *
ROOT::Math::RotationX(m_orientation.X()));
rotations = RotationZ(m_orientation.Z()) * RotationY(m_orientation.Y()) * RotationX(m_orientation.X());
} else if(m_orientation_mode == "zyx") {
rotations = Rotation3D(ROOT::Math::RotationZYX(m_orientation.x(), m_orientation.y(), m_orientation.x()));
rotations = RotationZYX(m_orientation.x(), m_orientation.y(), m_orientation.x());
}
m_localToGlobal = Transform3D(rotations, translations);
......
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