Skip to content
Snippets Groups Projects
Commit 8baea688 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'clang10.L1TopoCoreSim-20200701' into 'master'

L1TopoCoreSim+TrigGenericAlgs: Fix clang 10 warnings.

See merge request atlas/athena!34371
parents 39a145f2 efbf7eca
No related branches found
No related tags found
No related merge requests found
/* /*
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
#include "AcceptL1TopoMonitor.h" #include "AcceptL1TopoMonitor.h"
...@@ -415,7 +415,7 @@ HLT::ErrorCode AcceptL1TopoMonitor::hltStart() ...@@ -415,7 +415,7 @@ HLT::ErrorCode AcceptL1TopoMonitor::hltStart()
ATH_MSG_DEBUG( "Number of trigger lines configured "<<topoTriggers.size() ); ATH_MSG_DEBUG( "Number of trigger lines configured "<<topoTriggers.size() );
// Label histogram bins // Label histogram bins
std::map<unsigned int, std::string> topoCounterToName; std::map<unsigned int, std::string> topoCounterToName;
for(const TXC::TriggerLine tl : topoTriggers) { for(const TXC::TriggerLine& tl : topoTriggers) {
ATH_MSG_VERBOSE( tl.name()<<" "<<tl.counter() ); ATH_MSG_VERBOSE( tl.name()<<" "<<tl.counter() );
topoCounterToName.emplace(tl.counter(), tl.name()); topoCounterToName.emplace(tl.counter(), tl.name());
} }
......
/* /*
Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
*/ */
#include <iostream> #include <iostream>
#include <vector> #include <vector>
...@@ -68,7 +68,7 @@ int run(int argc, const char* argv[]) { ...@@ -68,7 +68,7 @@ int run(int argc, const char* argv[]) {
h[2] = new TH1F("Decision/DecisionModule3", "L1 Topo Decision (Module 3)", 64, 0, 64); h[2] = new TH1F("Decision/DecisionModule3", "L1 Topo Decision (Module 3)", 64, 0, 64);
const std::vector<TXC::TriggerLine> & topoTriggers = XMLParser.menu().getL1TopoConfigOutputList().getTriggerLines(); const std::vector<TXC::TriggerLine> & topoTriggers = XMLParser.menu().getL1TopoConfigOutputList().getTriggerLines();
for(const TXC::TriggerLine tl : topoTriggers) { for(const TXC::TriggerLine& tl : topoTriggers) {
h[tl.module()]->GetXaxis()->SetBinLabel(1+ tl.counter() % 64, tl.name().c_str()); h[tl.module()]->GetXaxis()->SetBinLabel(1+ tl.counter() % 64, tl.name().c_str());
} }
for(uint i=0; i<3; ++i) for(uint i=0; i<3; ++i)
......
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