Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
eic_container
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
containers
eic_container
Commits
879fd93c
Commit
879fd93c
authored
4 years ago
by
Sylvester Joosten
Browse files
Options
Downloads
Patches
Plain Diff
Patch to temporarily address
https://github.com/acts-project/acts/issues/822
parent
883e854a
Branches
Branches containing commit
Tags
Tags containing commit
1 merge request
!69
Quick fix for issue with Radial Bounds in ACTS DD4hep plugin
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
spack.yaml
+1
-1
1 addition, 1 deletion
spack.yaml
spack/packages/acts/acts-822.patch
+31
-0
31 additions, 0 deletions
spack/packages/acts/acts-822.patch
spack/packages/acts/package.py
+5
-0
5 additions, 0 deletions
spack/packages/acts/package.py
with
37 additions
and
1 deletion
spack.yaml
+
1
−
1
View file @
879fd93c
...
...
@@ -24,7 +24,7 @@ spack:
-
podio@0.13
-
geant4@10.7.1 cxxstd=17 +opengl +vecgeom +x11 +qt ^qt +opengl
-
dd4hep@1.16.1 +geant4 +assimp +hepmc3 +ipo
-
acts@8.02.0 +dd4hep +digitization +identification +json +tgeo +ipo
-
acts@8.02.0
p1
+dd4hep +digitization +identification +json +tgeo +ipo
-
gaudi@34.0
-
dawn@3_91a
-
dawncut@1_54a
...
...
This diff is collapsed.
Click to expand it.
spack/packages/acts/acts-822.patch
0 → 100644
+
31
−
0
View file @
879fd93c
diff --git a/Core/src/Geometry/CylinderVolumeBuilder.cpp b/Core/src/Geometry/CylinderVolumeBuilder.cpp
index eba6f8617..950c5286b 100644
--- a/Core/src/Geometry/CylinderVolumeBuilder.cpp
+++ b/Core/src/Geometry/CylinderVolumeBuilder.cpp
@@ -542,6 +542,7 @@
Acts::VolumeConfig Acts::CylinderVolumeBuilder::analyzeContent(
double zMaxD = center.z() + 0.5 * thickness;
lConfig.rMin =
std::min(lConfig.rMin, rMinD - m_cfg.layerEnvelopeR.first);
+ lConfig.rMin = std::max(0.0, lConfig.rMin);
lConfig.rMax =
std::max(lConfig.rMax, rMaxD + m_cfg.layerEnvelopeR.second);
lConfig.zMin = std::min(lConfig.zMin, zMinD - m_cfg.layerEnvelopeZ);
@@ -576,4 +577,4 @@
Acts::VolumeConfig Acts::CylinderVolumeBuilder::analyzeContent(
// and return what you have
return lConfig;
-}
\ No newline at end of file
+}
diff --git a/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp b/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp
index 4d1695abf..455481538 100644
--- a/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp
+++ b/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp
@@ -128,6 +128,7 @@
const Acts::LayerVector Acts::DD4hepLayerBuilder::endcapLayers(
std::abs(zMax - pl.max(Acts::binZ))};
pl.envelope[Acts::binR] = {std::abs(rMin - pl.min(Acts::binR)),
std::abs(rMax - pl.max(Acts::binR))};
+ pl.extent.ranges[Acts::binR] = {rMin, rMax};
}
} else {
throw std::logic_error(
This diff is collapsed.
Click to expand it.
spack/packages/acts/package.py
+
5
−
0
View file @
879fd93c
...
...
@@ -37,6 +37,7 @@ class Acts(CMakePackage, CudaPackage):
# Supported Acts versions
version
(
'
master
'
,
branch
=
'
master
'
)
version
(
'
8.02.0p1
'
,
commit
=
'
f25cf639915fc2ac65b03882ad3eb11fb037ed00
'
)
version
(
'
8.02.0
'
,
commit
=
'
f25cf639915fc2ac65b03882ad3eb11fb037ed00
'
)
version
(
'
8.01.0
'
,
commit
=
'
ccc8c77bbc011f3adc020c565a509815be0ea029
'
)
version
(
'
8.00.0
'
,
commit
=
'
50c972823144c007b406ae12d7ca25a1e0c35532
'
)
...
...
@@ -120,6 +121,10 @@ class Acts(CMakePackage, CudaPackage):
variant
(
'
hepmc3
'
,
default
=
False
,
description
=
'
Build the HepMC3-based examples
'
)
variant
(
'
pythia8
'
,
default
=
False
,
description
=
'
Build the Pythia8-based examples
'
)
## Temporary patch for ACTS to address
## https://github.com/acts-project/acts/issues/822
patch
(
'
acts-822.patch
'
,
when
=
'
@8.02.0p1
'
)
# Build dependencies
# FIXME: Use spack's autodiff package once there is one
depends_on
(
'
boost @1.62:1.69.99 +program_options +test
'
,
when
=
'
@:0.10.3
'
)
...
...
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