From 01c172fb37643f63ee92824a9c00ba8ec1fa76d6 Mon Sep 17 00:00:00 2001 From: Alan Coleman <alanc@udel.edu> Date: Fri, 1 Dec 2023 13:03:57 +0100 Subject: [PATCH] Fix warnings and error --- corsika/detail/modules/energy_loss/BetheBlochPDG.inl | 2 +- corsika/modules/writers/EnergyLossWriter.hpp | 2 +- corsika/modules/writers/LongitudinalWriter.hpp | 4 ++-- corsika/modules/writers/WriterOff.hpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl index ccacc0ddc..fed757cd4 100644 --- a/corsika/detail/modules/energy_loss/BetheBlochPDG.inl +++ b/corsika/detail/modules/energy_loss/BetheBlochPDG.inl @@ -163,7 +163,7 @@ namespace corsika { // if (dE > HEPEnergyType::zero()) // dE = -dE; CORSIKA_LOG_TRACE("EnergyLoss dE={} MeV, Ekin={} GeV, EkinNew={} GeV", dE / 1_MeV, - step.getEkinPre() / 1_GeV, step.getEkinPre() + dE / 1_GeV); + step.getEkinPre() / 1_GeV, (step.getEkinPre() + dE) / 1_GeV); step.add_dEkin(dE); // also send to output diff --git a/corsika/modules/writers/EnergyLossWriter.hpp b/corsika/modules/writers/EnergyLossWriter.hpp index b516ab626..c247b424e 100644 --- a/corsika/modules/writers/EnergyLossWriter.hpp +++ b/corsika/modules/writers/EnergyLossWriter.hpp @@ -156,7 +156,7 @@ namespace corsika { /** * Return the configuration of this output. */ - YAML::Node getConfig() const; + YAML::Node getConfig() const override; private: ShowerAxis const& showerAxis_; ///< conversion between geometry and grammage diff --git a/corsika/modules/writers/LongitudinalWriter.hpp b/corsika/modules/writers/LongitudinalWriter.hpp index caa49f9af..0d6eb2822 100644 --- a/corsika/modules/writers/LongitudinalWriter.hpp +++ b/corsika/modules/writers/LongitudinalWriter.hpp @@ -122,12 +122,12 @@ namespace corsika { /** * Return a summary. */ - YAML::Node getSummary() const; + YAML::Node getSummary() const override; /** * Return the configuration of this output. */ - YAML::Node getConfig() const; + YAML::Node getConfig() const override; number_profile::ProfileData const& getProfile( number_profile::ProfileIndex index) const { diff --git a/corsika/modules/writers/WriterOff.hpp b/corsika/modules/writers/WriterOff.hpp index 3d752cc9a..da418d54d 100644 --- a/corsika/modules/writers/WriterOff.hpp +++ b/corsika/modules/writers/WriterOff.hpp @@ -43,7 +43,7 @@ namespace corsika { template <typename... TArgs> void write(TArgs&&...) {} - virtual YAML::Node getConfig() const { return YAML::Node(); } + virtual YAML::Node getConfig() const override { return YAML::Node(); } }; // class WriterOff -- GitLab