Merge branch 'populate-mu-hash' into 'master'

TrigCost: Fix missing chain-algorithm mapping

See merge request atlas/athena!42207

Trigger/TrigCost/TrigCostAnalysis/src/TrigCostAnalysis.cxx

@@ -91,11 +91,13 @@ StatusCode TrigCostAnalysis::start() {
   ATH_CHECK( m_algToChainTool->getAllChains(chains));
   for (const TrigConf::Chain& chain : chains) {
     HLT::Identifier(chain.name());
+    TrigConf::HLTUtils::string2hash(chain.name());
 
     // Populate legs' names
     const size_t legsSize {chain.legMultiplicities().size()};
-    for (size_t counter = 0; legsSize > 1 && counter < legsSize; ++counter){\
-      TrigCompositeUtils::createLegName(chain.namehash(), counter);
+    for (size_t counter = 0; legsSize > 1 && counter < legsSize; ++counter){
+      HLT::Identifier l = TrigCompositeUtils::createLegName(chain.namehash(), counter);
+      TrigConf::HLTUtils::string2hash(l.name());
     }
   }
 

Trigger/TrigCost/TrigCostAnalysis/src/counters/CounterChain.cxx

@@ -13,7 +13,7 @@ CounterChain::CounterChain(const std::string& name, const MonitorBase* parent)
 {
   regHistogram("Group_perCall", "Chain group/Call;Group;Calls", VariableType::kPerCall, kLinear, -0.5, 9.5, 10);
   regHistogram("Chain_perEvent", "Chain calls/Event;Chain call;Events", VariableType::kPerEvent, kLinear, -0.5, 49.5);
-  regHistogram("AlgCalls_perEvent", "Algorithm Calls/Event;Calls;Events", VariableType::kPerEvent, kLinear, -0.5, 49.5);
+  regHistogram("AlgCalls_perEvent", "Algorithm Calls/Event;Calls;Events", VariableType::kPerEvent, kLinear, -0.5, 99.5);
   regHistogram("Time_perCall", "CPU Time/Call;Time [ms];Calls", VariableType::kPerCall);
   regHistogram("Time_perEvent", "CPU Time/Event;Time [ms];Events", VariableType::kPerEvent);
   regHistogram("ChainPassed_perEvent", "Passed chain/Event;Passsed;Events", VariableType::kPerEvent, kLinear, -0.5, 1.5, 2);

Trigger/TrigSteer/TrigCompositeUtils/Root/AlgToChainTool.cxx

@@ -147,8 +147,10 @@ std::set<TrigCompositeUtils::DecisionID> TrigCompositeUtils::AlgToChainTool::ret
             TrigCompositeUtils::decisionIDs( d, chainsID );
 
             // Save the active chains IDs
-            activeChainsID.insert( chainsID.begin(), chainsID.end() );
-        } 
+            for (TrigCompositeUtils::DecisionID id : chainsID){
+                activeChainsID.insert(TrigCompositeUtils::getIDFromLeg(id));
+            }
+        }
     }
 
     return activeChainsID;