From e45a512b88d23f75def157821aedc1022595c643 Mon Sep 17 00:00:00 2001
From: Alexandru Bercuci <abercuci@niham.nipne.ro>
Date: Fri, 14 Jan 2022 12:42:34 +0200
Subject: [PATCH] fix clang format warnings
---
reco/detectors/trd/CbmTrdClusterFinder.cxx | 5 +++--
reco/detectors/trd/CbmTrdHitProducer.cxx | 2 +-
reco/detectors/trd/CbmTrdModuleRec2D.cxx | 12 ++++++------
reco/detectors/trd/CbmTrdModuleRec2D.h | 18 +++++++++---------
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/reco/detectors/trd/CbmTrdClusterFinder.cxx b/reco/detectors/trd/CbmTrdClusterFinder.cxx
index 6beb279359..b9872fe91a 100644
--- a/reco/detectors/trd/CbmTrdClusterFinder.cxx
+++ b/reco/detectors/trd/CbmTrdClusterFinder.cxx
@@ -9,8 +9,8 @@
#include "CbmTrdCluster.h"
#include "CbmTrdDigi.h"
#include "CbmTrdGeoHandler.h"
-#include "CbmTrdModuleRecR.h"
#include "CbmTrdModuleRec2D.h"
+#include "CbmTrdModuleRecR.h"
#include "CbmTrdParAsic.h"
#include "CbmTrdParModDigi.h"
#include "CbmTrdParModGain.h"
@@ -166,7 +166,8 @@ CbmTrdModuleRec* CbmTrdClusterFinder::AddModule(const CbmTrdDigi* digi)
{
Int_t address = digi->GetAddressModule();
CbmTrdModuleRec* module(NULL);
- if (digi->GetType() == CbmTrdDigi::eCbmTrdAsicType::kFASP) module = fModules[address] = new CbmTrdModuleRec2D(address);
+ if (digi->GetType() == CbmTrdDigi::eCbmTrdAsicType::kFASP)
+ module = fModules[address] = new CbmTrdModuleRec2D(address);
else
module = fModules[address] = new CbmTrdModuleRecR(address);
LOG(debug) << GetName() << "::AddModule : " << module->GetName();
diff --git a/reco/detectors/trd/CbmTrdHitProducer.cxx b/reco/detectors/trd/CbmTrdHitProducer.cxx
index 669d8ef325..94a5eb519d 100644
--- a/reco/detectors/trd/CbmTrdHitProducer.cxx
+++ b/reco/detectors/trd/CbmTrdHitProducer.cxx
@@ -12,8 +12,8 @@
#include "CbmTrdGeoHandler.h"
#include "CbmTrdHit.h"
#include "CbmTrdModuleRec.h"
-#include "CbmTrdModuleRecR.h"
#include "CbmTrdModuleRec2D.h"
+#include "CbmTrdModuleRecR.h"
#include "CbmTrdParAsic.h"
#include "CbmTrdParModDigi.h"
#include "CbmTrdParModGain.h"
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.cxx b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
index 3ee375f323..fb72d08319 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.cxx
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.cxx
@@ -68,7 +68,7 @@ CbmTrdModuleRec2D::CbmTrdModuleRec2D(Int_t mod, Int_t ly, Int_t rot)
, vx()
, vxe()
{
- printf("AddModuleT @ %d\n", mod); Config(1,0);
+ // printf("AddModuleT @ %d\n", mod); Config(1,0);
SetNameTitle(Form("Trd2dReco%d", mod), "Reconstructor for triangular read-out.");
}
@@ -1315,7 +1315,7 @@ Int_t CbmTrdModuleRec2D::ProjectDigis(Int_t cid, Int_t cjd)
//_______________________________________________________________________________
Int_t CbmTrdModuleRec2D::LoadDigis(vector<const CbmTrdDigi*>* digis, vector<CbmTrdDigi*>* vdgM, vector<Bool_t>* vmask,
- ULong64_t& t0, Int_t& cM)
+ ULong64_t& t0, Int_t& cM)
{
/** Load digis information in working vectors.
* The digis as provided by the digitizer are replaced by the merged one
@@ -1449,7 +1449,7 @@ Int_t CbmTrdModuleRec2D::LoadDigis(vector<const CbmTrdDigi*>* digis, vector<CbmT
//_______________________________________________________________________________
Int_t CbmTrdModuleRec2D::LoadDigisRC(vector<const CbmTrdDigi*>* digis, const Int_t r0, const Int_t a0,
- /*vector<CbmTrdDigi*> *vdgM, */ ULong64_t& t0, Int_t& cM)
+ /*vector<CbmTrdDigi*> *vdgM, */ ULong64_t& t0, Int_t& cM)
{
/** Load digis information for row-cross hits in working vectors.
* The digis as provided by the digitizer are replaced by the merged one (TODO)
@@ -1718,9 +1718,9 @@ Float_t CbmTrdModuleRec2D::fgCorrXval[3][NBINSCORRX] = {
-0.011, -0.011, -0.012, -0.012, -0.012, -0.013, -0.013, -0.013, -0.014, -0.014, -0.014, -0.016, -0.016,
-0.016, -0.017, -0.017, -0.017, -0.018, -0.018, -0.018, -0.019, 0.029, 0.018, 0.001}};
Float_t CbmTrdModuleRec2D::fgCorrYval[NBINSCORRY][2] = {{2.421729, 0.},
- {0.629389, -0.215285},
- {0.23958, 0.},
- {0.151913, 0.054404}};
+ {0.629389, -0.215285},
+ {0.23958, 0.},
+ {0.151913, 0.054404}};
Float_t CbmTrdModuleRec2D::fgCorrRcXval[2][NBINSCORRX] = {
{-0.00050, -0.00050, -0.00150, -0.00250, -0.00250, -0.00350, -0.00450, -0.00450, -0.00550, -0.00650,
-0.00650, -0.00750, -0.00850, -0.00850, -0.00850, -0.00950, -0.00950, -0.00950, -0.01050, -0.01150,
diff --git a/reco/detectors/trd/CbmTrdModuleRec2D.h b/reco/detectors/trd/CbmTrdModuleRec2D.h
index aa27610823..ce26165a54 100644
--- a/reco/detectors/trd/CbmTrdModuleRec2D.h
+++ b/reco/detectors/trd/CbmTrdModuleRec2D.h
@@ -10,8 +10,8 @@
#include <list>
#include <map>
#include <vector>
-#define NBINSCORRX 50 //! no of bins in the discretized correction LUT
-#define NBINSCORRY 4 //! no of bins in the parametrization correction
+#define NBINSCORRX 50 //! no of bins in the discretized correction LUT
+#define NBINSCORRY 4 //! no of bins in the parametrization correction
#define NANODE 9
using std::list;
@@ -201,15 +201,15 @@ private:
std::vector<Double_t> vx; //! working copy of signal relative positions
std::vector<Double_t> vxe; //! working copy of signal relative position errors
- static Float_t fgCorrXdx; //! step of the discretized correction LUT
- static Float_t fgCorrXval[3][NBINSCORRX]; //! discretized correction LUT
- static Float_t fgCorrYval[NBINSCORRY][2]; //! discretized correction params
+ static Float_t fgCorrXdx; //! step of the discretized correction LUT
+ static Float_t fgCorrXval[3][NBINSCORRX]; //! discretized correction LUT
+ static Float_t fgCorrYval[NBINSCORRY][2]; //! discretized correction params
static Float_t fgCorrRcXval[2][NBINSCORRX]; //! discretized correction LUT
static Float_t fgCorrRcXbiasXval[3][NBINSCORRX]; //! discretized correction LUT
- static Double_t fgDT[3]; //! FASP delay wrt signal
- static TGraphErrors* fgEdep; //! data handler for cluster PRF
- static TF1* fgPRF; //! fitter for cluster PRF
- static TGraphErrors* fgT; //! data handler for cluster TRF
+ static Double_t fgDT[3]; //! FASP delay wrt signal
+ static TGraphErrors* fgEdep; //! data handler for cluster PRF
+ static TF1* fgPRF; //! fitter for cluster PRF
+ static TGraphErrors* fgT; //! data handler for cluster TRF
ClassDef(CbmTrdModuleRec2D,
2) // Triangular pad module; Cluster finding and hit reconstruction algorithms
--
GitLab