Skip to content
Snippets Groups Projects
Commit c1d650a4 authored by Jan de Cuveland's avatar Jan de Cuveland
Browse files

Apply clang-format

parent 81f8045a
No related branches found
No related tags found
1 merge request!1236Update flesnet
......@@ -28,13 +28,11 @@ namespace cbm::algo
UnpackMonitorData& monitor = result.second;
if (DetectorEnabled(Subsystem::STS)) {
ParallelMsLoop(Subsystem::STS, digiTs.fData.fSts.fDigis, monitor.fSts, *timeslice, fAlgoSts,
0x20);
ParallelMsLoop(Subsystem::STS, digiTs.fData.fSts.fDigis, monitor.fSts, *timeslice, fAlgoSts, 0x20);
}
if (DetectorEnabled(Subsystem::TOF)) {
ParallelMsLoop(Subsystem::TOF, digiTs.fData.fTof.fDigis, monitor.fTof, *timeslice, fAlgoTof,
0x00);
ParallelMsLoop(Subsystem::TOF, digiTs.fData.fTof.fDigis, monitor.fTof, *timeslice, fAlgoTof, 0x00);
}
// --- Component loop
......@@ -127,9 +125,8 @@ namespace cbm::algo
// ----------------------------------------------------------------------------
template<class Digi, class UnpackAlgo, class Monitor>
void Unpack::ParallelMsLoop(const Subsystem subsystem, std::vector<Digi>& digisOut,
std::vector<Monitor>& monitorOut, const fles::Timeslice& ts,
const std::map<u16, UnpackAlgo>& algos, u8 sys_ver)
void Unpack::ParallelMsLoop(const Subsystem subsystem, std::vector<Digi>& digisOut, std::vector<Monitor>& monitorOut,
const fles::Timeslice& ts, const std::map<u16, UnpackAlgo>& algos, u8 sys_ver)
{
xpu::scoped_timer t_(fles::to_string(subsystem));
......@@ -219,8 +216,8 @@ namespace cbm::algo
const auto duration = std::chrono::duration_cast<std::chrono::microseconds>(endtime - starttime);
L_(debug) << "Unpack(): Component " << comp << ", subsystem "
<< fles::to_string(static_cast<Subsystem>(timeslice->descriptor(comp, 0).sys_id))
<< ", microslices " << numMsInComp << " input size " << numBytesInComp << " bytes,"
<< fles::to_string(static_cast<Subsystem>(timeslice->descriptor(comp, 0).sys_id)) << ", microslices "
<< numMsInComp << " input size " << numBytesInComp << " bytes,"
<< " digis " << numDigisInComp << ", CPU time " << duration.count() / 1000. << " ms";
monitor.fNumMs += numMsInComp;
......
......@@ -140,12 +140,11 @@ namespace cbm::algo
/** @brief Parallel microslice loop **/
template<class Digi, class UnpackAlgo, class Monitor>
void ParallelMsLoop(const Subsystem subsystem, std::vector<Digi>& digisOut,
std::vector<Monitor>& monitor, const fles::Timeslice& ts,
const std::map<u16, UnpackAlgo>& algos, u8 sys_ver);
void ParallelMsLoop(const Subsystem subsystem, std::vector<Digi>& digisOut, std::vector<Monitor>& monitor,
const fles::Timeslice& ts, const std::map<u16, UnpackAlgo>& algos, u8 sys_ver);
std::pair<size_t, size_t> ParallelInit(const fles::Timeslice& ts, Subsystem subsystem,
std::vector<u16>& eqIds, std::vector<fles::MicrosliceDescriptor>& msDesc,
std::pair<size_t, size_t> ParallelInit(const fles::Timeslice& ts, Subsystem subsystem, std::vector<u16>& eqIds,
std::vector<fles::MicrosliceDescriptor>& msDesc,
std::vector<const u8*>& msContent);
/** @brief Sort Digis and add bytes to timer for throughput */
......@@ -180,10 +179,8 @@ namespace cbm::algo
/** @brief System time offsets **/
std::map<Subsystem, int32_t> fSystemTimeOffset = {
{Subsystem::STS, -970}, {Subsystem::MUCH, -980},
{Subsystem::RICH, 100}, {Subsystem::TOF, 40},
{Subsystem::T0, 0}, {Subsystem::TRD, 1300},
{Subsystem::TRD2D, -510}};
{Subsystem::STS, -970}, {Subsystem::MUCH, -980}, {Subsystem::RICH, 100}, {Subsystem::TOF, 40},
{Subsystem::T0, 0}, {Subsystem::TRD, 1300}, {Subsystem::TRD2D, -510}};
};
} // namespace cbm::algo
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment