Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug in caching of surface deformations. #12280

Merged
merged 1 commit into from
Nov 6, 2015
+10 −1
Merged

Fix bug in caching of surface deformations. #12280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/Alignable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class Alignable
/// and pointers to surface deformations
virtual int surfaceDeformationIdPairs(std::vector<std::pair<int,SurfaceDeformation*> > &) const = 0;

/// cache the current position, rotation and other parameters (e.g. surface deformations)
/// cache the current position, rotation and other parameters (e.g. surface deformations), also for possible components
virtual void cacheTransformation();

/// restore the previously cached transformation, also for possible components
Expand Down
9 changes: 9 additions & 0 deletions Alignment/CommonAlignment/src/Alignable.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,9 +243,18 @@ AlignmentSurfaceDeformations* Alignable::surfaceDeformations( void ) const

void Alignable::cacheTransformation()
{
// first treat itself
theCachedSurface = theSurface;
theCachedDisplacement = theDisplacement;
theCachedRotation = theRotation;

// now treat components (a clean design would move that to AlignableComposite...)
const Alignables comps(this->components());

for (auto it = comps.begin(); it != comps.end(); ++it) {
(*it)->cacheTransformation();
}

}

void Alignable::restoreCachedTransformation()
Expand Down