Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
athena_MET
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alberto Plebani
athena_MET
Commits
a3b3381a
Commit
a3b3381a
authored
2 years ago
by
Christos Anastopoulos
Committed by
Walter Lampl
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
AtlasFieldCache : Improve comments
AtlasFieldCache : Improve comments
parent
42337945
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.icc
+8
-6
8 additions, 6 deletions
...eld/MagFieldElements/MagFieldElements/AtlasFieldCache.icc
with
8 additions
and
6 deletions
MagneticField/MagFieldElements/MagFieldElements/AtlasFieldCache.icc
+
8
−
6
View file @
a3b3381a
...
...
@@ -19,14 +19,16 @@ inline MagField::AtlasFieldCache::AtlasFieldCache(double solFieldScale,
inline
bool
MagField
::
AtlasFieldCache
::
fillFieldCache
(
double
z
,
double
r
,
double
phi
)
{
// Check if are still in the current zone.
// We have only one solenoid zone with known id (m_solZoneId).
// So if the id matches we aee fine.
// Otherwise check if we are still inside.
// We have gone outside of a cache volume. For the solenoid, it is 'safe' to
// just check\n if we are inside the solenoid zone, and then we can find the
// next cache volume. For toroid, it is best to not check if we are inside
// the zone, and just find the zone for the current point.
// So we need to look up a fieldZone:
// 1) If we do NOT have one
// 2) Everytime we are in a Zone that does NOT have a solenoid ID
// 3) If it has solenoid ID and we are NOT inside
if
(
!
m_zone3d
||
m_zone3d
->
id
()
!=
m_solZoneId
||
!
m_zone3d
->
inside
(
z
,
r
,
phi
))
{
// we need to try and a find a new zone
m_zone3d
=
m_fieldMap
?
m_fieldMap
->
findBFieldZone
(
z
,
r
,
phi
)
:
nullptr
;
}
...
...
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