From 0b0539ead885e3a13c094a6b383ccb42ddd95c2d Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Wed, 24 Apr 2024 07:41:27 +0000
Subject: [PATCH] clang-format
---
core/detectors/tof/CbmMcbm2018TofPar.cxx | 22 ++---
core/detectors/tof/CbmMcbm2018TofPar.h | 9 +-
core/detectors/tof/CbmTofCell.h | 4 +-
core/detectors/tof/CbmTofContFact.h | 4 +-
core/detectors/tof/CbmTofCreateDigiPar.h | 4 +-
core/detectors/tof/CbmTofDigiBdfPar.cxx | 87 +++++++++++++------
core/detectors/tof/CbmTofDigiBdfPar.h | 4 +-
core/detectors/tof/CbmTofDigiPar.cxx | 8 +-
core/detectors/tof/CbmTofDigiPar.h | 4 +-
core/detectors/tof/CbmTofGeoHandler.h | 6 +-
.../detectors/tof/CbmTofTrackingInterface.cxx | 42 ++++++---
core/detectors/tof/CbmTofTrackingInterface.h | 24 +++--
core/detectors/tof/TTrbHeader.cxx | 4 +-
core/detectors/tof/TTrbHeader.h | 6 +-
14 files changed, 142 insertions(+), 86 deletions(-)
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.cxx b/core/detectors/tof/CbmMcbm2018TofPar.cxx
index 6d02f8a30f..d2441aecf6 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.cxx
+++ b/core/detectors/tof/CbmMcbm2018TofPar.cxx
@@ -11,17 +11,15 @@
#include "CbmTofAddress.h"
#include "CbmTofDetectorId_v14a.h" // in cbmdata/tof
-
#include "FairDetParIo.h"
#include "FairParIo.h"
#include "FairParamList.h"
-#include <Logger.h>
-
#include "TString.h"
+#include "gDpbMessv100.h"
-#include <iomanip>
+#include <Logger.h>
-#include "gDpbMessv100.h"
+#include <iomanip>
// ----- Standard constructor ------------------------------------------
CbmMcbm2018TofPar::CbmMcbm2018TofPar(const char* name, const char* title, const char* context)
@@ -164,7 +162,8 @@ Bool_t CbmMcbm2018TofPar::getParams(FairParamList* l)
// -------------------------------------------------------------------------
Int_t CbmMcbm2018TofPar::Get4ChanToPadiChan(UInt_t uChannelInFee)
{
- if (uChannelInFee < kuNbChannelsPerFee) return kuGet4topadi[uChannelInFee];
+ if (uChannelInFee < kuNbChannelsPerFee)
+ return kuGet4topadi[uChannelInFee];
else {
LOG(fatal) << "CbmMcbm2018TofPar::Get4ChanToPadiChan => Index out of bound, " << uChannelInFee << " vs "
<< static_cast<uint32_t>(kuNbChannelsPerFee) << ", returning crazy value!";
@@ -173,7 +172,8 @@ Int_t CbmMcbm2018TofPar::Get4ChanToPadiChan(UInt_t uChannelInFee)
}
Int_t CbmMcbm2018TofPar::PadiChanToGet4Chan(UInt_t uChannelInFee)
{
- if (uChannelInFee < kuNbChannelsPerFee) return kuPaditoget4[uChannelInFee];
+ if (uChannelInFee < kuNbChannelsPerFee)
+ return kuPaditoget4[uChannelInFee];
else {
LOG(fatal) << "CbmMcbm2018TofPar::PadiChanToGet4Chan => Index out of bound, " << uChannelInFee << " vs "
<< static_cast<uint32_t>(kuNbChannelsPerFee) << ", returning crazy value!";
@@ -240,7 +240,8 @@ Int_t CbmMcbm2018TofPar::Get4IdxToElinkIdxA(UInt_t uGet4)
// -------------------------------------------------------------------------
Double_t CbmMcbm2018TofPar::GetPadiThresholdVal(UInt_t uCode)
{
- if (uCode < GetNrOfPadiThrCodes()) return fvdPadiThrCodeToValue[uCode];
+ if (uCode < GetNrOfPadiThrCodes())
+ return fvdPadiThrCodeToValue[uCode];
else {
LOG(error) << "CbmStar2019TofPar::GetPadiThresholdVal => Code out of bound, " << uCode << " vs "
<< GetNrOfPadiThrCodes() << ", returning crazy value!";
@@ -349,7 +350,7 @@ void CbmMcbm2018TofPar::BuildChannelsUidMap()
<< fiNrOfFeesPerGdpb * fiNrOfGet4PerFee * fiNrOfChannelsPerGet4 / nbRobPerComp
<< " with nbRobPerFlim = " << nbRobPerComp;
}
- } // for (UInt_t uGbtx = 0; uGbtx < uNrOfGbtx; ++uGbtx)
+ } // for (UInt_t uGbtx = 0; uGbtx < uNrOfGbtx; ++uGbtx)
}
// -------------------------------------------------------------------------
void CbmMcbm2018TofPar::BuildChannelsUidMapCbm(UInt_t& uCh, UInt_t uGbtx)
@@ -753,7 +754,8 @@ void CbmMcbm2018TofPar::BuildChannelsUidMapBuc(UInt_t& uCh, UInt_t uGbtx)
case 0: iRpcMap = 0; break;
case 1: iRpcMap = 1; break;
}
- if (iFeet % 2 == 1) iModuleIdMap = 1;
+ if (iFeet % 2 == 1)
+ iModuleIdMap = 1;
else
iModuleIdMap = 0;
diff --git a/core/detectors/tof/CbmMcbm2018TofPar.h b/core/detectors/tof/CbmMcbm2018TofPar.h
index 31660932c8..6ede9c726a 100644
--- a/core/detectors/tof/CbmMcbm2018TofPar.h
+++ b/core/detectors/tof/CbmMcbm2018TofPar.h
@@ -11,7 +11,6 @@
#define CBMMCBM2018TOFPAR_H
#include "FairParGenericSet.h"
-
#include "TArrayD.h"
#include "TArrayI.h"
@@ -21,7 +20,7 @@ class FairParamList;
class CbmMcbm2018TofPar : public FairParGenericSet {
-public:
+ public:
/** Standard constructor **/
CbmMcbm2018TofPar(const char* name = "CbmMcbm2018TofPar", const char* title = "Tof unpacker parameters",
const char* context = "Default");
@@ -184,13 +183,13 @@ public:
};
class CbmMcbm2018BmonPar : public CbmMcbm2018TofPar {
-public:
+ public:
/** Standard constructor **/
CbmMcbm2018BmonPar(const char* name = "CbmMcbm2018BmonPar", const char* title = "Bmon unpacker parameters",
const char* context = "Default")
- : CbmMcbm2018TofPar(name, title, context) {};
+ : CbmMcbm2018TofPar(name, title, context){};
-private:
+ private:
// just an alias for the Parameter container to allow two instances
ClassDef(CbmMcbm2018BmonPar, 1);
};
diff --git a/core/detectors/tof/CbmTofCell.h b/core/detectors/tof/CbmTofCell.h
index 20510145fe..331bfecfcc 100644
--- a/core/detectors/tof/CbmTofCell.h
+++ b/core/detectors/tof/CbmTofCell.h
@@ -11,7 +11,7 @@
class CbmTofCell : public TNamed {
-public:
+ public:
/** Default constructor **/
CbmTofCell();
@@ -41,7 +41,7 @@ public:
void Print(Option_t* = "") const;
-private:
+ private:
/** ------------- Data members --------------------------**/
Int_t fDetectorId; // Unique detector ID
diff --git a/core/detectors/tof/CbmTofContFact.h b/core/detectors/tof/CbmTofContFact.h
index 6210aaddb0..c961f9a317 100644
--- a/core/detectors/tof/CbmTofContFact.h
+++ b/core/detectors/tof/CbmTofContFact.h
@@ -14,12 +14,12 @@ class FairContainer;
class CbmTofContFact : public FairContFact {
-public:
+ public:
CbmTofContFact();
~CbmTofContFact() {}
FairParSet* createContainer(FairContainer*);
-private:
+ private:
void setAllContainers();
CbmTofContFact(const CbmTofContFact&);
CbmTofContFact& operator=(const CbmTofContFact&);
diff --git a/core/detectors/tof/CbmTofCreateDigiPar.h b/core/detectors/tof/CbmTofCreateDigiPar.h
index 933bc18497..83d89b4515 100644
--- a/core/detectors/tof/CbmTofCreateDigiPar.h
+++ b/core/detectors/tof/CbmTofCreateDigiPar.h
@@ -26,7 +26,7 @@ class CbmTofGeoHandler;
class CbmTofCreateDigiPar : public FairTask {
-public:
+ public:
/** Default constructor **/
CbmTofCreateDigiPar();
@@ -51,7 +51,7 @@ public:
virtual void FinishTask();
-private:
+ private:
void FillCellInfoFromGeoHandler(TString FullPath);
void FillDigiPar();
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.cxx b/core/detectors/tof/CbmTofDigiBdfPar.cxx
index f5ffe762b8..ac73276eea 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.cxx
+++ b/core/detectors/tof/CbmTofDigiBdfPar.cxx
@@ -95,7 +95,9 @@ void CbmTofDigiBdfPar::ClearHistos()
void CbmTofDigiBdfPar::putParams(FairParamList* l)
{
- if (!l) { return; }
+ if (!l) {
+ return;
+ }
l->add("UseExpDigi", (Int_t) fbUseExpDigi);
l->add("UseOnlyPrim", (Int_t) fbUseOnlyPrim);
@@ -141,7 +143,9 @@ void CbmTofDigiBdfPar::putParams(FairParamList* l)
Bool_t CbmTofDigiBdfPar::getParams(FairParamList* l)
{
- if (!l) { return kFALSE; }
+ if (!l) {
+ return kFALSE;
+ }
LOG(debug2) << "Get the tof digitization parameters.";
@@ -423,7 +427,9 @@ Bool_t CbmTofDigiBdfPar::LoadBeamtimeHistos()
return kFALSE;
}
- if (2 == fiClusterRadiusModel) { GetLandauParFromBeamDataFit(); } // if( 2 == fiClusterRadiusModel )
+ if (2 == fiClusterRadiusModel) {
+ GetLandauParFromBeamDataFit();
+ } // if( 2 == fiClusterRadiusModel )
fBeamtimeInput->Close();
/// Restore old global file and folder pointer to avoid messing with FairRoot
gFile = oldFile;
@@ -521,20 +527,23 @@ Bool_t CbmTofDigiBdfPar::GetLandauParFromBeamDataFit()
// Geometry variables
Int_t CbmTofDigiBdfPar::GetNbSm(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fiNbSm[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fiNbSm[iSmType];
else
return 0;
}
Int_t CbmTofDigiBdfPar::GetNbRpc(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fiNbRpc[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fiNbRpc[iSmType];
else
return 0;
}
Int_t CbmTofDigiBdfPar::GetNbGaps(Int_t iSmType, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iRpc < fiNbRpc[iSmType]) return fiNbGaps[iSmType][iRpc];
+ if (iRpc < fiNbRpc[iSmType])
+ return fiNbGaps[iSmType][iRpc];
else
return 0;
} // if( iSmType < fiNbSmTypes )
@@ -544,7 +553,8 @@ Int_t CbmTofDigiBdfPar::GetNbGaps(Int_t iSmType, Int_t iRpc) const
Double_t CbmTofDigiBdfPar::GetGapSize(Int_t iSmType, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iRpc < fiNbRpc[iSmType]) return fdGapSize[iSmType][iRpc];
+ if (iRpc < fiNbRpc[iSmType])
+ return fdGapSize[iSmType][iRpc];
else
return 0.0;
} // if( iSmType < fiNbSmTypes )
@@ -554,7 +564,8 @@ Double_t CbmTofDigiBdfPar::GetGapSize(Int_t iSmType, Int_t iRpc) const
Double_t CbmTofDigiBdfPar::GetSigVel(Int_t iSmType, Int_t iSm, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iSm < fiNbSm[iSmType] && iRpc < fiNbRpc[iSmType]) return fdSigVel[iSmType][iSm * fiNbRpc[iSmType] + iRpc];
+ if (iSm < fiNbSm[iSmType] && iRpc < fiNbRpc[iSmType])
+ return fdSigVel[iSmType][iSm * fiNbRpc[iSmType] + iRpc];
else
return 0.0;
} // if( iSmType < fiNbSmTypes )
@@ -564,7 +575,8 @@ Double_t CbmTofDigiBdfPar::GetSigVel(Int_t iSmType, Int_t iSm, Int_t iRpc) const
void CbmTofDigiBdfPar::SetSigVel(Int_t iSmType, Int_t iSm, Int_t iRpc, Double_t vel)
{
if (iSmType > -1 && iSmType < fiNbSmTypes) {
- if (iSm < fiNbSm[iSmType] && iRpc < fiNbRpc[iSmType]) fdSigVel[iSmType][iSm * fiNbRpc[iSmType] + iRpc] = vel;
+ if (iSm < fiNbSm[iSmType] && iRpc < fiNbRpc[iSmType])
+ fdSigVel[iSmType][iSm * fiNbRpc[iSmType] + iRpc] = vel;
else {
LOG(error) << "Invalid iSm " << iSm << ", iRpc " << iRpc;
}
@@ -576,7 +588,8 @@ void CbmTofDigiBdfPar::SetSigVel(Int_t iSmType, Int_t iSm, Int_t iRpc, Double_t
Int_t CbmTofDigiBdfPar::GetTrackingStation(Int_t iSmType, Int_t iSm, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iSm < fiNbSm[iSmType] && iRpc < fiNbRpc[iSmType]) return fiTrkStation[iSmType][iSm * fiNbRpc[iSmType] + iRpc];
+ if (iSm < fiNbSm[iSmType] && iRpc < fiNbRpc[iSmType])
+ return fiTrkStation[iSmType][iSm * fiNbRpc[iSmType] + iRpc];
else
return 0;
} // if( iSmType < fiNbSmTypes )
@@ -586,7 +599,8 @@ Int_t CbmTofDigiBdfPar::GetTrackingStation(Int_t iSmType, Int_t iSm, Int_t iRpc)
Int_t CbmTofDigiBdfPar::GetNbChan(Int_t iSmType, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iRpc < fiNbRpc[iSmType]) return fiNbCh[iSmType][iRpc];
+ if (iRpc < fiNbRpc[iSmType])
+ return fiNbCh[iSmType][iRpc];
else
return 0;
} // if( iSmType < fiNbSmTypes )
@@ -596,7 +610,8 @@ Int_t CbmTofDigiBdfPar::GetNbChan(Int_t iSmType, Int_t iRpc) const
Int_t CbmTofDigiBdfPar::GetChanType(Int_t iSmType, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iRpc < fiNbRpc[iSmType]) return fiChType[iSmType][iRpc];
+ if (iRpc < fiNbRpc[iSmType])
+ return fiChType[iSmType][iRpc];
else
return 0;
} // if( iSmType < fiNbSmTypes )
@@ -606,7 +621,8 @@ Int_t CbmTofDigiBdfPar::GetChanType(Int_t iSmType, Int_t iRpc) const
Int_t CbmTofDigiBdfPar::GetChanOrient(Int_t iSmType, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iRpc < fiNbRpc[iSmType]) return fiChOrientation[iSmType][iRpc];
+ if (iRpc < fiNbRpc[iSmType])
+ return fiChOrientation[iSmType][iRpc];
else
return 0;
} // if( iSmType < fiNbSmTypes )
@@ -616,20 +632,23 @@ Int_t CbmTofDigiBdfPar::GetChanOrient(Int_t iSmType, Int_t iRpc) const
// Beamtime variables
Int_t CbmTofDigiBdfPar::GetTypeInputMap(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fiSmTypeInpMapp[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fiSmTypeInpMapp[iSmType];
else
return 0;
}
Double_t CbmTofDigiBdfPar::GetEfficiency(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fdEfficiency[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fdEfficiency[iSmType];
else
return 0;
}
Double_t CbmTofDigiBdfPar::GetGapEfficiency(Int_t iSmType, Int_t iRpc) const
{
if (iSmType < fiNbSmTypes) {
- if (iRpc < fiNbRpc[iSmType]) return fdGapsEfficiency[iSmType][iRpc];
+ if (iRpc < fiNbRpc[iSmType])
+ return fdGapsEfficiency[iSmType][iRpc];
else
return 0;
} // if( iSmType < fiNbSmTypes )
@@ -638,7 +657,8 @@ Double_t CbmTofDigiBdfPar::GetGapEfficiency(Int_t iSmType, Int_t iRpc) const
}
Double_t CbmTofDigiBdfPar::GetResolution(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fdTimeResolution[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fdTimeResolution[iSmType];
else
return 0;
}
@@ -652,31 +672,36 @@ Double_t CbmTofDigiBdfPar::GetSystemResolution(Int_t iSmType) const
}
TH1* CbmTofDigiBdfPar::GetClustSizeHist(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fh1ClusterSize[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fh1ClusterSize[iSmType];
else
return 0;
}
TH1* CbmTofDigiBdfPar::GetClustTotHist(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fh1ClusterTot[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fh1ClusterTot[iSmType];
else
return 0;
}
Double_t CbmTofDigiBdfPar::GetLandauMpv(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fdLandauMpv[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fdLandauMpv[iSmType];
else
return 0;
}
Double_t CbmTofDigiBdfPar::GetLandauSigma(Int_t iSmType) const
{
- if (iSmType < fiNbSmTypes) return fdLandauSigma[iSmType];
+ if (iSmType < fiNbSmTypes)
+ return fdLandauSigma[iSmType];
else
return 0;
}
Double_t CbmTofDigiBdfPar::GetMaxTimeDist() const
{
- if (-1 < fdMaxTimeDistClust) return fdMaxTimeDistClust;
+ if (-1 < fdMaxTimeDistClust)
+ return fdMaxTimeDistClust;
else
return 5 * 0.08;
}
@@ -689,7 +714,8 @@ void CbmTofDigiBdfPar::printParams()
LOG(info) << " |_|+|_|+|_|+|_|+|_|+|_|+|_|+|_|+|_|+|_| ";
LOG(info) << "Parameter values in CbmTofDigiBdfPar: ";
LOG(info) << "=> MC data usage: ";
- if (kTRUE == fbUseOnlyPrim) LOG(info) << " Tracks used: Only Primary!";
+ if (kTRUE == fbUseOnlyPrim)
+ LOG(info) << " Tracks used: Only Primary!";
else
LOG(info) << " Tracks used: All (Primary + Secondary)";
// Fee properties
@@ -742,7 +768,8 @@ void CbmTofDigiBdfPar::printParams()
for (Int_t iSm = 0; iSm < fiNbSm[iSmType]; iSm++)
sSigVel[iSmType] += Form("%4.3f ", GetSigVel(iSmType, iSm, iRpc));
sChNb[iSmType] += Form("%3d ", GetNbChan(iSmType, iRpc));
- if (1 == GetChanType(iSmType, iRpc)) sChType[iSmType] += "pad ";
+ if (1 == GetChanType(iSmType, iRpc))
+ sChType[iSmType] += "pad ";
else
sChType[iSmType] += "str ";
@@ -825,11 +852,13 @@ void CbmTofDigiBdfPar::printParams()
LOG(info) << "=> Digitization variables: ";
// Digi type to use
- if (kTRUE == fbUseExpDigi) LOG(info) << " Output ToF digi type: Expanded (Double values)";
+ if (kTRUE == fbUseExpDigi)
+ LOG(info) << " Output ToF digi type: Expanded (Double values)";
else
LOG(info) << " Output ToF digi type: Re-digitized (Encoding "
"in 64 bits)";
- if (kTRUE == fbOneGapTrack) LOG(info) << " Avoid multi gaps digi for same trk: ON";
+ if (kTRUE == fbOneGapTrack)
+ LOG(info) << " Avoid multi gaps digi for same trk: ON";
else
LOG(info) << " Avoid multi gaps digi for same trk: OFF";
@@ -850,10 +879,12 @@ void CbmTofDigiBdfPar::printParams()
default: LOG(info) << " Cluster model: None, this should not be!!"; break;
} // switch( fiClusterModel )
LOG(info) << "=> Simple clusterizer parameters: ";
- if (kTRUE == fbMulUseTrackId) LOG(info) << " Variable used for multiplicity cnt: Track ID";
+ if (kTRUE == fbMulUseTrackId)
+ LOG(info) << " Variable used for multiplicity cnt: Track ID";
else
LOG(info) << " Variable used for multiplicity cnt: TofPoint ID";
- if (-1 < fdMaxTimeDistClust) LOG(info) << " Maximal time dist. to last chan.: " << GetMaxTimeDist() << " [ns]";
+ if (-1 < fdMaxTimeDistClust)
+ LOG(info) << " Maximal time dist. to last chan.: " << GetMaxTimeDist() << " [ns]";
else
LOG(info) << " Maximal time dist. to last chan.: Use 5*Nom. Syst. Res. "
"(80 ps) = "
diff --git a/core/detectors/tof/CbmTofDigiBdfPar.h b/core/detectors/tof/CbmTofDigiBdfPar.h
index 76e3fa363d..f9db60fd9a 100644
--- a/core/detectors/tof/CbmTofDigiBdfPar.h
+++ b/core/detectors/tof/CbmTofDigiBdfPar.h
@@ -35,7 +35,7 @@ class FairParamList;
class TH1;
class CbmTofDigiBdfPar : public FairParGenericSet {
-public:
+ public:
CbmTofDigiBdfPar(const char* name = "CbmTofDigiBdfPar",
const char* title = "BDF Digitization parameters for the TOF detector",
const char* context = "TestDefaultContext");
@@ -112,7 +112,7 @@ public:
// Cleaning junk
void ClearHistos();
-private:
+ private:
// Fit the cluster size distribution and use it to extract
// the values of the parameter to use for the Landau Cluster
// size distribution. If failing use default values from parameter
diff --git a/core/detectors/tof/CbmTofDigiPar.cxx b/core/detectors/tof/CbmTofDigiPar.cxx
index f9dab40bea..d636fba028 100644
--- a/core/detectors/tof/CbmTofDigiPar.cxx
+++ b/core/detectors/tof/CbmTofDigiPar.cxx
@@ -52,7 +52,9 @@ void CbmTofDigiPar::clear(void)
void CbmTofDigiPar::putParams(FairParamList* l)
{
- if (!l) { return; }
+ if (!l) {
+ return;
+ }
l->add("NrOfCells", fNrOfCells);
l->add("CellIdArray", fCellIdArray);
@@ -65,7 +67,9 @@ void CbmTofDigiPar::putParams(FairParamList* l)
Bool_t CbmTofDigiPar::getParams(FairParamList* l)
{
- if (!l) { return kFALSE; }
+ if (!l) {
+ return kFALSE;
+ }
LOG(debug2) << "Get the tof digitization parameters.";
diff --git a/core/detectors/tof/CbmTofDigiPar.h b/core/detectors/tof/CbmTofDigiPar.h
index c6d9c677bc..6e14d7396d 100644
--- a/core/detectors/tof/CbmTofDigiPar.h
+++ b/core/detectors/tof/CbmTofDigiPar.h
@@ -20,7 +20,7 @@ class CbmTofCell;
class FairParamList;
class CbmTofDigiPar : public FairParGenericSet {
-public:
+ public:
CbmTofDigiPar(const char* name = "CbmTofDigiPar", const char* title = "Digitization parameters for the TOF detector",
const char* context = "TestDefaultContext");
@@ -53,7 +53,7 @@ public:
void SetNode(Int_t iCell, TGeoNode* tGeoNode) { fCellNode.insert(std::pair<Int_t, TGeoNode*>(iCell, tGeoNode)); }
void SetNodeMap(std::map<Int_t, TGeoNode*> map) { fCellNode = map; }
-private:
+ private:
/** Map of Unique Tof Cell Id to corresponding TofCell **/
std::map<Int_t, CbmTofCell*> fCellMap;
diff --git a/core/detectors/tof/CbmTofGeoHandler.h b/core/detectors/tof/CbmTofGeoHandler.h
index 1ef683c504..76b7d2a3dd 100644
--- a/core/detectors/tof/CbmTofGeoHandler.h
+++ b/core/detectors/tof/CbmTofGeoHandler.h
@@ -39,13 +39,13 @@ class TGeoHMatrix;
class TGeoVolume;
class CbmTofGeoHandler : public TObject {
-public:
+ public:
/** Constructor **/
CbmTofGeoHandler();
/** Destructor **/
- ~CbmTofGeoHandler() {};
+ ~CbmTofGeoHandler(){};
Int_t GetUniqueDetectorId();
Int_t GetUniqueCounterId();
@@ -90,7 +90,7 @@ public:
CbmTofDetectorId* GetDetIdPointer() { return fTofId; }
-private:
+ private:
CbmTofDetectorId* fTofId; //!
Int_t fGeoVersion; //!
diff --git a/core/detectors/tof/CbmTofTrackingInterface.cxx b/core/detectors/tof/CbmTofTrackingInterface.cxx
index a5d4ce763f..089d4d1e39 100644
--- a/core/detectors/tof/CbmTofTrackingInterface.cxx
+++ b/core/detectors/tof/CbmTofTrackingInterface.cxx
@@ -11,9 +11,9 @@
#include "CbmTofTrackingInterface.h"
#include "CbmTofCreateDigiPar.h"
-
#include "FairDetector.h"
#include "FairRunAna.h"
+
#include <Logger.h>
#include <limits>
@@ -26,14 +26,18 @@ ClassImp(CbmTofTrackingInterface)
//
CbmTofTrackingInterface::CbmTofTrackingInterface() : FairTask("CbmTofTrackingInterface")
{
- if (!fpInstance) { fpInstance = this; }
+ if (!fpInstance) {
+ fpInstance = this;
+ }
}
//-------------------------------------------------------------------------------------------------------------------------------------
//
CbmTofTrackingInterface::~CbmTofTrackingInterface()
{
- if (fpInstance == this) { fpInstance = nullptr; }
+ if (fpInstance == this) {
+ fpInstance = nullptr;
+ }
}
//-------------------------------------------------------------------------------------------------------------------------------------
@@ -101,18 +105,34 @@ InitStatus CbmTofTrackingInterface::Init()
<< ", z=" << chPosZ;
// Cuts on Bmon and undefined station ID
- if (5 == iSmType) { continue; } // Skip Bmon
- if (iStation < 0) { continue; }
+ if (5 == iSmType) {
+ continue;
+ } // Skip Bmon
+ if (iStation < 0) {
+ continue;
+ }
mRpcZ[iStation].insert(chPosZ);
fTofStationZ[iStation] += chPosZ;
// FIXME: Sizes of stations are incorrect
- if (chPosZ > fTofStationZMax[iStation]) { fTofStationZMax[iStation] = chPosZ; }
- if (chPosZ < fTofStationZMin[iStation]) { fTofStationZMin[iStation] = chPosZ; }
- if (chUpBoarderX > fTofStationXMax[iStation]) { fTofStationXMax[iStation] = chUpBoarderX; }
- if (chUpBoarderY > fTofStationYMax[iStation]) { fTofStationYMax[iStation] = chUpBoarderY; }
- if (chLoBoarderX < fTofStationXMin[iStation]) { fTofStationXMin[iStation] = chLoBoarderX; }
- if (chLoBoarderY < fTofStationYMin[iStation]) { fTofStationYMin[iStation] = chLoBoarderY; }
+ if (chPosZ > fTofStationZMax[iStation]) {
+ fTofStationZMax[iStation] = chPosZ;
+ }
+ if (chPosZ < fTofStationZMin[iStation]) {
+ fTofStationZMin[iStation] = chPosZ;
+ }
+ if (chUpBoarderX > fTofStationXMax[iStation]) {
+ fTofStationXMax[iStation] = chUpBoarderX;
+ }
+ if (chUpBoarderY > fTofStationYMax[iStation]) {
+ fTofStationYMax[iStation] = chUpBoarderY;
+ }
+ if (chLoBoarderX < fTofStationXMin[iStation]) {
+ fTofStationXMin[iStation] = chLoBoarderX;
+ }
+ if (chLoBoarderY < fTofStationYMin[iStation]) {
+ fTofStationYMin[iStation] = chLoBoarderY;
+ }
nTofStationModules[iStation] += 1;
}
diff --git a/core/detectors/tof/CbmTofTrackingInterface.h b/core/detectors/tof/CbmTofTrackingInterface.h
index c17316d0cd..a1b7aa1bb9 100644
--- a/core/detectors/tof/CbmTofTrackingInterface.h
+++ b/core/detectors/tof/CbmTofTrackingInterface.h
@@ -19,10 +19,8 @@
#include "CbmTofDigiPar.h"
#include "CbmTofHit.h"
#include "CbmTrackingDetectorInterfaceBase.h"
-
#include "FairTask.h"
#include "Logger.h"
-
#include "TMath.h"
#include <vector>
@@ -33,7 +31,7 @@ class CbmTofDigiPar;
/// to access the geometry and dataflow settings.
///
class CbmTofTrackingInterface : public FairTask, public CbmTrackingDetectorInterfaceBase {
-public:
+ public:
/// @brief Default constructor
CbmTofTrackingInterface();
@@ -157,19 +155,19 @@ public:
/// @brief FairTask: sets parameter containers up
void SetParContainers();
-private:
+ private:
static CbmTofTrackingInterface* fpInstance; ///< Instance of the class
- CbmTofDigiPar* fDigiPar {nullptr};
- CbmTofDigiBdfPar* fDigiBdfPar {nullptr};
+ CbmTofDigiPar* fDigiPar{nullptr};
+ CbmTofDigiBdfPar* fDigiBdfPar{nullptr};
- std::vector<double> fTofStationXMin {}; ///< Lower bounds of TOF stations along x-axis [cm]
- std::vector<double> fTofStationXMax {}; ///< Upper bounds of TOF stations along x-axis [cm]
- std::vector<double> fTofStationYMin {}; ///< Lower bounds of TOF stations along y-axis [cm]
- std::vector<double> fTofStationYMax {}; ///< Upper bounds of TOF stations along y-axis [cm]
- std::vector<double> fTofStationZ {}; ///< Centers of TOF stations along z-axis [cm]
- std::vector<double> fTofStationZMin {}; ///< Lower bounds of TOF stations along z-axis [cm]
- std::vector<double> fTofStationZMax {}; ///< Upper bounds of TOF stations along z-axis [cm]
+ std::vector<double> fTofStationXMin{}; ///< Lower bounds of TOF stations along x-axis [cm]
+ std::vector<double> fTofStationXMax{}; ///< Upper bounds of TOF stations along x-axis [cm]
+ std::vector<double> fTofStationYMin{}; ///< Lower bounds of TOF stations along y-axis [cm]
+ std::vector<double> fTofStationYMax{}; ///< Upper bounds of TOF stations along y-axis [cm]
+ std::vector<double> fTofStationZ{}; ///< Centers of TOF stations along z-axis [cm]
+ std::vector<double> fTofStationZMin{}; ///< Lower bounds of TOF stations along z-axis [cm]
+ std::vector<double> fTofStationZMax{}; ///< Upper bounds of TOF stations along z-axis [cm]
ClassDef(CbmTofTrackingInterface, 0);
};
diff --git a/core/detectors/tof/TTrbHeader.cxx b/core/detectors/tof/TTrbHeader.cxx
index c726c6f9ae..bf0d7c9aa0 100644
--- a/core/detectors/tof/TTrbHeader.cxx
+++ b/core/detectors/tof/TTrbHeader.cxx
@@ -53,7 +53,9 @@ Int_t TTrbHeader::GetNSubevents() const { return fuSubeventSizes.size(); }
Bool_t TTrbHeader::TriggerFired(Int_t iTrg)
{
// check whether Trigger Pattern matches iTrg in any bit
- if (fuTriggerPattern & (0x1 << iTrg)) { return kTRUE; }
+ if (fuTriggerPattern & (0x1 << iTrg)) {
+ return kTRUE;
+ }
else {
return kFALSE;
}
diff --git a/core/detectors/tof/TTrbHeader.h b/core/detectors/tof/TTrbHeader.h
index 2d56ff820f..dd3d22befa 100644
--- a/core/detectors/tof/TTrbHeader.h
+++ b/core/detectors/tof/TTrbHeader.h
@@ -12,10 +12,10 @@
#include <vector> // for vector
class TTrbHeader : public TNamed {
-public:
+ public:
TTrbHeader();
- virtual ~TTrbHeader() {};
+ virtual ~TTrbHeader(){};
virtual void Clear(Option_t* option = "");
@@ -46,7 +46,7 @@ public:
Bool_t TriggerFired(Int_t iTrg);
-private:
+ private:
UInt_t fuTriggerPattern;
UInt_t fuTriggerType;
Double_t fdTimeInSpill; // in [s]
--
GitLab