Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cbmroot
Manage
Activity
Members
Labels
Plan
Wiki
Redmine
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
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Computing
cbmroot
Merge requests
!1505
Removed structured bindings from cbm::algo::tof::Hitfind.
Code
Review changes
Check out branch
Download
Patches
Plain diff
Expand sidebar
Merged
Removed structured bindings from cbm::algo::tof::Hitfind.
d.smith/cbmroot:TofClusterBindingFix
into
master
Overview
4
Commits
1
Pipelines
2
Changes
1
Merged
Dominik Smith
requested to merge
d.smith/cbmroot:TofClusterBindingFix
into
master
1 year ago
Overview
4
Commits
1
Pipelines
2
Changes
1
Changes requested by
@f.uhlig
.
Please merge if this fixes the problem.
0
0
Merge request reports
Compare
master
version 1
2e190982
1 year ago
master (base)
and
latest version
latest version
cead145f
1 commit,
1 year ago
version 1
2e190982
1 commit,
1 year ago
1 file
+
17
−
4
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
algo/detectors/tof/Hitfind.cxx
+
17
−
4
View file @ cead145f
Edit in single-file editor
Open in Web IDE
Show full file
@@ -75,8 +75,11 @@ namespace cbm::algo::tof
Hitfind
::
resultType
Hitfind
::
operator
()(
gsl
::
span
<
CbmTofDigi
>
digiIn
)
{
// --- Output data
resultType
result
=
{};
auto
&
[
clusterTs
,
monitor
,
digiInd
]
=
result
;
resultType
result
=
{};
//auto& [clusterTs, monitor, digiInd] = result; // TO DO: Re-activte this when compiler bug is fixed
auto
&
clusterTs
=
std
::
get
<
0
>
(
result
);
auto
&
monitor
=
std
::
get
<
1
>
(
result
);
auto
&
digiInd
=
std
::
get
<
2
>
(
result
);
// Loop over the digis array and store the Digis in separate vectors for
// each RPC modules
@@ -123,7 +126,12 @@ namespace cbm::algo::tof
indPrefix
.
resize
(
nthreads
+
1
);
}
auto
[
clusters
,
sizes
,
addresses
,
indices
]
=
Clusterizer
::
resultType
();
//auto [clusters, sizes, addresses, indices] = Clusterizer::resultType(); // TO DO: Re-activte this when compiler bug is fixed
auto
localresult
=
Clusterizer
::
resultType
();
auto
&
clusters
=
std
::
get
<
0
>
(
localresult
);
auto
&
sizes
=
std
::
get
<
1
>
(
localresult
);
auto
&
addresses
=
std
::
get
<
2
>
(
localresult
);
auto
&
indices
=
std
::
get
<
3
>
(
localresult
);
CBM_OMP
(
for
schedule
(
dynamic
)
nowait
)
for
(
uint32_t
iRpc
=
0
;
iRpc
<
fAlgo
.
size
();
iRpc
++
)
{
@@ -132,7 +140,12 @@ namespace cbm::algo::tof
std
::
vector
<
std
::
pair
<
CbmTofDigi
,
int32_t
>>&
digiExp
=
*
fStorDigiPtr
[
iRpc
];
// Build clusters
auto
[
rpc_clu
,
rpc_size
,
rpc_addr
,
rpc_ind
]
=
fAlgo
[
iRpc
](
digiExp
);
//auto [rpc_clu, rpc_size, rpc_addr, rpc_ind] = fAlgo[iRpc](digiExp); // TO DO: Re-activte this when compiler bug is fixed
auto
rpc_result
=
fAlgo
[
iRpc
](
digiExp
);
auto
&
rpc_clu
=
std
::
get
<
0
>
(
rpc_result
);
auto
&
rpc_size
=
std
::
get
<
1
>
(
rpc_result
);
auto
&
rpc_addr
=
std
::
get
<
2
>
(
rpc_result
);
auto
&
rpc_ind
=
std
::
get
<
3
>
(
rpc_result
);
// Append clusters to output
clusters
.
insert
(
clusters
.
end
(),
std
::
make_move_iterator
(
rpc_clu
.
begin
()),
Loading