Skip to content
Snippets Groups Projects
Commit 579be5a0 authored by Vakhtang Tsulaia's avatar Vakhtang Tsulaia
Browse files

JetToolHelpers: fixed clang warnings

- Missing destructor
- Missing override keyword
- Adding 'const int' to a string does not append to the string
parent 036a7903
No related branches found
No related tags found
28 merge requests!78241Draft: FPGATrackSim: GenScan code refactor,!78236Draft: Switching Streams https://its.cern.ch/jira/browse/ATR-27417,!78056AFP monitoring: new synchronization and cleaning,!78041AFP monitoring: new synchronization and cleaning,!77990Updating TRT chip masks for L1TRT trigger simulation - ATR-28372,!77733Draft: add new HLT NN JVT, augmented with additional tracking information,!77731Draft: Updates to ZDC reconstruction,!77728Draft: updates to ZDC reconstruction,!77522Draft: sTGC Pad Trigger Emulator,!76725ZdcNtuple: Fix cppcheck warning.,!76611L1CaloFEXByteStream: Fix out-of-bounds array accesses.,!76475Punchthrough AF3 implementation in FastG4,!76474Punchthrough AF3 implementation in FastG4,!75729New implementation of ZDC nonlinear FADC correction.,!75703Draft: Update to HI han config for HLT jets,!75184Draft: Update file heavyions_run.config,!74430Draft: Fixing upper bound for Delayed Jet Triggers,!73963Changing the path of the histograms to "Expert" area,!73875updating ID ART reference plots,!73874AtlasCLHEP_RandomGenerators: Fix cppcheck warnings.,!73449Add muon detectors to DarkJetPEBTLA partial event building,!73343Draft: [TrigEgamma] Add photon ringer chains on bootstrap mechanism,!72336Fixed TRT calibration crash,!72176Draft: Improving L1TopoOnline chain that now gets no-empty plots. Activating it by default,!72012Draft: Separate JiveXMLConfig.py into Config files,!71876Fix MET trigger name in MissingETMonitoring,!71820Draft: Adding new TLA End-Of-Fill (EOF) chains and removing obsolete DIPZ chains,!71778JetToolHelpers: fixed clang warnings
......@@ -34,13 +34,16 @@ class InputVariable : public IInputVariable
const bool isJetVar
);
// Constructors
/// Constructors
InputVariable(const std::string& name): m_name{name}, m_scale{1.} {}
InputVariable(
const std::string& name,
std::function<float(const xAOD::Jet& jet, const JetContext& jc)> func
);
/// Default destructor
virtual ~InputVariable() = default;
/// return the value of the variable choose by the user
[[nodiscard]] float getValue(const xAOD::Jet& jet, const JetContext& jc) const override {
return m_scale * getValue_prot(jet, jc);
......
......@@ -33,7 +33,7 @@ class VarTool : public asg::AsgTool, virtual public IVarTool
/// Constructor for standalone usage
VarTool(const std::string& name);
/// Function initialising the tool
virtual StatusCode initialize();
virtual StatusCode initialize() override;
/// return the InputVariable ready to be use
const InputVariable * getvar() const {return m_v.get();};
/// return either xAOD or context variable values
......
......@@ -91,7 +91,7 @@ double HistoInputBase::readFromHisto(const double X, const double Y, const doubl
else if (nDim == 3)
return m_hist->Interpolate(X,Y,Z);
// Shouldn't reach here due to previous checks
throw std::runtime_error("Unexpected number of dimensions of histogram: " + nDim);
throw std::runtime_error("Unexpected number of dimensions of histogram: " + std::to_string(nDim));
return 0;
}
} // namespace JetHelper
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