Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit 998d773c authored by kraus's avatar kraus
Browse files

Missed some getCoordTransformationTo. Fixing this

parent 6987642e
No related branches found
No related tags found
1 merge request!74Missed some getCoordTransformationTo. Fixing this
...@@ -161,7 +161,7 @@ ParallelTTracker::~ParallelTTracker() { ...@@ -161,7 +161,7 @@ ParallelTTracker::~ParallelTTracker() {
void ParallelTTracker::visitBeamline(const Beamline &bl) { void ParallelTTracker::visitBeamline(const Beamline &bl) {
const FlaggedBeamline* fbl = static_cast<const FlaggedBeamline*>(&bl); const FlaggedBeamline* fbl = static_cast<const FlaggedBeamline*>(&bl);
if (fbl->getRelativeFlag()) { if (fbl->getRelativeFlag()) {
OpalBeamline stash(fbl->getOrigin3D(), fbl->getCoordTransformationTo()); OpalBeamline stash(fbl->getOrigin3D(), fbl->getInitialDirection());
stash.swap(itsOpalBeamline_m); stash.swap(itsOpalBeamline_m);
fbl->iterate(*this, false); fbl->iterate(*this, false);
itsOpalBeamline_m.prepareSections(); itsOpalBeamline_m.prepareSections();
......
...@@ -147,9 +147,8 @@ public: ...@@ -147,9 +147,8 @@ public:
void setOrigin3D(const Vector_t& ori); void setOrigin3D(const Vector_t& ori);
Vector_t getOrigin3D() const; Vector_t getOrigin3D() const;
void setInitialDirection(const Quaternion& rot);
void setCoordTransformationTo(const Quaternion& trafoTo); Quaternion getInitialDirection() const;
Quaternion getCoordTransformationTo() const;
void setRelativeFlag(bool flag); void setRelativeFlag(bool flag);
bool getRelativeFlag() const; bool getRelativeFlag() const;
...@@ -453,12 +452,12 @@ Vector_t TBeamline<T>::getOrigin3D() const { ...@@ -453,12 +452,12 @@ Vector_t TBeamline<T>::getOrigin3D() const {
} }
template <class T> inline template <class T> inline
void TBeamline<T>::setCoordTransformationTo(const Quaternion& trafoTo) { void TBeamline<T>::setInitialDirection(const Quaternion& trafoTo) {
itsCoordTrafoTo_m = trafoTo; itsCoordTrafoTo_m = trafoTo;
} }
template <class T> inline template <class T> inline
Quaternion TBeamline<T>::getCoordTransformationTo() const { Quaternion TBeamline<T>::getInitialDirection() const {
return itsCoordTrafoTo_m; return itsCoordTrafoTo_m;
} }
......
...@@ -232,9 +232,9 @@ void Line::parse(Statement &stat) { ...@@ -232,9 +232,9 @@ void Line::parse(Statement &stat) {
Quaternion rotTheta(cos(0.5 * theta), 0, -sin(0.5 * theta), 0); Quaternion rotTheta(cos(0.5 * theta), 0, -sin(0.5 * theta), 0);
Quaternion rotPhi(cos(0.5 * phi), -sin(0.5 * phi), 0, 0); Quaternion rotPhi(cos(0.5 * phi), -sin(0.5 * phi), 0, 0);
Quaternion rotPsi(cos(0.5 * psi), 0, 0, -sin(0.5 * psi)); Quaternion rotPsi(cos(0.5 * psi), 0, 0, -sin(0.5 * psi));
line->setCoordTransformationTo(rotPsi * rotPhi * rotTheta); line->setInitialDirection(rotPsi * rotPhi * rotTheta);
} else { } else {
line->setCoordTransformationTo(Quaternion(1, 0, 0, 0)); line->setInitialDirection(Quaternion(1, 0, 0, 0));
if (itsAttr[ORIENTATION]) { if (itsAttr[ORIENTATION]) {
throw OpalException("Line::parse","Parameter orientation is array of 3 values (theta, phi, psi);\n" + throw OpalException("Line::parse","Parameter orientation is array of 3 values (theta, phi, psi);\n" +
std::to_string(direction.size()) + " values provided"); std::to_string(direction.size()) + " values provided");
...@@ -256,7 +256,7 @@ void Line::parse(Statement &stat) { ...@@ -256,7 +256,7 @@ void Line::parse(Statement &stat) {
Quaternion rotPsi(cos(0.5 * psi), 0, 0, -sin(0.5 * psi)); Quaternion rotPsi(cos(0.5 * psi), 0, 0, -sin(0.5 * psi));
line->setOrigin3D(origin); line->setOrigin3D(origin);
line->setCoordTransformationTo(rotPsi * rotPhi * rotTheta); line->setInitialDirection(rotPsi * rotPhi * rotTheta);
line->setRelativeFlag(!itsAttr[X].defaultUsed() || line->setRelativeFlag(!itsAttr[X].defaultUsed() ||
!itsAttr[Y].defaultUsed() || !itsAttr[Y].defaultUsed() ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment