From f89a99845948905ec6235313313c018440266c86 Mon Sep 17 00:00:00 2001
From: Nikolay Karpushkin <karpushkin@inr.ru>
Date: Wed, 7 Jul 2021 16:27:52 +0200
Subject: [PATCH] clang
---
core/data/psd/CbmPsdDigi.cxx | 13 +--
core/data/psd/CbmPsdDigi.h | 7 +-
core/data/psd/CbmPsdDsp.cxx | 3 +-
core/data/psd/CbmPsdDsp.h | 5 +-
.../unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx | 86 ++++++++-----------
.../unpacker/CbmMcbm2018UnpackerAlgoPsd.h | 6 +-
.../unpacker/CbmMcbm2018UnpackerTaskPsd.cxx | 8 +-
7 files changed, 55 insertions(+), 73 deletions(-)
diff --git a/core/data/psd/CbmPsdDigi.cxx b/core/data/psd/CbmPsdDigi.cxx
index 2cf8882fa3..8fe56886c9 100644
--- a/core/data/psd/CbmPsdDigi.cxx
+++ b/core/data/psd/CbmPsdDigi.cxx
@@ -36,21 +36,13 @@ CbmPsdDigi::CbmPsdDigi(UInt_t moduleId, UInt_t sectionId, Double_t time, Double_
// --- Copy constructor
-CbmPsdDigi::CbmPsdDigi(const CbmPsdDigi& other)
- : fuAddress(other.fuAddress)
- , fdTime(other.fdTime)
- , fdEdep(other.fdEdep)
+CbmPsdDigi::CbmPsdDigi(const CbmPsdDigi& other) : fuAddress(other.fuAddress), fdTime(other.fdTime), fdEdep(other.fdEdep)
{
}
// --- Move constructor
-CbmPsdDigi::CbmPsdDigi(CbmPsdDigi&& other)
- : fuAddress(other.fuAddress)
- , fdTime(other.fdTime)
- , fdEdep(other.fdEdep)
-{
-}
+CbmPsdDigi::CbmPsdDigi(CbmPsdDigi&& other) : fuAddress(other.fuAddress), fdTime(other.fdTime), fdEdep(other.fdEdep) {}
// --- Destructor
@@ -96,5 +88,4 @@ std::string CbmPsdDigi::ToString() const
}
-
ClassImp(CbmPsdDigi)
diff --git a/core/data/psd/CbmPsdDigi.h b/core/data/psd/CbmPsdDigi.h
index fc1af9b653..3c32e8f932 100644
--- a/core/data/psd/CbmPsdDigi.h
+++ b/core/data/psd/CbmPsdDigi.h
@@ -139,10 +139,9 @@ public:
std::string ToString() const;
- UInt_t fuAddress = 0; /// Unique channel address
- Double_t fdTime = -1.; /// Time of measurement [ns]
- Double_t fdEdep = 0.; /// Energy deposition from FPGA [MeV]
-
+ UInt_t fuAddress = 0; /// Unique channel address
+ Double_t fdTime = -1.; /// Time of measurement [ns]
+ Double_t fdEdep = 0.; /// Energy deposition from FPGA [MeV]
private:
diff --git a/core/data/psd/CbmPsdDsp.cxx b/core/data/psd/CbmPsdDsp.cxx
index 9027beb4a3..a32d35fb86 100644
--- a/core/data/psd/CbmPsdDsp.cxx
+++ b/core/data/psd/CbmPsdDsp.cxx
@@ -18,7 +18,7 @@
#include <string> // for basic_string
// --- Default constructor
-CbmPsdDsp::CbmPsdDsp()
+CbmPsdDsp::CbmPsdDsp()
: fuAddress()
, fdTime()
, fdEdep()
@@ -196,5 +196,4 @@ CbmPsdDsp& CbmPsdDsp::operator=(CbmPsdDsp&& other)
}
-
ClassImp(CbmPsdDsp)
diff --git a/core/data/psd/CbmPsdDsp.h b/core/data/psd/CbmPsdDsp.h
index 1db9f154ea..8cf498338e 100644
--- a/core/data/psd/CbmPsdDsp.h
+++ b/core/data/psd/CbmPsdDsp.h
@@ -38,8 +38,9 @@ public:
/** @brief Constructor with detailed assignment.
**/
CbmPsdDsp(UInt_t address, Double_t time, Double_t edep, UInt_t zl, Double_t accum, Double_t adc_time,
- Double_t edep_wfm, Double_t ampl, UInt_t minimum, UInt_t time_max, std::vector<std::uint16_t> wfm,
- Double_t fit_ampl, Double_t fit_zl, Double_t fit_edep, Double_t fit_r2, Double_t fit_time_max, std::vector<std::uint16_t> fit_wfm);
+ Double_t edep_wfm, Double_t ampl, UInt_t minimum, UInt_t time_max, std::vector<std::uint16_t> wfm,
+ Double_t fit_ampl, Double_t fit_zl, Double_t fit_edep, Double_t fit_r2, Double_t fit_time_max,
+ std::vector<std::uint16_t> fit_wfm);
/** Copy constructor **/
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index d1333a3402..9324f35589 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -84,7 +84,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::Init()
return kTRUE;
}
-void CbmMcbm2018UnpackerAlgoPsd::Reset()
+void CbmMcbm2018UnpackerAlgoPsd::Reset()
{
if (fPsdDigiVector) fPsdDigiVector->clear();
if (fPsdDspVector) fPsdDspVector->clear();
@@ -227,7 +227,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessTs(const fles::Timeslice& ts)
/// Sort the buffers of hits due to the time offsets applied
//std::sort(fDigiVect.begin(), fDigiVect.end(),
- // [](const CbmPsdDigi& a, const CbmPsdDigi& b) -> bool { return a.GetTime() < b.GetTime(); });
+ // [](const CbmPsdDigi& a, const CbmPsdDigi& b) -> bool { return a.GetTime() < b.GetTime(); });
std::sort(fPsdDigiVector->begin(), fPsdDigiVector->end(),
[](const CbmPsdDigi& a, const CbmPsdDigi& b) -> bool { return a.GetTime() < b.GetTime(); });
@@ -355,10 +355,11 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
uint8_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel;
//uint8_t uLinkIndex = PsdReader.VectPackHdr.at(hit_iter).uLinkIndex;
- double dEdep = (double) PsdReader.VectHitHdr.at(hit_iter).uSignalCharge / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
- uint16_t uZeroLevel = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel;
- double dHitTime =
- (double) fulCurrentMsIdx * 25. + (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5 - fdTimeOffsetNs; //in ns
+ double dEdep = (double) PsdReader.VectHitHdr.at(hit_iter).uSignalCharge
+ / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
+ uint16_t uZeroLevel = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel;
+ double dHitTime = (double) fulCurrentMsIdx * 25.
+ + (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5 - fdTimeOffsetNs; //in ns
std::vector<uint16_t> uWfm = PsdReader.VectHitData.at(hit_iter).uWfm;
@@ -371,16 +372,16 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
UInt_t fuAddress = uChanUId; /// Unique channel address
- Double_t fdTime = dHitTime; /// Time of measurement [ns]
- Double_t fdEdep = dEdep; /// Energy deposition from FPGA [MeV]
- UInt_t fuZL = uZeroLevel; /// ZeroLevel from waveform [adc counts]
- Double_t fdAccum = (double) PsdReader.VectHitHdr.at(hit_iter).uFeeAccum; /// FPGA FEE Accumulator
+ Double_t fdTime = dHitTime; /// Time of measurement [ns]
+ Double_t fdEdep = dEdep; /// Energy deposition from FPGA [MeV]
+ UInt_t fuZL = uZeroLevel; /// ZeroLevel from waveform [adc counts]
+ Double_t fdAccum = (double) PsdReader.VectHitHdr.at(hit_iter).uFeeAccum; /// FPGA FEE Accumulator
Double_t fdAdcTime = (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime; /// Adc time of measurement
- Double_t fdEdepWfm = 0.; /// Energy deposition from waveform [MeV]
- Double_t fdAmpl = 0.; /// Amplitude from waveform [mV]
- UInt_t fuMinimum = 0; /// Minimum of waveform [adc samples]
- UInt_t fuTimeMax = 0; /// Time of maximum in waveform [adc samples]
+ Double_t fdEdepWfm = 0.; /// Energy deposition from waveform [MeV]
+ Double_t fdAmpl = 0.; /// Amplitude from waveform [mV]
+ UInt_t fuMinimum = 0; /// Minimum of waveform [adc samples]
+ UInt_t fuTimeMax = 0; /// Time of maximum in waveform [adc samples]
std::vector<uint16_t> fuWfm = uWfm;
Double_t fdFitAmpl = 0.; /// Amplitude from fit of waveform [mV]
@@ -392,14 +393,14 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
if (!uWfm.empty()) {
- int32_t iHitChargeWfm = std::accumulate(uWfm.begin(), uWfm.end(), -uZeroLevel*uWfm.size());
- auto const max_iter = std::max_element(uWfm.begin(), uWfm.end());
- assert(max_iter != uWfm.end());
- if (max_iter == uWfm.end()) break;
- uint8_t uHitTimeMax = std::distance(uWfm.begin(), max_iter);
- int32_t iHitAmlpitude = *max_iter - uZeroLevel;
- auto const min_iter = std::min_element(uWfm.begin(), uWfm.end());
- uint32_t uHitMinimum = *min_iter;
+ int32_t iHitChargeWfm = std::accumulate(uWfm.begin(), uWfm.end(), -uZeroLevel * uWfm.size());
+ auto const max_iter = std::max_element(uWfm.begin(), uWfm.end());
+ assert(max_iter != uWfm.end());
+ if (max_iter == uWfm.end()) break;
+ uint8_t uHitTimeMax = std::distance(uWfm.begin(), max_iter);
+ int32_t iHitAmlpitude = *max_iter - uZeroLevel;
+ auto const min_iter = std::min_element(uWfm.begin(), uWfm.end());
+ uint32_t uHitMinimum = *min_iter;
fdEdepWfm = (double) iHitChargeWfm / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
fdAmpl = (double) iHitAmlpitude / 16.5; // -> now in mV
@@ -423,34 +424,19 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
fdFitEdep =
Pfitter.GetIntegral(gate_beg, gate_end) / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
- fdFitAmpl = (Pfitter.GetMaxAmplitude() - Pfitter.GetZeroLevel()) / 16.5; // ->now in mV
+ fdFitAmpl = (Pfitter.GetMaxAmplitude() - Pfitter.GetZeroLevel()) / 16.5; // ->now in mV
fdFitR2 = Pfitter.GetRSquare(gate_beg, gate_end);
fdFitZL = Pfitter.GetZeroLevel();
fdFitTimeMax = Pfitter.GetSignalMaxTime();
- fuFitWfm = Pfitter.GetFitWfm();
+ fuFitWfm = Pfitter.GetFitWfm();
}
- CbmPsdDsp dsp = CbmPsdDsp(
- fuAddress,
- fdTime,
- fdEdep,
- fuZL,
- fdAccum,
- fdAdcTime,
-
- fdEdepWfm,
- fdAmpl,
- fuMinimum,
- fuTimeMax,
- fuWfm,
-
- fdFitAmpl,
- fdFitZL,
- fdFitEdep,
- fdFitR2,
- fdFitTimeMax,
- fuFitWfm );
-
+ CbmPsdDsp dsp = CbmPsdDsp(fuAddress, fdTime, fdEdep, fuZL, fdAccum, fdAdcTime,
+
+ fdEdepWfm, fdAmpl, fuMinimum, fuTimeMax, fuWfm,
+
+ fdFitAmpl, fdFitZL, fdFitEdep, fdFitR2, fdFitTimeMax, fuFitWfm);
+
std::shared_ptr<CbmPsdDigi> digi = MakeDigi(dsp);
if (digi) fPsdDigiVector->emplace_back(*digi);
@@ -509,8 +495,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
if (ReadResult == 0) {
//hit loop
for (int hit_iter = 0; hit_iter < PsdReader.EvHdrAb.uHitsNumber; hit_iter++) {
- UInt_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel;
- UInt_t uSignalCharge = PsdReader.VectHitHdr.at(hit_iter).uSignalCharge;
+ UInt_t uHitChannel = PsdReader.VectHitHdr.at(hit_iter).uHitChannel;
+ UInt_t uSignalCharge = PsdReader.VectHitHdr.at(hit_iter).uSignalCharge;
//UInt_t uZeroLevel = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel;
Double_t dHitTime =
(double) PsdReader.EvHdrAb.ulMicroSlice + (double) PsdReader.EvHdrAc.uAdcTime * 12.5 - fdTimeOffsetNs;
@@ -526,7 +512,7 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
<< Form(", at %u,", PsdReader.EvHdrAc.uAdcTime)
<< " epoch: " << PsdReader.EvHdrAb.ulMicroSlice;
- fPsdDigiVector->emplace_back(uChanUId, dHitTime, (double)uSignalCharge);
+ fPsdDigiVector->emplace_back(uChanUId, dHitTime, (double) uSignalCharge);
} // for(int hit_iter = 0; hit_iter < PsdReader.EvHdrAb.uHitsNumber; hit_iter++)
}
@@ -596,8 +582,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::SetDspOutputPointer(std::vector<CbmPsdDsp>* c
std::shared_ptr<CbmPsdDigi> CbmMcbm2018UnpackerAlgoPsd::MakeDigi(CbmPsdDsp dsp)
{
- std::shared_ptr<CbmPsdDigi> digi = std::make_shared<CbmPsdDigi>(
- CbmPsdDigi(dsp.GetAddress(), dsp.GetTime(), dsp.GetEdep()));
+ std::shared_ptr<CbmPsdDigi> digi =
+ std::make_shared<CbmPsdDigi>(CbmPsdDigi(dsp.GetAddress(), dsp.GetTime(), dsp.GetEdep()));
return digi;
}
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
index c7c6c89584..a3c3ebbfa7 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.h
@@ -82,8 +82,10 @@ private:
Bool_t fbDebugWriteOutput; //! If ON the output vector of dsp debug information is written to disk
/// Output vectors
- std::vector<CbmPsdDigi>* fPsdDigiVector; //! Output Digi vector /* TODO CHECK The exclamation mark signals the transientness */
- std::vector<CbmPsdDsp>* fPsdDspVector; //! Output Dsp vector /* TODO CHECK The exclamation mark signals the transientness */
+ std::vector<CbmPsdDigi>*
+ fPsdDigiVector; //! Output Digi vector /* TODO CHECK The exclamation mark signals the transientness */
+ std::vector<CbmPsdDsp>*
+ fPsdDspVector; //! Output Dsp vector /* TODO CHECK The exclamation mark signals the transientness */
std::vector<Bool_t> fvbMaskedComponents;
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
index 87c41cccaa..06c6479b56 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerTaskPsd.cxx
@@ -175,7 +175,7 @@ Bool_t CbmMcbm2018UnpackerTaskPsd::DoUnpack(const fles::Timeslice& ts, size_t /*
return kTRUE;
}
-void CbmMcbm2018UnpackerTaskPsd::Reset()
+void CbmMcbm2018UnpackerTaskPsd::Reset()
{
if (fPsdDigiVector) fPsdDigiVector->clear();
if (fPsdDspVector) fPsdDspVector->clear();
@@ -188,7 +188,11 @@ void CbmMcbm2018UnpackerTaskPsd::Finish()
fUnpackerAlgo->Finish();
}
-void CbmMcbm2018UnpackerTaskPsd::SetDspWriteMode(Bool_t bFlagIn) { fbDebugWriteOutput = bFlagIn; fUnpackerAlgo->SetDspWriteMode(bFlagIn); }
+void CbmMcbm2018UnpackerTaskPsd::SetDspWriteMode(Bool_t bFlagIn)
+{
+ fbDebugWriteOutput = bFlagIn;
+ fUnpackerAlgo->SetDspWriteMode(bFlagIn);
+}
void CbmMcbm2018UnpackerTaskPsd::SetIgnoreOverlapMs(Bool_t bFlagIn) { fUnpackerAlgo->SetIgnoreOverlapMs(bFlagIn); }
void CbmMcbm2018UnpackerTaskPsd::SetTimeOffsetNs(Double_t dOffsetIn) { fUnpackerAlgo->SetTimeOffsetNs(dOffsetIn); }
--
GitLab