Skip to content

Commit

Permalink
Make codechecker happy (...)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpuccio committed Nov 26, 2020
1 parent 5125437 commit 5862fe1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 36 deletions.
36 changes: 2 additions & 34 deletions Detectors/ITSMFT/ITS/tracking/include/ITStracking/Configuration.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class Configuration : public Param
};

struct TrackingParameters {
TrackingParameters& operator=(const TrackingParameters& t);
TrackingParameters& operator=(const TrackingParameters& t) = default;

int CellMinimumLevel();
int CellsPerRoad() const { return NLayers - 2; }
Expand Down Expand Up @@ -76,7 +76,7 @@ struct TrackingParameters {

struct MemoryParameters {
/// Memory coefficients
MemoryParameters& operator=(const MemoryParameters& t);
MemoryParameters& operator=(const MemoryParameters& t) = default;
int MemoryOffset = 256;
std::vector<float> CellsMemoryCoefficients = {2.3208e-08f, 2.104e-08f, 1.6432e-08f, 1.2412e-08f, 1.3543e-08f};
std::vector<float> TrackletsMemoryCoefficients = {0.0016353f, 0.0013627f, 0.000984f, 0.00078135f, 0.00057934f, 0.00052217f};
Expand All @@ -87,38 +87,6 @@ inline int TrackingParameters::CellMinimumLevel()
return MinTrackLength - constants::its::ClustersPerCell + 1;
}

inline TrackingParameters& TrackingParameters::operator=(const TrackingParameters& t)
{
this->NLayers = t.NLayers;
this->LayerZ = t.LayerZ;
this->LayerRadii = t.LayerRadii;
this->ZBins = t.ZBins;
this->PhiBins = t.PhiBins;
/// General parameters
this->ClusterSharing = t.ClusterSharing;
this->MinTrackLength = t.MinTrackLength;
/// Trackleting cuts
this->TrackletMaxDeltaPhi = t.TrackletMaxDeltaPhi;
this->TrackletMaxDeltaZ = t.TrackletMaxDeltaZ;
/// Cell finding cuts
this->CellMaxDeltaTanLambda = t.CellMaxDeltaTanLambda;
this->CellMaxDeltaPhi = t.CellMaxDeltaPhi;
this->CellMaxDCA = t.CellMaxDCA;
this->CellMaxDeltaZ = t.CellMaxDeltaZ;
/// Neighbour finding cuts
this->NeighbourMaxDeltaCurvature = t.NeighbourMaxDeltaCurvature;
this->NeighbourMaxDeltaN = t.NeighbourMaxDeltaN;
return *this;
}

inline MemoryParameters& MemoryParameters::operator=(const MemoryParameters& t)
{
this->MemoryOffset = t.MemoryOffset;
this->CellsMemoryCoefficients = t.CellsMemoryCoefficients;
this->TrackletsMemoryCoefficients = t.TrackletsMemoryCoefficients;
return *this;
}

struct VertexingParameters {
std::vector<float> LayerZ = {16.333f + 1, 16.333f + 1, 16.333f + 1, 42.140f + 1, 42.140f + 1, 73.745f + 1, 73.745f + 1};
std::vector<float> LayerRadii = {2.33959f, 3.14076f, 3.91924f, 19.6213f, 24.5597f, 34.388f, 39.3329f};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,9 @@ class VertexerTraits
inline void VertexerTraits::initialise(ROframe* event)
{
reset();
if (!mIndexTableUtils.getNzBins())
if (!mIndexTableUtils.getNzBins()) {
updateVertexingParameters(mVrtParams);
}
arrangeClusters(event);
setIsGPU(false);
}
Expand Down
3 changes: 2 additions & 1 deletion Detectors/ITSMFT/ITS/tracking/src/TrackerTraitsCPU.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ void TrackerTraitsCPU::computeLayerTracklets()
for (int iNextLayerCluster{firstRowClusterIndex}; iNextLayerCluster < maxRowClusterIndex;
++iNextLayerCluster) {

if (iNextLayerCluster >= primaryVertexContext->getClusters()[iLayer + 1].size())
if (iNextLayerCluster >= primaryVertexContext->getClusters()[iLayer + 1].size()) {
break;
}

const Cluster& nextCluster{primaryVertexContext->getClusters()[iLayer + 1][iNextLayerCluster]};

Expand Down

0 comments on commit 5862fe1

Please sign in to comment.