Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Project Juggler
Manage
Activity
Members
Labels
Plan
Issues
32
Issue boards
Milestones
Wiki
Code
Merge requests
21
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
!543
fix: "Immutable objects can only be added to subset collections" exception
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
fix: "Immutable objects can only be added to subset collections" exception
fix-immutable-objects-exception
into
main
Overview
0
Commits
4
Pipelines
4
Changes
1
Merged
Wouter Deconinck
requested to merge
fix-immutable-objects-exception
into
main
9 months ago
Overview
0
Commits
4
Pipelines
4
Changes
1
Expand
👍
0
👎
0
Merge request reports
Viewing commit
917696de
Prev
Next
Show latest version
1 file
+
3
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
917696de
fix: use inputs not in_hits
· 917696de
Wouter Deconinck
authored
9 months ago
JugReco/src/components/CalorimeterHitsMerger.cpp
+
3
−
3
Options
@@ -128,7 +128,7 @@ public:
// sort hits by energy from large to small
for
(
auto
&
it
:
merge_map
)
{
std
::
sort
(
it
.
second
.
begin
(),
it
.
second
.
end
(),
[
&
](
std
::
size_t
ix1
,
std
::
size_t
ix2
)
{
return
(
*
in_hi
ts
)
[
ix1
].
getEnergy
()
>
(
*
in_hi
ts
)
[
ix2
].
getEnergy
();
return
inpu
ts
[
ix1
].
getEnergy
()
>
inpu
ts
[
ix2
].
getEnergy
();
});
}
@@ -152,7 +152,7 @@ public:
float
time
=
0
;
float
timeError
=
0
;
for
(
auto
ix
:
ixs
)
{
auto
hit
=
(
*
in_hi
ts
)
[
ix
];
auto
hit
=
inpu
ts
[
ix
];
energy
+=
hit
.
getEnergy
();
energyError
+=
hit
.
getEnergyError
()
*
hit
.
getEnergyError
();
time
+=
hit
.
getTime
();
@@ -162,7 +162,7 @@ public:
time
/=
ixs
.
size
();
timeError
=
sqrt
(
timeError
)
/
ixs
.
size
();
const
auto
&
href
=
(
*
in_hi
ts
)
[
ixs
.
front
()];
const
auto
&
href
=
inpu
ts
[
ixs
.
front
()];
// create const vectors for passing to hit initializer list
const
decltype
(
edm4eic
::
CalorimeterHitData
::
position
)
position
(
Loading