Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
calypso
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
Show more breadcrumbs
Charlotte Cavanagh
calypso
Commits
5c78d656
Commit
5c78d656
authored
2 years ago
by
Carl Gwilliam
Browse files
Options
Downloads
Patches
Plain Diff
Fix incorrect conversion in fluka E loss
parent
771f81f0
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Generators/FlukaReader/python/FlukaReaderAlg.py
+7
-3
7 additions, 3 deletions
Generators/FlukaReader/python/FlukaReaderAlg.py
with
7 additions
and
3 deletions
Generators/FlukaReader/python/FlukaReaderAlg.py
+
7
−
3
View file @
5c78d656
...
...
@@ -11,6 +11,8 @@ import ROOT
import
numpy
as
np
import
math
# TODO: correct angle for beam crossing angle: both in angel itself and position
class
FlukaReader
(
EvgenAlg
):
def
__init__
(
self
,
name
=
"
FlukaReader
"
,
MCEventKey
=
"
BeamTruthEvent
"
,
file_name
=
""
,
dist
=
0
,
randomSeed
=
None
,
nsamples
=
1
,
test
=
True
):
super
(
FlukaReader
,
self
).
__init__
(
name
=
name
)
...
...
@@ -106,7 +108,7 @@ class FlukaReader(EvgenAlg):
def
energy_after_loss_exact
(
self
,
e
,
zcorr
):
"
Calculate exact energy after loss in material
"
return
Range
.
muPropagate
(
e
,
zcorr
/
100
0
.
)
return
Range
.
muPropagate
(
e
,
zcorr
/
100.
)
def
energy_after_loss
(
self
,
e
,
cosThetaX
,
cosThetaY
,
zcorr
,
a
=
2e-3
,
b
=
4e-6
):
"
Calculate approximate energy after loss in material
"
...
...
@@ -263,11 +265,13 @@ class FlukaReader(EvgenAlg):
ROOT
.
SetOwnership
(
gv
,
False
)
evt
.
add_vertex
(
gv
)
# TODO: skip event if below a certain energy
# Create HepMC particle
gp
=
HepMC
.
GenParticle
()
m
=
105.66
e
=
entry
[
"
E
"
]
*
1000.
e
=
entry
[
"
E
"
]
*
1000.
p
=
np
.
sqrt
(
e
**
2
-
m
**
2
)
thetaX
=
self
.
angle
(
entry
[
"
cosX
"
])
...
...
@@ -312,7 +316,7 @@ class FlukaReader(EvgenAlg):
plt
.
hist
(
self
.
after
[
"
E
"
],
bins
=
ebins
,
histtype
=
'
step
'
,
color
=
"
r
"
,
fill
=
False
,
label
=
"
after
"
)
plt
.
gca
().
set_yscale
(
'
log
'
)
plt
.
legend
()
plt
.
savefig
(
"
energy.
o
ng
"
)
plt
.
savefig
(
"
energy.
p
ng
"
)
plt
.
figure
()
plt
.
xlabel
(
"
Angle to beam in X dir
"
)
...
...
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