From 44dcfb0d562fc0dd0c1e29f66b0758c276fff3d9 Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Sat, 1 May 2021 12:56:22 +0200
Subject: [PATCH] urqmd better filename handling
---
corsika/detail/modules/urqmd/UrQMD.inl | 5 +++--
corsika/modules/urqmd/UrQMD.hpp | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/corsika/detail/modules/urqmd/UrQMD.inl b/corsika/detail/modules/urqmd/UrQMD.inl
index f251c60ba..f0409e815 100644
--- a/corsika/detail/modules/urqmd/UrQMD.inl
+++ b/corsika/detail/modules/urqmd/UrQMD.inl
@@ -29,7 +29,7 @@
namespace corsika::urqmd {
- inline UrQMD::UrQMD(boost::filesystem::path const& xs_file) {
+ inline UrQMD::UrQMD(boost::filesystem::path xs_file) {
readXSFile(xs_file);
::urqmd::iniurqmdc8_();
}
@@ -394,7 +394,7 @@ namespace corsika::urqmd {
return mapPDGToUrQMD.at(static_cast<int>(get_PDG(code)));
}
- inline void UrQMD::readXSFile(boost::filesystem::path const& filename) {
+ inline void UrQMD::readXSFile(boost::filesystem::path const filename) {
boost::filesystem::ifstream file(filename, std::ios::in);
if (!file.is_open()) {
@@ -429,6 +429,7 @@ namespace corsika::urqmd {
std::getline(file, line);
}
}
+ file.close();
}
} // namespace corsika::urqmd
diff --git a/corsika/modules/urqmd/UrQMD.hpp b/corsika/modules/urqmd/UrQMD.hpp
index 3f6d3e993..69cb4a937 100644
--- a/corsika/modules/urqmd/UrQMD.hpp
+++ b/corsika/modules/urqmd/UrQMD.hpp
@@ -27,7 +27,7 @@ namespace corsika::urqmd {
class UrQMD : public InteractionProcess<UrQMD> {
public:
- UrQMD(boost::filesystem::path const& path = corsika_data("UrQMD/UrQMD-1.3.1-xs.dat"));
+ UrQMD(boost::filesystem::path const path = corsika_data("UrQMD/UrQMD-1.3.1-xs.dat"));
template <typename TParticle>
GrammageType getInteractionLength(TParticle const&) const;
@@ -46,7 +46,7 @@ namespace corsika::urqmd {
private:
static CrossSectionType getCrossSection(Code, Code, HEPEnergyType, int);
- void readXSFile(boost::filesystem::path const&);
+ void readXSFile(boost::filesystem::path);
// data members
default_prng_type& RNG_ = RNGManager::getInstance().getRandomStream("urqmd");
--
GitLab