From f85f851dcf97fb722e750198a954174bcaf30c11 Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Mon, 14 Feb 2022 23:22:52 +0100
Subject: [PATCH] L1Algo init: resolved threads for merge request (clang format
fix)
---
reco/L1/CbmL1.cxx | 6 +++---
reco/L1/L1Algo/L1BaseStationInfo.h | 2 +-
reco/L1/L1Algo/L1InitManager.h | 2 +-
reco/L1/L1Algo/L1Station.cxx | 6 ++++--
reco/L1/L1Algo/L1Station.h | 2 +-
reco/L1/L1Algo/utils/L1Utils.h | 9 +++++----
6 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 1042707d85..96123a2d7c 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -818,8 +818,8 @@ InitStatus CbmL1::Init()
CbmKFTube& t = CbmKF::Instance()->vMvdMaterial[iSt];
auto stationInfo = L1BaseStationInfo(L1DetectorID::kMvd, iSt);
- stationInfo.SetStationType(1);
- // MVD // TODO: to be exchanged with specific flags (timeInfo, fieldInfo etc.) (S.Zh.)
+ stationInfo.SetStationType(1);
+ // MVD // TODO: to be exchanged with specific flags (timeInfo, fieldInfo etc.) (S.Zh.)
stationInfo.SetTimeInfo(0);
stationInfo.SetZ(t.z);
stationInfo.SetMaterial(t.dz, t.RadLength);
@@ -872,7 +872,7 @@ InitStatus CbmL1::Init()
auto stationInfo = L1BaseStationInfo(L1DetectorID::kMuch, iSt);
stationInfo.SetStationType(2);
- // MVD // TODO: to be exchanged with specific flags (timeInfo, fieldInfo etc.) (S.Zh.)
+ // MVD // TODO: to be exchanged with specific flags (timeInfo, fieldInfo etc.) (S.Zh.)
stationInfo.SetTimeInfo(1);
stationInfo.SetZ(layer->GetZ());
stationInfo.SetMaterial(layer->GetDz(), 0); // TODO: Why rad len is 0????? (S.Zh.)
diff --git a/reco/L1/L1Algo/L1BaseStationInfo.h b/reco/L1/L1Algo/L1BaseStationInfo.h
index ba46bbf1f6..5c81b707cc 100644
--- a/reco/L1/L1Algo/L1BaseStationInfo.h
+++ b/reco/L1/L1Algo/L1BaseStationInfo.h
@@ -115,7 +115,7 @@ public:
/// Gets the radiation length of the station material
fvec GetMaterialRadLength() const { return fL1Station.materialInfo.RL; }
/// Gets the relative material thickness in units of the radiational length
- fvec GetMaterialRadThick() const { return fL1Station.materialInfo.RadThick; }
+ fvec GetMaterialRadThick() const { return fL1Station.materialInfo.RadThick; }
/// Gets log of the relative material thickness in units of the radiational length
fvec GetMaterialLogRadThick() const { return fL1Station.materialInfo.logRadThick; }
diff --git a/reco/L1/L1Algo/L1InitManager.h b/reco/L1/L1Algo/L1InitManager.h
index 83e84596b5..fd3e51d7a2 100644
--- a/reco/L1/L1Algo/L1InitManager.h
+++ b/reco/L1/L1Algo/L1InitManager.h
@@ -155,7 +155,7 @@ private:
/* Basic fields */
std::bitset<L1InitManager::keEnd> fInitFlags {}; ///< Initialization flags
- std::set<L1DetectorID> fActiveDetectorIDs {}; ///< Set of tracking detectors, active during this analysis session
+ std::set<L1DetectorID> fActiveDetectorIDs {}; ///< Set of tracking detectors, active during this analysis session
/* Target fields */
diff --git a/reco/L1/L1Algo/L1Station.cxx b/reco/L1/L1Algo/L1Station.cxx
index 72eff039d6..9339317413 100644
--- a/reco/L1/L1Algo/L1Station.cxx
+++ b/reco/L1/L1Algo/L1Station.cxx
@@ -2,10 +2,12 @@
SPDX-License-Identifier: GPL-3.0-only
Authors: Sergey Gorbunov, Sergei Zharko [committer] */
-#include <iomanip>
-#include <FairLogger.h>
#include "L1Station.h"
+#include <FairLogger.h>
+
+#include <iomanip>
+
// TODO: Improve log style (S.Zh.)
void L1Station::Print() const
{
diff --git a/reco/L1/L1Algo/L1Station.h b/reco/L1/L1Algo/L1Station.h
index bbde36398f..db29a74cac 100644
--- a/reco/L1/L1Algo/L1Station.h
+++ b/reco/L1/L1Algo/L1Station.h
@@ -38,4 +38,4 @@ public:
} _fvecalignment;
-#endif // L1Station_h
+#endif // L1Station_h
diff --git a/reco/L1/L1Algo/utils/L1Utils.h b/reco/L1/L1Algo/utils/L1Utils.h
index d5bcc8d0e8..064a36c356 100644
--- a/reco/L1/L1Algo/utils/L1Utils.h
+++ b/reco/L1/L1Algo/utils/L1Utils.h
@@ -36,7 +36,7 @@ struct L1Utils {
{
aMap[key] = value;
}
-
+
/// Template function, which sets a value to ALL elements of the map
/// \param value New value of the element under the selected key
/// \param aMap A reference to the map, which element is to be modified
@@ -47,18 +47,19 @@ struct L1Utils {
it->second = value;
}
}
-
+
/// Template function, which resets the elements of one map with the values defined in another map
/// \param inMap A constant reference to the map containing new parameters
/// \param aMap A reference to the map, which is going to be modified
template<class Key, class T, class Hash = std::hash<Key>>
- static void SetMappedValuesToMap(const std::unordered_map<Key, T, Hash>& inMap, std::unordered_map<Key, T, Hash>& aMap)
+ static void SetMappedValuesToMap(const std::unordered_map<Key, T, Hash>& inMap,
+ std::unordered_map<Key, T, Hash>& aMap)
{
for (auto it = aMap.begin(); it != aMap.end(); ++it) {
if (inMap.find(it->first) != inMap.end()) { it->second = inMap.at(it->first); }
}
}
-
+
/// Template function to represent mapped contents into std::string
/// NOTE: operator<< must be defined for value of the map
template<class Key, class T, class Hash = std::hash<Key>>
--
GitLab