Commit 7e3c315d authored by Simon Spannagel's avatar Simon Spannagel
Browse files

Merge branch 'master' into 'master'

small geometry fix

See merge request !5
parents 60263032 177b28a0
Pipeline #219167 passed with stage
in 1 minute and 58 seconds
......@@ -234,7 +234,8 @@ void Alignment::finalise() {
string detectorID = detector->name();
// Do not align the reference plane
if(detectorID == m_config.get<std::string>("reference")) {
if(detectorID == m_config.get<std::string>("reference") ||
detectorID == m_config.get<std::string>("DUT")) {
continue;
}
......
......@@ -107,8 +107,10 @@ void Detector::initialise() {
// Make the local to global transform, built from a displacement and
// rotation
m_translations = new Translation3D(m_displacementX, m_displacementY, m_displacementZ);
RotationZYX zyxRotation(m_rotationZ, m_rotationY, m_rotationX);
m_rotations = new Rotation3D(zyxRotation);
m_rotations = new Rotation3D(ROOT::Math::RotationZ(m_rotationZ) *
ROOT::Math::RotationY(m_rotationY) *
ROOT::Math::RotationX(m_rotationX));
m_localToGlobal = new Transform3D(*m_rotations, *m_translations);
m_globalToLocal = new Transform3D();
(*m_globalToLocal) = m_localToGlobal->Inverse();
......
......@@ -12,6 +12,9 @@
#include "Math/Point3D.h"
#include "Math/Rotation3D.h"
#include "Math/RotationZYX.h"
#include "Math/RotationX.h"
#include "Math/RotationY.h"
#include "Math/RotationZ.h"
#include "Math/Transform3D.h"
#include "Math/Translation3D.h"
#include "Math/Vector3D.h"
......
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