Commit 6256a2f7 authored by Scott Snyder's avatar Scott Snyder Committed by Walter Lampl
Browse files

LumiCalc+TrigConfigSvc: Fix clang warnings: unused variable, missing override keywords.

parent 49fec1df
......@@ -1559,7 +1559,7 @@ LumiCalculator::MakePlots(const std::string& triggerchain)
this->SetHistogramStyle(m_intlumitrigrateruns_recorded, Form("Delivered luminosity = %.1f /#mub, Recorded luminosity = %.1f /#mub", //, Efficiency * x-sec = %.1f #mub",
total_l1ratediveffxsec,total_l1ratediveffxsec_recorded/*,m_effxsec*/), "Run number", Form("%s Luminosity (#mu b^{-1})",triggerchain.c_str()));
std::vector<TH1F*>::iterator itr, itr2;
std::vector<TH1F*>::iterator itr;
// and store the histograms
TString histFileName = TString("ilumicalc_histograms_") + TString(triggerchain) + ( runnbrstart==runnbrend ? Form("_%d_",runnbrstart) : Form("_%d-%d_",runnbrstart,runnbrend)) + TString(m_lumitag) + TString(".root");
......
......@@ -52,82 +52,82 @@ namespace TrigConf {
virtual ~DSConfigSvc();
// @brief initialize the service
StatusCode initialize();
virtual StatusCode initialize() override;
// @brief finalize the service
StatusCode finalize() {
virtual StatusCode finalize() override {
return StatusCode::SUCCESS;
}
// @brief set the master key of the configuration to be requested
StatusCode queryInterface( const InterfaceID& riid, void** ppvIF );
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvIF ) override;
// @brief L1 topo configuration menu
virtual const TXC::L1TopoMenu* menu() const {
virtual const TXC::L1TopoMenu* menu() const override {
return m_topoMenu.get();
}
// LVL1 menu and prescales only (no bunchgroups, prescale clocks, etc.)
const CTPConfig* ctpConfig() const {
virtual const CTPConfig* ctpConfig() const override {
return & m_ctpConfig;
}
// access muctpi configuration
const Muctpi* muctpiConfig() const {
virtual const Muctpi* muctpiConfig() const override {
return & m_ctpConfig.muCTPi();
}
// access to trigger thresholds
const ThresholdConfig* thresholdConfig() const {
virtual const ThresholdConfig* thresholdConfig() const override {
return & m_ctpConfig.menu().thresholdConfig();
}
// returns bunch group set
const BunchGroupSet* bunchGroupSet() const {
virtual const BunchGroupSet* bunchGroupSet() const override {
return & m_ctpConfig.bunchGroupSet();
}
// access to HLT chains
const HLTChainList* chainList() const {
virtual const HLTChainList* chainList() const override {
return & m_hltFrame.getHLTChainList();
}
// access to HLT chains
const HLTChainList& chains() const {
virtual const HLTChainList& chains() const override {
return m_hltFrame.chains();
}
// access to HLT sequences
const HLTSequenceList* sequenceList() const {
virtual const HLTSequenceList* sequenceList() const override {
return & m_hltFrame.getHLTSequenceList();
}
// access to HLT sequences
const HLTSequenceList& sequences() const {
virtual const HLTSequenceList& sequences() const override {
return m_hltFrame.sequences();
}
// access to SMK
uint32_t masterKey() const { return m_masterKey; }
virtual uint32_t masterKey() const override { return m_masterKey; }
// access to LVL1 prescale key
uint32_t lvl1PrescaleKey() const {
virtual uint32_t lvl1PrescaleKey() const override {
return m_lvl1PsKey;
}
// access to HLT prescale configuration key
uint32_t hltPrescaleKey() const { return m_hltPsKey; }
virtual uint32_t hltPrescaleKey() const override { return m_hltPsKey; }
// access to a description of the source of the configuration (TriggerDB/XMLfilename)
std::string configurationSource() const override {
virtual std::string configurationSource() const override {
return m_configSrc;
}
StatusCode updatePrescaleSets(uint requestcount);
virtual StatusCode updatePrescaleSets(uint requestcount) override;
// This method is called by TrigSteer on *every* event (keep it fast)
// This is never used in connection with COOL configuration data
StatusCode assignPrescalesToChains(uint lumiblock );
virtual StatusCode assignPrescalesToChains(uint lumiblock ) override;
private:
StatusCode registerCallbackForFolder( const std::string& foldername,
......
......@@ -39,37 +39,37 @@ namespace TrigConf {
virtual ~TrigConfigSvc(){}
StatusCode initialize();
virtual StatusCode initialize() override;
StatusCode queryInterface( const InterfaceID& riid, void** ppvIF );
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvIF ) override;
static const InterfaceID& interfaceID() { return ITrigConfigSvc::interfaceID(); }
// L1Topo menu
const TXC::L1TopoMenu* menu() const;
virtual const TXC::L1TopoMenu* menu() const override;
// Lvl1 Accessors
const Muctpi* muctpiConfig() const;
const CTPConfig* ctpConfig() const;
const ThresholdConfig* thresholdConfig() const;
const BunchGroupSet* bunchGroupSet() const;
virtual const Muctpi* muctpiConfig() const override;
virtual const CTPConfig* ctpConfig() const override;
virtual const ThresholdConfig* thresholdConfig() const override;
virtual const BunchGroupSet* bunchGroupSet() const override;
// HLT accessors
const HLTChainList* chainList() const;
const HLTChainList& chains() const;
const HLTSequenceList* sequenceList() const;
const HLTSequenceList& sequences() const;
virtual const HLTChainList* chainList() const override;
virtual const HLTChainList& chains() const override;
virtual const HLTSequenceList* sequenceList() const override;
virtual const HLTSequenceList& sequences() const override;
// Super Master Key - 0 if from XML, other cases TBI.
uint32_t masterKey() const ;
uint32_t lvl1PrescaleKey() const ;
uint32_t hltPrescaleKey() const ;
std::string configurationSource() const override {
virtual uint32_t masterKey() const override;
virtual uint32_t lvl1PrescaleKey() const override;
virtual uint32_t hltPrescaleKey() const override;
virtual std::string configurationSource() const override {
return "";
}
StatusCode updatePrescaleSets(uint requestcount);
virtual StatusCode updatePrescaleSets(uint requestcount) override;
StatusCode assignPrescalesToChains(uint lumiblock );
virtual StatusCode assignPrescalesToChains(uint lumiblock ) override;
private:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment