Skip to content
Snippets Groups Projects
Commit 0fe42722 authored by Felix Weiglhofer's avatar Felix Weiglhofer
Browse files

algo/compat: Rename ParalellSort to Sort.

parent be440116
No related branches found
No related tags found
1 merge request!1203algo: Enable parallel sorting when libTBB is available.
...@@ -40,7 +40,7 @@ namespace cbm::algo ...@@ -40,7 +40,7 @@ namespace cbm::algo
} // namespace detail } // namespace detail
template<typename It, typename Compare> template<typename It, typename Compare>
void ParallelSort(It first, It last, Compare comp) void Sort(It first, It last, Compare comp)
{ {
#ifdef WITH_EXECUTION #ifdef WITH_EXECUTION
std::sort(detail::ExecPolicy, first, last, comp); std::sort(detail::ExecPolicy, first, last, comp);
......
...@@ -60,20 +60,20 @@ namespace cbm::algo ...@@ -60,20 +60,20 @@ namespace cbm::algo
} //# component } //# component
// --- Sorting of output digis. Is required by both digi trigger and event builder. // --- Sorting of output digis. Is required by both digi trigger and event builder.
ParallelSort(digiTs.fData.fSts.fDigis.begin(), digiTs.fData.fSts.fDigis.end(), Sort(digiTs.fData.fSts.fDigis.begin(), digiTs.fData.fSts.fDigis.end(),
[](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
ParallelSort(digiTs.fData.fMuch.fDigis.begin(), digiTs.fData.fMuch.fDigis.end(), Sort(digiTs.fData.fMuch.fDigis.begin(), digiTs.fData.fMuch.fDigis.end(),
[](CbmMuchDigi digi1, CbmMuchDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmMuchDigi digi1, CbmMuchDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
ParallelSort(digiTs.fData.fTof.fDigis.begin(), digiTs.fData.fTof.fDigis.end(), Sort(digiTs.fData.fTof.fDigis.begin(), digiTs.fData.fTof.fDigis.end(),
[](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
ParallelSort(digiTs.fData.fT0.fDigis.begin(), digiTs.fData.fT0.fDigis.end(), Sort(digiTs.fData.fT0.fDigis.begin(), digiTs.fData.fT0.fDigis.end(),
[](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
ParallelSort(digiTs.fData.fTrd.fDigis.begin(), digiTs.fData.fTrd.fDigis.end(), Sort(digiTs.fData.fTrd.fDigis.begin(), digiTs.fData.fTrd.fDigis.end(),
[](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
ParallelSort(digiTs.fData.fTrd2d.fDigis.begin(), digiTs.fData.fTrd2d.fDigis.end(), Sort(digiTs.fData.fTrd2d.fDigis.begin(), digiTs.fData.fTrd2d.fDigis.end(),
[](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
ParallelSort(digiTs.fData.fRich.fDigis.begin(), digiTs.fData.fRich.fDigis.end(), Sort(digiTs.fData.fRich.fDigis.begin(), digiTs.fData.fRich.fDigis.end(),
[](CbmRichDigi digi1, CbmRichDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmRichDigi digi1, CbmRichDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
return result; return result;
} }
......
...@@ -69,8 +69,8 @@ void CbmTaskUnpackXpu::Exec(Option_t*) ...@@ -69,8 +69,8 @@ void CbmTaskUnpackXpu::Exec(Option_t*)
resultSts.first.end()); resultSts.first.end());
// --- Sorting of output digis. Is required by both digi trigger and event builder. // --- Sorting of output digis. Is required by both digi trigger and event builder.
cbm::algo::ParallelSort(fTimeslice->fData.fSts.fDigis.begin(), fTimeslice->fData.fSts.fDigis.end(), cbm::algo::Sort(fTimeslice->fData.fSts.fDigis.begin(), fTimeslice->fData.fSts.fDigis.end(),
[](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); [](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); });
// --- Timeslice log // --- Timeslice log
......
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