Skip to content

Commit 92ff5ab

Browse files
committed
fix: get rid of MergeParticleIDConfig::Print
1 parent f1d4be1 commit 92ff5ab

File tree

3 files changed

+13
-18
lines changed

3 files changed

+13
-18
lines changed

src/algorithms/pid/MergeParticleID.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
namespace eicrecon {
2222

23-
void MergeParticleID::init() { m_cfg.Print<algorithms::LogLevel::kDebug>(this); }
23+
void MergeParticleID::init() { debug() << m_cfg << endmsg; }
2424

2525
void MergeParticleID::process(const MergeParticleID::Input& input,
2626
const MergeParticleID::Output& output) const {

src/algorithms/pid/MergeParticleID.h

-14
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,7 @@ class MergeParticleID : public MergeParticleIDAlgorithm,
5757
#endif
5858
}
5959

60-
friend class MergeParticleIDConfig;
6160
friend class Tools;
6261
};
6362

64-
// Definition of MergeParticleIDConfig::Print requires class MergeParticleID, but
65-
// circular dependency prevents it from being in MergeParticleIDConfig.h
66-
template <algorithms::LogLevel lvl>
67-
constexpr void MergeParticleIDConfig::Print(const MergeParticleID* logger) const {
68-
// print all parameters
69-
logger->log<lvl>("{:=^60}", " MergeParticleIDConfig Settings ");
70-
auto print_param = [&logger](auto name, auto val) {
71-
logger->log<lvl>(" {:>20} = {:<}", name, val);
72-
};
73-
print_param("mergeMode", mergeMode);
74-
logger->log<lvl>("{:=^60}", "");
75-
}
76-
7763
} // namespace eicrecon

src/algorithms/pid/MergeParticleIDConfig.h

+12-3
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,17 @@ class MergeParticleIDConfig {
2323
//
2424
/////////////////////////////////////////////////////
2525

26-
// print all parameters
27-
template <algorithms::LogLevel lvl = algorithms::LogLevel::kDebug>
28-
constexpr void Print(const MergeParticleID* logger) const;
26+
// stream all parameters
27+
friend std::ostream& operator<<(std::ostream& os, const MergeParticleIDConfig& cfg) {
28+
// print all parameters
29+
os << fmt::format("{:=^60}", " MergeParticleIDConfig Settings ") << std::endl;
30+
auto print_param = [&os](auto name, auto val) {
31+
os << fmt::format(" {:>20} = {:<}", name, val) << std::endl;
32+
};
33+
print_param("mergeMode", cfg.mergeMode);
34+
os << fmt::format("{:=^60}", "") << std::endl;
35+
return os;
36+
}
2937
};
38+
3039
} // namespace eicrecon

0 commit comments

Comments
 (0)