Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
acts-core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
acts
acts-core
Commits
6f3fc1a1
Commit
6f3fc1a1
authored
8 years ago
by
Christian Gumpert
Browse files
Options
Downloads
Plain Diff
Merge branch 'fix_map_accessors' into 'master'
fix map accessors See merge request
!100
parents
33bcee3b
ac83b41a
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Core/src/Detector/GlueVolumesDescriptor.cpp
+1
-1
1 addition, 1 deletion
Core/src/Detector/GlueVolumesDescriptor.cpp
Core/src/Detector/TrackingGeometry.cpp
+1
-1
1 addition, 1 deletion
Core/src/Detector/TrackingGeometry.cpp
with
2 additions
and
2 deletions
Core/src/Detector/GlueVolumesDescriptor.cpp
+
1
−
1
View file @
6f3fc1a1
...
...
@@ -20,7 +20,7 @@ void Acts::GlueVolumesDescriptor::registerGlueVolumes(Acts::BoundarySurfaceFace
auto
searchIter
=
m_glueVolumes
.
find
(
bsf
);
if
(
searchIter
==
m_glueVolumes
.
end
())
m_glueFaces
.
push_back
(
bsf
);
// simple assignment overwrites already existing entries
m_glueVolumes
.
at
(
bsf
)
=
gvs
;
//!< @todo change to addGlueVolumes principle
m_glueVolumes
[
bsf
]
=
gvs
;
//!< @todo change to addGlueVolumes principle
}
...
...
This diff is collapsed.
Click to expand it.
Core/src/Detector/TrackingGeometry.cpp
+
1
−
1
View file @
6f3fc1a1
...
...
@@ -60,7 +60,7 @@ void Acts::TrackingGeometry::registerTrackingVolumes(const Acts::TrackingVolume&
tvol
.
setMotherVolume
(
mvol
);
m_trackingVolumes
.
at
(
tvol
.
volumeName
()
)
=
(
&
tvol
);
m_trackingVolumes
[
tvol
.
volumeName
()
]
=
(
&
tvol
);
std
::
shared_ptr
<
const
Acts
::
TrackingVolumeArray
>
confinedVolumes
=
tvol
.
confinedVolumes
();
if
(
confinedVolumes
){
for
(
auto
&
volumesIter
:
confinedVolumes
->
arrayObjects
())
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment