Skip to content
Snippets Groups Projects
Commit cead145f authored by Dominik Smith's avatar Dominik Smith Committed by Florian Uhlig
Browse files

Removed structured bindings from cbm::algo::tof::Hitfind.

parent 8d2df157
No related branches found
No related tags found
1 merge request!1505Removed structured bindings from cbm::algo::tof::Hitfind.
Pipeline #25715 passed
......@@ -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()),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment