From 36f2d6750686b25e85a5f33e4efdd7fa977c9dfa Mon Sep 17 00:00:00 2001
From: Nikolay Karpushkin <karpushkin@inr.ru>
Date: Tue, 13 Jul 2021 11:18:01 +0200
Subject: [PATCH] clang
---
fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx | 1 -
.../mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx | 12 ++++++------
.../mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx | 2 +-
3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
index 31d4e0e278..95a46fa5ec 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
@@ -660,7 +660,6 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM
} //if(uNbMessages > 1)
-
/// Fill histograms
FillHistograms();
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index bc3ed12dd7..e4e4c79f15 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -155,7 +155,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessTs(const fles::Timeslice& ts)
{
fulCurrentTsIdx = ts.index();
- fdTsStartTime = static_cast<Double_t>(ts.descriptor(0, 0).idx); // FIXME ts.start_time();
+ fdTsStartTime = static_cast<Double_t>(ts.descriptor(0, 0).idx); // FIXME ts.start_time();
/// Ignore First TS as first MS is typically corrupt
if (0 == fulCurrentTsIdx) { return kTRUE; } // if( 0 == fulCurrentTsIdx )
@@ -315,8 +315,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
}
if (ReadResult == 0) {
- double prev_hit_time = fdTsStartTime + (double) PsdReader.VectPackHdr.at(0).uAdcTime * 12.5
- - fdTimeOffsetNs; //in ns
+ double prev_hit_time =
+ fdTsStartTime + (double) PsdReader.VectPackHdr.at(0).uAdcTime * 12.5 - fdTimeOffsetNs; //in ns
//hit loop
for (uint64_t hit_iter = 0; hit_iter < PsdReader.VectHitHdr.size(); hit_iter++) {
@@ -337,8 +337,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
UInt_t uChanUId = fviPsdChUId[uHitChannel]; //unique ID
UInt_t fuAddress = uChanUId; /// Unique channel address
- Double_t fdTime = fdTsStartTime
- + (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5
+ Double_t fdTime = fdTsStartTime + (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5
- fdTimeOffsetNs; /// Time of measurement [ns]
Double_t fdEdep = (double) PsdReader.VectHitHdr.at(hit_iter).uSignalCharge
/ fUnpackPar->GetMipCalibration(uHitChannel); /// Energy deposition from FPGA [MeV]
@@ -526,7 +525,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
return kTRUE;
}
-std::pair<std::vector<CbmPsdDigi>*, std::vector<CbmPsdDsp>*> CbmMcbm2018UnpackerAlgoPsd::unpack(const fles::Timeslice* ts, std::uint16_t icomp)
+std::pair<std::vector<CbmPsdDigi>*, std::vector<CbmPsdDsp>*>
+CbmMcbm2018UnpackerAlgoPsd::unpack(const fles::Timeslice* ts, std::uint16_t icomp)
{
AddMsComponentToList(icomp, 0x80);
Reset();
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
index 3b3db25b03..1954a23eaf 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
@@ -153,7 +153,7 @@ Bool_t CbmMcbm2018UnpackerTaskPsd::DoUnpack(const fles::Timeslice& ts, size_t co
} // if( fbMonitorMode && bMcbm2018UnpackerTaskPsdResetHistos )
fUnpackerAlgo->unpack(&ts, component);
-/*
+ /*
if (kFALSE == fUnpackerAlgo->ProcessTs(ts)) {
LOG(error) << "Failed processing TS " << ts.index() << " in unpacker algorithm class";
return kTRUE;
--
GitLab