Skip to content
Snippets Groups Projects
Commit 1aa563ba authored by Adam Edward Barton's avatar Adam Edward Barton :speech_balloon:
Browse files

Merge branch 'fix-lbn-histograms' into 'master'

Make LBN histogram names more ROOT friendly

See merge request atlas/athena!32925
parents 901aa42a f0a8a7cc
No related branches found
No related tags found
No related merge requests found
......@@ -58,7 +58,10 @@ namespace Monitored {
const unsigned minLumi = lumiPage * historyDepth;
const unsigned maxLumi = minLumi + historyDepth - 1;
def.alias = def.alias + "(" + std::to_string(minLumi) + "-" + std::to_string(maxLumi) + ")";
if ( historyDepth > 1 )
def.alias = def.alias + "_LB" + std::to_string(minLumi) + "_" + std::to_string(maxLumi);
else
def.alias = def.alias + "_LB" + std::to_string(minLumi);
return m_factory->create(def);
}
......@@ -69,4 +72,4 @@ namespace Monitored {
};
}
#endif /* AthenaMonitoringKernel_HistogramFiller_LumiblockHistogramProvider_h */
\ No newline at end of file
#endif /* AthenaMonitoringKernel_HistogramFiller_LumiblockHistogramProvider_h */
......@@ -75,16 +75,16 @@ class LumiblockHistogramProviderTestSuite {
void test_shouldCreateNewHistogramWithUpdatedAlias() {
auto expectedFlow = {
make_tuple(0, "test alias(0-2)"),
make_tuple(1, "test alias(0-2)"),
make_tuple(2, "test alias(0-2)"),
make_tuple(3, "test alias(3-5)"),
make_tuple(4, "test alias(3-5)"),
make_tuple(5, "test alias(3-5)"),
make_tuple(6, "test alias(6-8)"),
make_tuple(7, "test alias(6-8)"),
make_tuple(8, "test alias(6-8)"),
make_tuple(9, "test alias(9-11)"),
make_tuple(0, "test alias_LB0_2"),
make_tuple(1, "test alias_LB0_2"),
make_tuple(2, "test alias_LB0_2"),
make_tuple(3, "test alias_LB3_5"),
make_tuple(4, "test alias_LB3_5"),
make_tuple(5, "test alias_LB3_5"),
make_tuple(6, "test alias_LB6_8"),
make_tuple(7, "test alias_LB6_8"),
make_tuple(8, "test alias_LB6_8"),
make_tuple(9, "test alias_LB9_11"),
};
TNamed histogram;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment