From d16457322aca0a337e9aa8adc98f549978aa6cf1 Mon Sep 17 00:00:00 2001
From: "se.gorbunov" <se.gorbunov@gsi.de>
Date: Mon, 5 Sep 2022 23:36:24 +0000
Subject: [PATCH] L1: renaming
---
reco/L1/CMakeLists.txt | 4 +-
reco/L1/L1Algo/L1Algo.h | 4 +-
reco/L1/L1Algo/L1CATrackFinder.cxx | 2 +-
.../{L1ClonesMerger.cxx => L1CloneMerger.cxx} | 22 +++++------
.../{L1ClonesMerger.h => L1CloneMerger.h} | 38 +++++++++----------
5 files changed, 35 insertions(+), 35 deletions(-)
rename reco/L1/L1Algo/{L1ClonesMerger.cxx => L1CloneMerger.cxx} (95%)
rename reco/L1/L1Algo/{L1ClonesMerger.h => L1CloneMerger.h} (74%)
diff --git a/reco/L1/CMakeLists.txt b/reco/L1/CMakeLists.txt
index 3bd2577e6a..470361a6b7 100644
--- a/reco/L1/CMakeLists.txt
+++ b/reco/L1/CMakeLists.txt
@@ -153,7 +153,7 @@ set(SRCS
L1Algo/L1Parameters.cxx
L1Algo/L1InputData.cxx
L1Algo/L1IODataManager.cxx
- L1Algo/L1ClonesMerger.cxx
+ L1Algo/L1CloneMerger.cxx
L1Algo/L1ConfigRW.cxx
L1Algo/utils/L1AlgoDraw.cxx
L1Algo/utils/L1AlgoEfficiencyPerformance.cxx
@@ -300,7 +300,7 @@ Install(FILES CbmL1Counters.h
L1Algo/L1Parameters.h
L1Algo/L1InputData.h
L1Algo/L1IODataManager.h
- L1Algo/L1ClonesMerger.h
+ L1Algo/L1CloneMerger.h
L1Algo/L1ConfigRW.h
L1Algo/L1Constants.h
L1Algo/L1Utils.h
diff --git a/reco/L1/L1Algo/L1Algo.h b/reco/L1/L1Algo/L1Algo.h
index 6fa8838d3f..861f00b597 100644
--- a/reco/L1/L1Algo/L1Algo.h
+++ b/reco/L1/L1Algo/L1Algo.h
@@ -43,7 +43,7 @@ class L1AlgoDraw;
#include <map>
#include "L1Branch.h"
-#include "L1ClonesMerger.h"
+#include "L1CloneMerger.h"
#include "L1Field.h"
#include "L1Grid.h"
#include "L1Hit.h"
@@ -544,7 +544,7 @@ public:
private:
- L1ClonesMerger fClonesMerger {*this}; ///< Object of L1Algo clones merger algorithm
+ L1CloneMerger fCloneMerger {*this}; ///< Object of L1Algo clones merger algorithm
#ifdef TBB
enum
diff --git a/reco/L1/L1Algo/L1CATrackFinder.cxx b/reco/L1/L1Algo/L1CATrackFinder.cxx
index cd27497548..ef14eb2e54 100644
--- a/reco/L1/L1Algo/L1CATrackFinder.cxx
+++ b/reco/L1/L1Algo/L1CATrackFinder.cxx
@@ -2602,7 +2602,7 @@ void L1Algo::CATrackFinder()
this->L1KFTrackFitter();
// Merge clones
- fClonesMerger.Exec(fTracks, fRecoHits);
+ fCloneMerger.Exec(fTracks, fRecoHits);
}
#ifdef XXX
diff --git a/reco/L1/L1Algo/L1ClonesMerger.cxx b/reco/L1/L1Algo/L1CloneMerger.cxx
similarity index 95%
rename from reco/L1/L1Algo/L1ClonesMerger.cxx
rename to reco/L1/L1Algo/L1CloneMerger.cxx
index aece822bc1..3cd1acb2b6 100644
--- a/reco/L1/L1Algo/L1ClonesMerger.cxx
+++ b/reco/L1/L1Algo/L1CloneMerger.cxx
@@ -2,12 +2,12 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergei Zharko, Maksym Zyzak [committer]*/
-/// \file L1ClonesMerger.h
+/// \file L1CloneMerger.h
/// \authors S.Zharko <s.zharko@gsi.de> (interface), M.Zyzak (original algorithm)
/// \brief A class wrapper over clones merger algorithm for the L1 track finder (implementation)
/// \since 22.07.2022 (second version)
-#include "L1ClonesMerger.h"
+#include "L1CloneMerger.h"
#include <iostream>
@@ -18,15 +18,15 @@
// ---------------------------------------------------------------------------------------------------------------------
//
-L1ClonesMerger::L1ClonesMerger(const L1Algo& algo) : frAlgo(algo) {}
+L1CloneMerger::L1CloneMerger(const L1Algo& algo) : frAlgo(algo) {}
// ---------------------------------------------------------------------------------------------------------------------
//
-L1ClonesMerger::~L1ClonesMerger() {}
+L1CloneMerger::~L1CloneMerger() {}
// ---------------------------------------------------------------------------------------------------------------------
//
-void L1ClonesMerger::Exec(L1Vector<L1Track>& extTracks, L1Vector<L1HitIndex_t>& extRecoHits)
+void L1CloneMerger::Exec(L1Vector<L1Track>& extTracks, L1Vector<L1HitIndex_t>& extRecoHits)
{
L1Vector<unsigned short>& firstStation = fTrackFirstStation;
L1Vector<unsigned short>& lastStation = fTrackLastStation;
@@ -236,8 +236,8 @@ void L1ClonesMerger::Exec(L1Vector<L1Track>& extTracks, L1Vector<L1HitIndex_t>&
// ---------------------------------------------------------------------------------------------------------------------
//
-void L1ClonesMerger::FilterTracks(fvec const r[5], fvec const C[15], fvec const m[5], fvec const V[15], fvec R[5],
- fvec W[15], fvec* chi2)
+void L1CloneMerger::FilterTracks(fvec const r[5], fvec const C[15], fvec const m[5], fvec const V[15], fvec R[5],
+ fvec W[15], fvec* chi2)
{
fvec S[15];
for (int i = 0; i < 15; i++) {
@@ -282,7 +282,7 @@ void L1ClonesMerger::FilterTracks(fvec const r[5], fvec const C[15], fvec const
// ---------------------------------------------------------------------------------------------------------------------
//
-void L1ClonesMerger::InvertCholesky(fvec a[15])
+void L1CloneMerger::InvertCholesky(fvec a[15])
{
fvec d[5], uud, u[5][5];
for (int i = 0; i < 5; i++) {
@@ -347,7 +347,7 @@ void L1ClonesMerger::InvertCholesky(fvec a[15])
// ---------------------------------------------------------------------------------------------------------------------
//
-void L1ClonesMerger::MultiplyMS(fvec const C[5][5], fvec const V[15], fvec K[15])
+void L1CloneMerger::MultiplyMS(fvec const C[5][5], fvec const V[15], fvec K[15])
{
K[0] = C[0][0] * V[0] + C[0][1] * V[1] + C[0][2] * V[3] + C[0][3] * V[6] + C[0][4] * V[10];
@@ -372,7 +372,7 @@ void L1ClonesMerger::MultiplyMS(fvec const C[5][5], fvec const V[15], fvec K[15]
// ---------------------------------------------------------------------------------------------------------------------
//
-void L1ClonesMerger::MultiplySR(fvec const C[15], fvec const r_in[5], fvec r_out[5])
+void L1CloneMerger::MultiplySR(fvec const C[15], fvec const r_in[5], fvec r_out[5])
{
r_out[0] = r_in[0] * C[0] + r_in[1] * C[1] + r_in[2] * C[3] + r_in[3] * C[6] + r_in[4] * C[10];
r_out[1] = r_in[0] * C[1] + r_in[1] * C[2] + r_in[2] * C[4] + r_in[3] * C[7] + r_in[4] * C[11];
@@ -383,7 +383,7 @@ void L1ClonesMerger::MultiplySR(fvec const C[15], fvec const r_in[5], fvec r_out
// ---------------------------------------------------------------------------------------------------------------------
//
-void L1ClonesMerger::MultiplySS(fvec const C[15], fvec const V[15], fvec K[5][5])
+void L1CloneMerger::MultiplySS(fvec const C[15], fvec const V[15], fvec K[5][5])
{
K[0][0] = C[0] * V[0] + C[1] * V[1] + C[3] * V[3] + C[6] * V[6] + C[10] * V[10];
K[0][1] = C[0] * V[1] + C[1] * V[2] + C[3] * V[4] + C[6] * V[7] + C[10] * V[11];
diff --git a/reco/L1/L1Algo/L1ClonesMerger.h b/reco/L1/L1Algo/L1CloneMerger.h
similarity index 74%
rename from reco/L1/L1Algo/L1ClonesMerger.h
rename to reco/L1/L1Algo/L1CloneMerger.h
index 072d13c0f6..6fd847adc2 100644
--- a/reco/L1/L1Algo/L1ClonesMerger.h
+++ b/reco/L1/L1Algo/L1CloneMerger.h
@@ -2,13 +2,13 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergei Zharko [committer], Maksym Zyzak */
-/// \file L1ClonesMerger.h
+/// \file L1CloneMerger.h
/// \authors S.Zharko <s.zharko@gsi.de> (interface), M.Zyzak (original algorithm)
/// \brief A class wrapper over clones merger algorithm for the L1 track finder (declaration)
/// \since 22.07.2022
-#ifndef L1ClonesMerger_h
-#define L1ClonesMerger_h 1
+#ifndef L1CloneMerger_h
+#define L1CloneMerger_h 1
#include "L1Def.h"
#include "L1Hit.h" // For L1HitIndex_t
@@ -19,25 +19,25 @@ class L1Algo;
/// Class implements a clones merger algorithm for the CA (L1) track finder
///
-class L1ClonesMerger {
+class L1CloneMerger {
public:
/// Default constructor
- L1ClonesMerger(const L1Algo& algo);
+ L1CloneMerger(const L1Algo& algo);
/// Destructor
- ~L1ClonesMerger();
+ ~L1CloneMerger();
/// Copy constructor
- L1ClonesMerger(const L1ClonesMerger&) = delete;
+ L1CloneMerger(const L1CloneMerger&) = delete;
/// Move constructor
- L1ClonesMerger(L1ClonesMerger&&) = delete;
+ L1CloneMerger(L1CloneMerger&&) = delete;
/// Copy assignment operator
- L1ClonesMerger& operator=(const L1ClonesMerger&) = delete;
+ L1CloneMerger& operator=(const L1CloneMerger&) = delete;
/// Move assignment operator
- L1ClonesMerger& operator=(L1ClonesMerger&&) = delete;
+ L1CloneMerger& operator=(L1CloneMerger&&) = delete;
/// Registers
@@ -86,28 +86,28 @@ private:
// ***************
/// First station of a track
- L1Vector<unsigned short> fTrackFirstStation {"L1ClonesMerger::fTrackFirstStation"};
+ L1Vector<unsigned short> fTrackFirstStation {"L1CloneMerger::fTrackFirstStation"};
/// Last station of a track
- L1Vector<unsigned short> fTrackLastStation {"L1ClonesMerger::fTrackLastStation"};
+ L1Vector<unsigned short> fTrackLastStation {"L1CloneMerger::fTrackLastStation"};
/// Index of the first hit of a track
- L1Vector<L1HitIndex_t> fTrackFirstHit {"L1ClonesMerger::fTrackFirstHit"};
+ L1Vector<L1HitIndex_t> fTrackFirstHit {"L1CloneMerger::fTrackFirstHit"};
/// Index of the last hit of a track
- L1Vector<L1HitIndex_t> fTrackLastHit {"L1ClonesMerger::fTrackLastHit"};
+ L1Vector<L1HitIndex_t> fTrackLastHit {"L1CloneMerger::fTrackLastHit"};
/// Index (TODO:??) of a track that can be merge with the given track
- L1Vector<unsigned short> fTrackNeighbour {"L1ClonesMerger::fTrackNeighbour"};
+ L1Vector<unsigned short> fTrackNeighbour {"L1CloneMerger::fTrackNeighbour"};
/// Chi2 value of the track merging procedure
- L1Vector<float> fTrackChi2 {"L1ClonesMerger::fTrackChi2"};
+ L1Vector<float> fTrackChi2 {"L1CloneMerger::fTrackChi2"};
/// Flag: is the given track already stored to the output
- L1Vector<char> fTrackIsStored {"L1ClonesMerger::fTrackIsStored"};
+ L1Vector<char> fTrackIsStored {"L1CloneMerger::fTrackIsStored"};
/// Flag: is the track a downstream neighbour of another track
- L1Vector<char> fTrackIsDownstreamNeighbour {"L1ClonesMerger::fTrackIsDownstreamNeighbour"};
+ L1Vector<char> fTrackIsDownstreamNeighbour {"L1CloneMerger::fTrackIsDownstreamNeighbour"};
L1Vector<L1Track> fTracksNew {"L1CAMergerClones::fTracksNew"}; ///< vector of tracks after the merge
@@ -116,4 +116,4 @@ private:
const L1Algo& frAlgo; ///< Reference to the main track finder algorithm class
};
-#endif // L1ClonesMerger_h
+#endif // L1CloneMerger_h
--
GitLab