diff --git a/algo/base/compat/Algorithm.h b/algo/base/compat/Algorithm.h index cf784419c2ece575d83f606fb2759a392f7df162..ab6f32e950f6b6b9007b70d5cad46ad14e3f369c 100644 --- a/algo/base/compat/Algorithm.h +++ b/algo/base/compat/Algorithm.h @@ -40,7 +40,7 @@ namespace cbm::algo } // namespace detail template<typename It, typename Compare> - void ParallelSort(It first, It last, Compare comp) + void Sort(It first, It last, Compare comp) { #ifdef WITH_EXECUTION std::sort(detail::ExecPolicy, first, last, comp); diff --git a/algo/unpack/Unpack.cxx b/algo/unpack/Unpack.cxx index cd318a5949d95998685b20557da4d7c8ae801b39..6c8eb331dbec78fa84ff3f78d48bd6f336069382 100644 --- a/algo/unpack/Unpack.cxx +++ b/algo/unpack/Unpack.cxx @@ -60,20 +60,20 @@ namespace cbm::algo } //# component // --- Sorting of output digis. Is required by both digi trigger and event builder. - ParallelSort(digiTs.fData.fSts.fDigis.begin(), digiTs.fData.fSts.fDigis.end(), - [](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); - ParallelSort(digiTs.fData.fMuch.fDigis.begin(), digiTs.fData.fMuch.fDigis.end(), - [](CbmMuchDigi digi1, CbmMuchDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); - ParallelSort(digiTs.fData.fTof.fDigis.begin(), digiTs.fData.fTof.fDigis.end(), - [](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); - ParallelSort(digiTs.fData.fT0.fDigis.begin(), digiTs.fData.fT0.fDigis.end(), - [](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); - ParallelSort(digiTs.fData.fTrd.fDigis.begin(), digiTs.fData.fTrd.fDigis.end(), - [](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); - ParallelSort(digiTs.fData.fTrd2d.fDigis.begin(), digiTs.fData.fTrd2d.fDigis.end(), - [](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); - ParallelSort(digiTs.fData.fRich.fDigis.begin(), digiTs.fData.fRich.fDigis.end(), - [](CbmRichDigi digi1, CbmRichDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fSts.fDigis.begin(), digiTs.fData.fSts.fDigis.end(), + [](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fMuch.fDigis.begin(), digiTs.fData.fMuch.fDigis.end(), + [](CbmMuchDigi digi1, CbmMuchDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fTof.fDigis.begin(), digiTs.fData.fTof.fDigis.end(), + [](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fT0.fDigis.begin(), digiTs.fData.fT0.fDigis.end(), + [](CbmTofDigi digi1, CbmTofDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fTrd.fDigis.begin(), digiTs.fData.fTrd.fDigis.end(), + [](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fTrd2d.fDigis.begin(), digiTs.fData.fTrd2d.fDigis.end(), + [](CbmTrdDigi digi1, CbmTrdDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + Sort(digiTs.fData.fRich.fDigis.begin(), digiTs.fData.fRich.fDigis.end(), + [](CbmRichDigi digi1, CbmRichDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); return result; } diff --git a/reco/tasks/CbmTaskUnpackXpu.cxx b/reco/tasks/CbmTaskUnpackXpu.cxx index 5fac8e8bb6964125829b0dc9daaa3296b5849d77..07d8fe1a589cb64d6904e1991458ddd41ff6b2f0 100644 --- a/reco/tasks/CbmTaskUnpackXpu.cxx +++ b/reco/tasks/CbmTaskUnpackXpu.cxx @@ -69,8 +69,8 @@ void CbmTaskUnpackXpu::Exec(Option_t*) resultSts.first.end()); // --- 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(), - [](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); + cbm::algo::Sort(fTimeslice->fData.fSts.fDigis.begin(), fTimeslice->fData.fSts.fDigis.end(), + [](CbmStsDigi digi1, CbmStsDigi digi2) { return digi1.GetTime() < digi2.GetTime(); }); // --- Timeslice log