From 351db17a0de2baad98b076d7ff93d2d9e437064e Mon Sep 17 00:00:00 2001
From: Nikolay Karpushkin <karpushkin@inr.ru>
Date: Tue, 6 Jul 2021 13:54:15 +0200
Subject: [PATCH] clang
---
core/data/raw/PsdGbtReader-v1.00.cxx | 2 +-
core/detectors/psd/PronyFitter.cxx | 2 +-
.../monitor/CbmMcbm2018MonitorAlgoPsd.cxx | 24 +++---
.../unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx | 76 +++++++++----------
4 files changed, 52 insertions(+), 52 deletions(-)
diff --git a/core/data/raw/PsdGbtReader-v1.00.cxx b/core/data/raw/PsdGbtReader-v1.00.cxx
index 6e83d7c804..1a746e2a24 100644
--- a/core/data/raw/PsdGbtReader-v1.00.cxx
+++ b/core/data/raw/PsdGbtReader-v1.00.cxx
@@ -47,7 +47,7 @@ namespace PsdDataV100
PackHdr.uMagicWord = (buffer[word_index] >> buffer_shift) & (((static_cast<uint16_t>(1)) << PackHdr.MWs) - 1);
word_index++;
- if(PackHdr.uMagicWord != 0xb) {
+ if (PackHdr.uMagicWord != 0xb) {
if (print) PackHdr.printout();
return;
}
diff --git a/core/detectors/psd/PronyFitter.cxx b/core/detectors/psd/PronyFitter.cxx
index 0bdd594bbc..a8d6197664 100644
--- a/core/detectors/psd/PronyFitter.cxx
+++ b/core/detectors/psd/PronyFitter.cxx
@@ -506,7 +506,7 @@ parameters
fuFitZeroLevel = (uint16_t) std::real(fh[0]);
for (int sample_curr = 0; sample_curr < fSampleTotal; sample_curr++) {
fit_ampl_in_sample = {0., 0.};
- if ((sample_curr >= fSignalBegin)) {//&& (sample_curr <= fGateEnd)) {
+ if ((sample_curr >= fSignalBegin)) { //&& (sample_curr <= fGateEnd)) {
for (int i = 0; i < fExpNumber + 1; i++) {
fit_ampl_in_sample += fh[i] * z_power[i];
z_power[i] *= fz[i];
diff --git a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
index 31f0cf3254..744eb62265 100644
--- a/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
+++ b/fles/mcbm2018/monitor/CbmMcbm2018MonitorAlgoPsd.cxx
@@ -422,7 +422,7 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM
if (fbMonitorWfmMode) fvhHitWfmChan[uHitChannel]->Reset();
if (fbMonitorFitMode) fvhHitFitWfmChan[uHitChannel]->Reset();
- if (!uWfm.empty()){
+ if (!uWfm.empty()) {
dHitChargeWfm = std::accumulate(uWfm.begin(), uWfm.end(), 0);
dHitChargeWfm -= uZeroLevel * uWfm.size();
auto const max_iter = std::max_element(uWfm.begin(), uWfm.end());
@@ -466,23 +466,23 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM
} // if( uSignalCharge > kvuWfmRanges.at(i) && uSignalCharge < kvuWfmRanges.at(i+1) )
} // for (uint8_t i=0; i<kuNbWfmRanges; ++i)
} //if (fbMonitorWfmMode)
- } //if (!uWfm.empty())
+ } //if (!uWfm.empty())
if (fbMonitorFitMode && !uWfm.empty()) {
int gate_beg = 0;
- int gate_end = 10;//uWfm.size() - 1;
+ int gate_end = 10; //uWfm.size() - 1;
PsdSignalFitting::PronyFitter Pfitter(2, 2, gate_beg, gate_end);
Pfitter.SetDebugMode(0);
Pfitter.SetWaveform(uWfm, uZeroLevel);
- int SignalBeg = 4;
- std::complex<float> first_fit_harmonic = {0.72, 0.0};
- std::complex<float> second_fit_harmonic = {0.38, -0.0};
- Pfitter.SetExternalHarmonics(first_fit_harmonic, second_fit_harmonic);
- Int_t best_signal_begin = Pfitter.ChooseBestSignalBegin(SignalBeg-1, SignalBeg+1);
- Pfitter.SetSignalBegin(best_signal_begin);
- Pfitter.CalculateFitAmplitudes();
+ int SignalBeg = 4;
+ std::complex<float> first_fit_harmonic = {0.72, 0.0};
+ std::complex<float> second_fit_harmonic = {0.38, -0.0};
+ Pfitter.SetExternalHarmonics(first_fit_harmonic, second_fit_harmonic);
+ Int_t best_signal_begin = Pfitter.ChooseBestSignalBegin(SignalBeg - 1, SignalBeg + 1);
+ Pfitter.SetSignalBegin(best_signal_begin);
+ Pfitter.CalculateFitAmplitudes();
Pfitter.SetSignalBegin(best_signal_begin);
Pfitter.CalculateFitHarmonics();
@@ -505,8 +505,8 @@ Bool_t CbmMcbm2018MonitorAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t uM
fvhFitHarmonic1Chan[uHitChannel]->Fill(std::real(harmonics[1]), std::imag(harmonics[1]));
fvhFitHarmonic2Chan[uHitChannel]->Fill(std::real(harmonics[2]), std::imag(harmonics[2]));
} //if (fbMonitorFitMode && !uWfm.empty())
- }//if (fbMonitorChanMode)
- } // for(int hit_iter = 0; hit_iter < PsdReader.EvHdrAb.uHitsNumber; hit_iter++)
+ } //if (fbMonitorChanMode)
+ } // for(int hit_iter = 0; hit_iter < PsdReader.EvHdrAb.uHitsNumber; hit_iter++)
}
else if (ReadResult == 1) {
LOG(error) << "no pack headers in message!";
diff --git a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
index e613652c41..f5dfd79fc6 100644
--- a/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
+++ b/fles/mcbm2018/unpacker/CbmMcbm2018UnpackerAlgoPsd.cxx
@@ -332,7 +332,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
}
if (ReadResult == 0) {
- double prev_hit_time = (double) fulCurrentMsIdx*25. + PsdReader.VectPackHdr.at(0).uAdcTime * 12.5; //in ns
+ double prev_hit_time =
+ (double) fulCurrentMsIdx * 25. + PsdReader.VectPackHdr.at(0).uAdcTime * 12.5; //in ns
//hit loop
for (uint64_t hit_iter = 0; hit_iter < PsdReader.VectHitHdr.size(); hit_iter++) {
if (PsdReader.VectPackHdr.size() != PsdReader.VectHitHdr.size()) {
@@ -346,7 +347,8 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
//uint8_t uLinkIndex = PsdReader.VectPackHdr.at(hit_iter).uLinkIndex;
uint32_t uSignalCharge = PsdReader.VectHitHdr.at(hit_iter).uSignalCharge;
uint16_t uZeroLevel = PsdReader.VectHitHdr.at(hit_iter).uZeroLevel;
- double dHitTime = (double) fulCurrentMsIdx*25. + PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5; //in ns
+ double dHitTime =
+ (double) fulCurrentMsIdx * 25. + PsdReader.VectPackHdr.at(hit_iter).uAdcTime * 12.5; //in ns
std::vector<uint16_t> uWfm = PsdReader.VectHitData.at(hit_iter).uWfm;
double dEdep = (double) uSignalCharge / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
@@ -368,56 +370,54 @@ Bool_t CbmMcbm2018UnpackerAlgoPsd::ProcessMs(const fles::Timeslice& ts, size_t u
digi.fdAccum = (double) PsdReader.VectHitHdr.at(hit_iter).uFeeAccum;
digi.fdAdcTime = (double) PsdReader.VectPackHdr.at(hit_iter).uAdcTime;
- if(!uWfm.empty()){
+ if (!uWfm.empty()) {
int32_t iHitAmlpitude = 0;
int32_t iHitChargeWfm = 0;
uint8_t uHitTimeMax = 0;
- uint32_t uHitMinimum = 0;
+ uint32_t uHitMinimum = 0;
if (!uWfm.empty()) {
iHitChargeWfm = std::accumulate(uWfm.begin(), uWfm.end(), 0);
iHitChargeWfm -= 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;
- uHitTimeMax = std::distance(uWfm.begin(), max_iter);
- iHitAmlpitude = *max_iter - uZeroLevel;
+ auto const max_iter = std::max_element(uWfm.begin(), uWfm.end());
+ assert(max_iter != uWfm.end());
+ if (max_iter == uWfm.end()) break;
+ uHitTimeMax = std::distance(uWfm.begin(), max_iter);
+ iHitAmlpitude = *max_iter - uZeroLevel;
- auto const min_iter = std::min_element(uWfm.begin(), uWfm.end());
- uHitMinimum = *min_iter;
+ auto const min_iter = std::min_element(uWfm.begin(), uWfm.end());
+ uHitMinimum = *min_iter;
}
digi.fdEdepWfm = (double) iHitChargeWfm / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
digi.fdAmpl = (double) iHitAmlpitude / 16.5; // -> now in mV
digi.fuTimeMax = uHitTimeMax;
- digi.fuMinimum = uHitMinimum; // FIXME
-
-
-
- int gate_beg = 0;
- int gate_end = (int)uWfm.size()-1;
- PsdSignalFitting::PronyFitter Pfitter(2, 2, gate_beg, gate_end);
- Pfitter.SetDebugMode(0);
- //std::vector<int> iWfm(uWfm.begin(), uWfm.end());
- Pfitter.SetWaveform(uWfm, uZeroLevel);
- int SignalBeg = 4;
- //0.6, 0.2 // 0.72 0.38
- std::complex<float> first_fit_harmonic = {0.72, 0.0};
- std::complex<float> second_fit_harmonic = {0.38, -0.0};
- Pfitter.SetExternalHarmonics(first_fit_harmonic, second_fit_harmonic);
- Int_t best_signal_begin = Pfitter.ChooseBestSignalBegin(SignalBeg-1, SignalBeg+1);
- Pfitter.SetSignalBegin(best_signal_begin);
- Pfitter.CalculateFitAmplitudes();
-
- digi.fdFitEdep = Pfitter.GetIntegral(gate_beg, gate_end) / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
- digi.fdFitAmpl = (Pfitter.GetMaxAmplitude() - Pfitter.GetZeroLevel()) / 16.5; // ->now in mV
- digi.fdFitR2 = Pfitter.GetRSquare(gate_beg, gate_end);
- digi.fdFitZL = Pfitter.GetZeroLevel();
- digi.fdFitTimeMax= Pfitter.GetSignalMaxTime();
-
-
- }
+ digi.fuMinimum = uHitMinimum; // FIXME
+
+
+ int gate_beg = 0;
+ int gate_end = (int) uWfm.size() - 1;
+ PsdSignalFitting::PronyFitter Pfitter(2, 2, gate_beg, gate_end);
+ Pfitter.SetDebugMode(0);
+ //std::vector<int> iWfm(uWfm.begin(), uWfm.end());
+ Pfitter.SetWaveform(uWfm, uZeroLevel);
+ int SignalBeg = 4;
+ //0.6, 0.2 // 0.72 0.38
+ std::complex<float> first_fit_harmonic = {0.72, 0.0};
+ std::complex<float> second_fit_harmonic = {0.38, -0.0};
+ Pfitter.SetExternalHarmonics(first_fit_harmonic, second_fit_harmonic);
+ Int_t best_signal_begin = Pfitter.ChooseBestSignalBegin(SignalBeg - 1, SignalBeg + 1);
+ Pfitter.SetSignalBegin(best_signal_begin);
+ Pfitter.CalculateFitAmplitudes();
+
+ digi.fdFitEdep =
+ Pfitter.GetIntegral(gate_beg, gate_end) / fUnpackPar->GetMipCalibration(uHitChannel); // ->now in MeV
+ digi.fdFitAmpl = (Pfitter.GetMaxAmplitude() - Pfitter.GetZeroLevel()) / 16.5; // ->now in mV
+ digi.fdFitR2 = Pfitter.GetRSquare(gate_beg, gate_end);
+ digi.fdFitZL = Pfitter.GetZeroLevel();
+ digi.fdFitTimeMax = Pfitter.GetSignalMaxTime();
+ }
fDigiVect.emplace_back(digi);
--
GitLab