Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project Juggler
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
EIC
Project Juggler
Merge requests
!353
Fix energy resolution calculation and add a safety check for zero edeps
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Fix energy resolution calculation and add a safety check for zero edeps
fix_cal_digi
into
master
Overview
0
Commits
2
Pipelines
0
Changes
1
Merged
Chao Peng
requested to merge
fix_cal_digi
into
master
3 years ago
Overview
0
Commits
2
Pipelines
0
Changes
1
Expand
Thanks to
@angerami
who pointed out in
#74 (closed)
.
Edited
3 years ago
by
Chao Peng
0
0
Merge request reports
Compare
master
version 1
f59cbb9e
3 years ago
master (base)
and
latest version
latest version
ca653e60
2 commits,
3 years ago
version 1
f59cbb9e
1 commit,
3 years ago
1 file
+
15
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
JugDigi/src/components/CalorimeterHitDigi.cpp
+
15
−
6
Options
@@ -165,9 +165,13 @@ namespace Jug::Digi {
int
nhits
=
0
;
for
(
const
auto
&
ahit
:
*
simhits
)
{
// Note: juggler internal unit of energy is GeV
double
eResRel
=
std
::
sqrt
(
std
::
pow
(
m_normDist
()
*
eRes
[
0
]
/
std
::
sqrt
(
ahit
.
energyDeposit
()),
2
)
+
std
::
pow
(
m_normDist
()
*
eRes
[
1
],
2
)
+
std
::
pow
(
m_normDist
()
*
eRes
[
2
]
/
(
ahit
.
energyDeposit
()),
2
));
double
eResRel
=
0.
;
if
(
ahit
.
energyDeposit
()
>
1e-6
)
{
eResRel
=
m_normDist
()
*
eRes
[
0
]
/
std
::
sqrt
(
ahit
.
energyDeposit
())
+
m_normDist
()
*
eRes
[
1
]
+
m_normDist
()
*
eRes
[
2
]
/
ahit
.
energyDeposit
();
}
double
ped
=
m_pedMeanADC
+
m_normDist
()
*
m_pedSigmaADC
;
long
long
adc
=
std
::
llround
(
ped
+
ahit
.
energyDeposit
()
*
(
1.
+
eResRel
)
/
dyRangeADC
*
m_capADC
);
long
long
tdc
=
std
::
llround
((
ahit
.
truth
().
time
+
m_normDist
()
*
tRes
)
*
stepTDC
);
@@ -212,9 +216,14 @@ namespace Jug::Digi {
time
=
hits
[
i
].
truth
().
time
;
}
}
double
eResRel
=
std
::
sqrt
(
std
::
pow
(
m_normDist
()
*
eRes
[
0
]
/
std
::
sqrt
(
edep
),
2
)
+
std
::
pow
(
m_normDist
()
*
eRes
[
1
],
2
)
+
std
::
pow
(
m_normDist
()
*
eRes
[
2
]
/
edep
,
2
));
double
eResRel
=
0.
;
// safety check
if
(
edep
>
1e-6
)
{
eResRel
=
m_normDist
()
*
eRes
[
0
]
/
std
::
sqrt
(
edep
)
+
m_normDist
()
*
eRes
[
1
]
+
m_normDist
()
*
eRes
[
2
]
/
edep
;
}
double
ped
=
m_pedMeanADC
+
m_normDist
()
*
m_pedSigmaADC
;
long
long
adc
=
std
::
llround
(
ped
+
edep
*
(
1.
+
eResRel
)
/
dyRangeADC
*
m_capADC
);
long
long
tdc
=
std
::
llround
((
time
+
m_normDist
()
*
tRes
)
*
stepTDC
);
Loading