From 61f610dd0e0b867a97a1471a46f4ef2fb29b89ba Mon Sep 17 00:00:00 2001
From: ralfulrich <ralf.ulrich@kit.edu>
Date: Fri, 29 Jan 2021 00:52:17 +0100
Subject: [PATCH] style
---
corsika/detail/framework/geometry/FourVector.inl | 2 +-
.../detail/framework/geometry/QuantityVector.inl | 4 ++--
corsika/detail/media/WeightProvider.inl | 2 +-
corsika/detail/modules/OnShellCheck.inl | 11 +++++------
do-clang-format.py | 15 ++++++++++++---
5 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/corsika/detail/framework/geometry/FourVector.inl b/corsika/detail/framework/geometry/FourVector.inl
index 135790bfc..6c0a039e5 100644
--- a/corsika/detail/framework/geometry/FourVector.inl
+++ b/corsika/detail/framework/geometry/FourVector.inl
@@ -95,7 +95,7 @@ namespace corsika {
template <typename TTimeType, typename TSpaceVecType>
typename FourVector<TTimeType, TSpaceVecType>::norm_type
- FourVector<TTimeType, TSpaceVecType>::operator*(FourVector const& b) {
+ FourVector<TTimeType, TSpaceVecType>::operator*(FourVector const& b) {
if constexpr (std::is_same<time_type, decltype(std::declval<space_type>() / meter *
second)>::value)
return timeLike_ * b.timeLike_ * constants::cSquared - spaceLike_.norm();
diff --git a/corsika/detail/framework/geometry/QuantityVector.inl b/corsika/detail/framework/geometry/QuantityVector.inl
index 6ba02e4f8..2ca24ee5a 100644
--- a/corsika/detail/framework/geometry/QuantityVector.inl
+++ b/corsika/detail/framework/geometry/QuantityVector.inl
@@ -17,8 +17,8 @@
namespace corsika {
template <typename TDimension>
- inline typename QuantityVector<TDimension>::quantity_type
- QuantityVector<TDimension>::operator[](size_t const index) const {
+ inline typename QuantityVector<TDimension>::quantity_type QuantityVector<TDimension>::
+ operator[](size_t const index) const {
return quantity_type(phys::units::detail::magnitude_tag, eigenVector_[index]);
}
diff --git a/corsika/detail/media/WeightProvider.inl b/corsika/detail/media/WeightProvider.inl
index c075b2363..af9849aa3 100644
--- a/corsika/detail/media/WeightProvider.inl
+++ b/corsika/detail/media/WeightProvider.inl
@@ -20,7 +20,7 @@ namespace corsika {
template <class AConstIterator, class BConstIterator>
typename WeightProviderIterator<AConstIterator, BConstIterator>::value_type
- WeightProviderIterator<AConstIterator, BConstIterator>::operator*() const {
+ WeightProviderIterator<AConstIterator, BConstIterator>::operator*() const {
return ((*aIter_) * (*bIter_)).magnitude();
}
diff --git a/corsika/detail/modules/OnShellCheck.inl b/corsika/detail/modules/OnShellCheck.inl
index ec31f8d70..f8f0b0081 100644
--- a/corsika/detail/modules/OnShellCheck.inl
+++ b/corsika/detail/modules/OnShellCheck.inl
@@ -73,14 +73,13 @@ namespace corsika {
if (throw_error_) {
throw std::runtime_error(
"OnShellCheck: error! shifted energy by large amount!");
+ }
}
- }
- // reset energy
- p.setEnergy(e_shifted);
- }
- else {
- CORSIKA_LOGGER_DEBUG(logger_, "particle mass for {} OK", pid);
+ // reset energy
+ p.setEnergy(e_shifted);
+ } else {
+ CORSIKA_LOGGER_DEBUG(logger_, "particle mass for {} OK", pid);
}
}
} // namespace corsika
diff --git a/do-clang-format.py b/do-clang-format.py
index 076a5ccdf..11409fe1f 100755
--- a/do-clang-format.py
+++ b/do-clang-format.py
@@ -15,6 +15,8 @@ parser.add_argument('--apply', action="store_true",
help="Apply clang-format to files which need changes.")
parser.add_argument("--all", action="store_true",
help="Check all files below current path instead of new/modified.")
+parser.add_argument("--docker", action="store_true",
+ help="Use corsika/devel:clang-8 container to run clang-format. Make sure you are in group \"docker\". ")
args = parser.parse_args()
@@ -67,10 +69,17 @@ else:
filelist_clean.append(f)
filelist = filelist_clean
-cmd = "clang-format"
+cmd = ["clang-format"]
if "CLANG_FORMAT" in os.environ:
- cmd = os.environ["CLANG_FORMAT"]
-cmd += " -style=file"
+ cmd = [os.environ["CLANG_FORMAT"]]
+if args.docker:
+ USER=os.environ["USER"]
+ UID=os.getuid()
+ GID=os.getgid()
+ PWD=os.getcwd()
+ # note, currently in container it is clang-8
+ cmd = "docker container run --rm -v {}:/corsika -w /corsika -u {}:{} corsika/devel:clang-8 clang-format-8".format(PWD,UID,GID)
+cmd += " -style=file"
if args.apply:
for filename in filelist:
subp.check_call(cmd.split() + ["-i", filename])
--
GitLab