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
35eb953f
Commit
35eb953f
authored
3 years ago
by
Wouter Deconinck
Browse files
Options
Downloads
Patches
Plain Diff
Patch for DD4Hep #862
parent
a1ce312c
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!127
Patch for DD4Hep #862: do not change momentum in getParticleDirection
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
spack/packages/dd4hep/0001-do-not-change-momentum-in-getParticleDirection.patch
+36
-0
36 additions, 0 deletions
...0001-do-not-change-momentum-in-getParticleDirection.patch
spack/packages/dd4hep/package.py
+2
-0
2 additions, 0 deletions
spack/packages/dd4hep/package.py
with
38 additions
and
0 deletions
spack/packages/dd4hep/0001-do-not-change-momentum-in-getParticleDirection.patch
0 → 100644
+
36
−
0
View file @
35eb953f
diff --git a/DDG4/src/Geant4IsotropeGenerator.cpp b/DDG4/src/Geant4IsotropeGenerator.cpp
index 54588aaf..f63b29b4 100644
--- a/DDG4/src/Geant4IsotropeGenerator.cpp
+++ b/DDG4/src/Geant4IsotropeGenerator.cpp
@@ -48,7 +48,6 @@
void Geant4IsotropeGenerator::getParticleDirectionUniform(int, ROOT::Math::XYZVe
double x3 = std::cos(theta);
direction.SetXYZ(x1,x2,x3);
- momentum = rnd.rndm()*momentum;
}
/// Particle distribution ~ cos(theta)
@@ -63,7 +62,6 @@
void Geant4IsotropeGenerator::getParticleDirectionCosTheta(int, ROOT::Math::XYZV
double x3 = cos_theta;
direction.SetXYZ(x1,x2,x3);
- momentum = rnd.rndm()*momentum;
}
/// Particle distribution flat in eta (pseudo rapidity)
@@ -84,7 +82,6 @@
void Geant4IsotropeGenerator::getParticleDirectionEta(int, ROOT::Math::XYZVector
double x3 = std::sinh(eta);
double r = std::sqrt(1.0+x3*x3);
direction.SetXYZ(x1/r,x2/r,x3/r);
- momentum = rnd.rndm()*momentum;
}
/// e+e- --> ffbar particle distribution ~ 1 + cos^2(theta)
@@ -110,7 +107,6 @@
void Geant4IsotropeGenerator::getParticleDirectionFFbar(int, ROOT::Math::XYZVect
double x2 = std::sin(theta)*std::sin(phi);
double x3 = std::cos(theta);
direction.SetXYZ(x1,x2,x3);
- momentum = rnd.rndm()*momentum;
return;
}
}
This diff is collapsed.
Click to expand it.
spack/packages/dd4hep/package.py
+
2
−
0
View file @
35eb953f
...
@@ -54,6 +54,8 @@ class Dd4hep(CMakePackage):
...
@@ -54,6 +54,8 @@ class Dd4hep(CMakePackage):
# https://github.com/AIDASoft/DD4hep/pull/849
# https://github.com/AIDASoft/DD4hep/pull/849
# https://github.com/AIDASoft/DD4hep/pull/851
# https://github.com/AIDASoft/DD4hep/pull/851
patch
(
'
2021-07-27.patch
'
,
when
=
'
@1.17p1
'
)
patch
(
'
2021-07-27.patch
'
,
when
=
'
@1.17p1
'
)
# patch for https://github.com/AIDASoft/DD4hep/issues/862
patch
(
'
0001-do-not-change-momentum-in-getParticleDirection.patch
'
,
when
=
'
@1.17p1
'
)
variant
(
'
xercesc
'
,
default
=
False
,
description
=
"
Enable
'
Detector Builders
'
based on XercesC
"
)
variant
(
'
xercesc
'
,
default
=
False
,
description
=
"
Enable
'
Detector Builders
'
based on XercesC
"
)
variant
(
'
geant4
'
,
default
=
False
,
description
=
"
Enable the simulation part based on Geant4
"
)
variant
(
'
geant4
'
,
default
=
False
,
description
=
"
Enable the simulation part based on Geant4
"
)
...
...
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