Skip to content

Commit

Permalink
Fix bug in caching of surface deformations.
Browse files Browse the repository at this point in the history
This bug has an effect if the DetUnits of a large tracker structure
are not listed at all. The net effect of this fix is that omitting
them leaves them and the associated surface deformations unchanged.
  • Loading branch information
gregor-mittag committed Nov 6, 2015
1 parent bfa13b1 commit 45f2661
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Alignment/CommonAlignment/interface/Alignable.h
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
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

0 comments on commit 45f2661

Please sign in to comment.