From 41a2ef67b094bdf3dbce752b13a60cb04fd10e7b Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Thu, 28 Jan 2021 08:24:05 +0100
Subject: [PATCH] missing bracket
---
corsika/detail/modules/OnShellCheck.inl | 5 +++--
corsika/detail/modules/conex/CONEXhybrid.inl | 8 +-------
corsika/detail/modules/qgsjetII/qgsjet-II-04.inl | 4 ++--
3 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/corsika/detail/modules/OnShellCheck.inl b/corsika/detail/modules/OnShellCheck.inl
index aa6b0453f..bd77def88 100644
--- a/corsika/detail/modules/OnShellCheck.inl
+++ b/corsika/detail/modules/OnShellCheck.inl
@@ -14,8 +14,8 @@
namespace corsika {
- OnShellCheck::OnShellCheck(const double vMassTolerance, const double vEnergyTolerance,
- const bool vError)
+ OnShellCheck::OnShellCheck(double const vMassTolerance, double const vEnergyTolerance,
+ bool const vError)
: mass_tolerance_(vMassTolerance)
, energy_tolerance_(vEnergyTolerance)
, throw_error_(vError) {
@@ -73,6 +73,7 @@ namespace corsika {
if (throw_error_)
throw std::runtime_error(
"OnShellCheck: error! shifted energy by large amount!");
+ }
}
// reset energy
diff --git a/corsika/detail/modules/conex/CONEXhybrid.inl b/corsika/detail/modules/conex/CONEXhybrid.inl
index 52bd64101..29c3886aa 100644
--- a/corsika/detail/modules/conex/CONEXhybrid.inl
+++ b/corsika/detail/modules/conex/CONEXhybrid.inl
@@ -11,6 +11,7 @@
#include <corsika/modules/conex/CONEX_f.hpp>
#include <corsika/framework/random/RNGManager.hpp>
#include <corsika/framework/core/PhysicalConstants.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <conexConfig.h>
@@ -40,13 +41,6 @@ namespace corsika {
/*
auto const transform = CoordinateSystem::getTransformation(
intermediateCS2, c8cs); // either this way or vice versa... TODO: test this!
- std::cout << transform.matrix() << std::endl << std::endl;
- std::cout << CoordinateSystem::getTransformation(intermediateCS, c8cs).matrix()
- << std::endl
- << std::endl;
- std::cout << CoordinateSystem::getTransformation(intermediateCS2, intermediateCS)
- .matrix()
- << std::endl;
*/
return transformCS;
})}
diff --git a/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl b/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl
index 130ac0173..aca1429c3 100644
--- a/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl
+++ b/corsika/detail/modules/qgsjetII/qgsjet-II-04.inl
@@ -11,14 +11,14 @@
#include <corsika/modules/qgsjetII/qgsjet-II-04.hpp>
#include <corsika/framework/random/RNGManager.hpp>
+#include <corsika/framework/core/Logging.hpp>
#include <iostream>
#include <random>
datadir::datadir(const std::string& dir) {
if (dir.length() > 130) {
- std::cerr << "QGSJetII error, will cut datadir \"" << dir
- << "\" to 130 characters: " << std::endl;
+ CORSIKA_LOG_ERROR("QGSJetII error, will cut datadir \"{}\" to 130 characters: ", {});
}
int i = 0;
for (i = 0; i < std::min(130, int(dir.length())); ++i) data[i] = dir[i];
--
GitLab