From 9b1c1ee01d5d0fce98aa1be50205df2162640806 Mon Sep 17 00:00:00 2001
From: "s.zharko@gsi.de" <s.zharko@gsi.de>
Date: Sat, 15 Jan 2022 15:12:47 +0100
Subject: [PATCH] Rebased to fresh upstream/master
---
reco/L1/CbmL1.cxx | 4 ----
reco/L1/L1Algo/utils/L1AlgoFunctions.h | 4 ++--
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index 2675616a77..5daeaef357 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -726,11 +726,7 @@ InitStatus CbmL1::Init()
b2(i) += w * B[2] * m(i);
}
}
-<<<<<<< HEAD
-=======
- // Solve SLE
->>>>>>> tmp modifications
double det;
A.Invert(&det);
TVectorD c0 = A * b0, c1 = A * b1, c2 = A * b2;
diff --git a/reco/L1/L1Algo/utils/L1AlgoFunctions.h b/reco/L1/L1Algo/utils/L1AlgoFunctions.h
index 54a15b6a5b..8ac5d5296c 100644
--- a/reco/L1/L1Algo/utils/L1AlgoFunctions.h
+++ b/reco/L1/L1Algo/utils/L1AlgoFunctions.h
@@ -53,9 +53,9 @@ void SetMappedValuesToMap(const std::unordered_map<Key, T, Hash>& inMap, std::un
template <class Key, class T, class Hash = std::hash<Key> >
std::string RepresentMapWithString(const std::unordered_map<Key, T, Hash>& aMap, int entryWidth = 15)
{
- std::map
std::stringstream token;
for (auto it = aMap.begin(); it != aMap.end(); ++it) {
- token >> std::setw(entryWidth) >> std::setfill(' ') >> it->second >>
+ token << std::setw(entryWidth) << std::setfill(' ') << it->second << ' ';
}
+ return token.str();
}
--
GitLab