diff --git a/Environment/Environment.h b/Environment/Environment.h
index 9968f033ddd3705db2fd5059301b387ca8e8503e..97931aeffe2fe557b0328f97bbea8712a5dffc7e 100644
--- a/Environment/Environment.h
+++ b/Environment/Environment.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_Environment_h
#define _include_Environment_h
diff --git a/Environment/FlatAtmosphere/FlatAtmosphere.h b/Environment/FlatAtmosphere/FlatAtmosphere.h
index 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/Environment/FlatAtmosphere/FlatAtmosphere.h
+++ b/Environment/FlatAtmosphere/FlatAtmosphere.h
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-
diff --git a/Environment/HomogeneousMedium.h b/Environment/HomogeneousMedium.h
index ffa2189bd868a60a733a13c5fe3e83abd3b1c269..e426314002fe3996ef375f88c6ae987e22d2c6ae 100644
--- a/Environment/HomogeneousMedium.h
+++ b/Environment/HomogeneousMedium.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_HomogeneousMedium_h_
#define _include_HomogeneousMedium_h_
diff --git a/Environment/IMediumModel.h b/Environment/IMediumModel.h
index da5ebef76e598e700beb2b34bb322fee4b720870..84832eef0025c4a9c255d88857165bf3b9e0800c 100644
--- a/Environment/IMediumModel.h
+++ b/Environment/IMediumModel.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_IMediumModel_h
#define _include_IMediumModel_h
diff --git a/Environment/NuclearComposition.h b/Environment/NuclearComposition.h
index 841087898652e23e28be87db429177e49e8d5b9c..40bf93ed40b3fedd90f4e1c2c50f24408e8b8894 100644
--- a/Environment/NuclearComposition.h
+++ b/Environment/NuclearComposition.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_NuclearComposition_h
#define _include_NuclearComposition_h
diff --git a/Environment/VolumeTreeNode.h b/Environment/VolumeTreeNode.h
index dca8445e29476072c831616f657650b52aa23401..3331c41bf5e060bb904f5a78f78485af0440d04b 100644
--- a/Environment/VolumeTreeNode.h
+++ b/Environment/VolumeTreeNode.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_VolumeTreeNode_H
#define _include_VolumeTreeNode_H
diff --git a/Environment/testEnvironment.cc b/Environment/testEnvironment.cc
index 222fd6e9e49eee9a1b8469dca5a732baa472579d..5856818670ec1ddd8df187f624b8ca45e2e4e117 100644
--- a/Environment/testEnvironment.cc
+++ b/Environment/testEnvironment.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
diff --git a/Framework/Cascade/Cascade.h b/Framework/Cascade/Cascade.h
index b37adcc8bfea776f6f4e5658a5623854a85c64e3..3adaac2bc3cdb0b0fc23b4f1f986c4e9863a7f65 100644
--- a/Framework/Cascade/Cascade.h
+++ b/Framework/Cascade/Cascade.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_cascade_Cascade_h_
#define _include_corsika_cascade_Cascade_h_
diff --git a/Framework/Cascade/Step.cc b/Framework/Cascade/Step.cc
index 4f58b982d8f3569090ae2cd173b05835ee41c397..ba29d2341a3863ec019e6001ad727c8901bee77d 100644
--- a/Framework/Cascade/Step.cc
+++ b/Framework/Cascade/Step.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
namespace cascade;
void Cascade::Step(auto& sequence, Particle& particle) {
diff --git a/Framework/Cascade/testCascade.cc b/Framework/Cascade/testCascade.cc
index 09c38441c3c17cfc64b17cd4f5efda2f64a82feb..7abf985ad612ba9f6fb23bae31615d2d392b5f93 100644
--- a/Framework/Cascade/testCascade.cc
+++ b/Framework/Cascade/testCascade.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <limits>
#include <corsika/environment/Environment.h>
diff --git a/Framework/Geometry/BaseTrajectory.h b/Framework/Geometry/BaseTrajectory.h
index 6e62d87c236a2354b628b73d86d7fc81e5c26e95..d8cf7ff5633de7847db2ede94634346048af08bb 100644
--- a/Framework/Geometry/BaseTrajectory.h
+++ b/Framework/Geometry/BaseTrajectory.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/BaseVector.h b/Framework/Geometry/BaseVector.h
index 4f4c723e057aac3ce95d491bfb0ffc2413a6aae7..106fb632446f476913bb93b01e085912182ebb1e 100644
--- a/Framework/Geometry/BaseVector.h
+++ b/Framework/Geometry/BaseVector.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/CoordinateSystem.cc b/Framework/Geometry/CoordinateSystem.cc
index f42b13a6636b24bc61353daf5682c9084dbb8aa0..6f818462b0399f7026864d7de3fc8da6aba877c9 100644
--- a/Framework/Geometry/CoordinateSystem.cc
+++ b/Framework/Geometry/CoordinateSystem.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/CoordinateSystem.h b/Framework/Geometry/CoordinateSystem.h
index e29359b81f06da161a53911125df9a776242b60b..aaf226f3833b732488bcb457f76c0dbbd80049dc 100644
--- a/Framework/Geometry/CoordinateSystem.h
+++ b/Framework/Geometry/CoordinateSystem.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_COORDINATESYSTEM_H_
#define _include_COORDINATESYSTEM_H_
diff --git a/Framework/Geometry/FourVector.h b/Framework/Geometry/FourVector.h
index d9e792d9cfaad7d595c9ec79696890567bd3614f..1cd15c6afc2f0fa4e21bb1168f2fdb8211078b25 100644
--- a/Framework/Geometry/FourVector.h
+++ b/Framework/Geometry/FourVector.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/Helix.h b/Framework/Geometry/Helix.h
index 5875f6738ed7008ddb3ba6b8511d10bd2e261d71..4d9badf8c757721507613a5abb1c4257dbe3ae0b 100644
--- a/Framework/Geometry/Helix.h
+++ b/Framework/Geometry/Helix.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/Line.h b/Framework/Geometry/Line.h
index f6730d5eb5bda2c7c179e11a1f5944810c242361..8672aa178ecbc2bcc9dffd199d2348db0f9e86d4 100644
--- a/Framework/Geometry/Line.h
+++ b/Framework/Geometry/Line.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/Point.h b/Framework/Geometry/Point.h
index 5d3ea99323ee15e4e24287f74b2d0535ba76ea4a..f05bd31d1ca628f1f32834a9e6d6300e6ef2578c 100644
--- a/Framework/Geometry/Point.h
+++ b/Framework/Geometry/Point.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_POINT_H_
#define _include_POINT_H_
diff --git a/Framework/Geometry/QuantityVector.h b/Framework/Geometry/QuantityVector.h
index 03f98af05e06269d75edf1b4a9467ab3f02e9498..dafef96b6a36e40f7b64d26582b70496ddb6017c 100644
--- a/Framework/Geometry/QuantityVector.h
+++ b/Framework/Geometry/QuantityVector.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_QUANTITYVECTOR_H_
#define _include_QUANTITYVECTOR_H_
diff --git a/Framework/Geometry/RootCoordinateSystem.h b/Framework/Geometry/RootCoordinateSystem.h
index 34091bcf47bc09d124f74b004752d46ad7837647..b5f496aa48e2e5ee0c89aba0c84e39b4df1fbd67 100644
--- a/Framework/Geometry/RootCoordinateSystem.h
+++ b/Framework/Geometry/RootCoordinateSystem.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/Sphere.h b/Framework/Geometry/Sphere.h
index 436008dc15b1ace9faedc603ca9bdbda4b6ff769..01d74543ec4407dc5a3acc12edee73c92c8d1504 100644
--- a/Framework/Geometry/Sphere.h
+++ b/Framework/Geometry/Sphere.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/Trajectory.h b/Framework/Geometry/Trajectory.h
index 168121f03499d2716d183da86f87a7b2ab8b25f9..69bcfd6f8ad6a8ea4314531c48865e06179bbe91 100644
--- a/Framework/Geometry/Trajectory.h
+++ b/Framework/Geometry/Trajectory.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/Vector.h b/Framework/Geometry/Vector.h
index 73cb52248cde58912bd70441f345494ef94a9b85..5ac1f118b789b500ad26a23f840bda954b2c9800 100644
--- a/Framework/Geometry/Vector.h
+++ b/Framework/Geometry/Vector.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_VECTOR_H_
#define _include_VECTOR_H_
diff --git a/Framework/Geometry/Volume.h b/Framework/Geometry/Volume.h
index c4fd7e8146d43b86241e5f03995df7886f0ce47e..95306edca53ff546b54fe362babbdcf17a73334c 100644
--- a/Framework/Geometry/Volume.h
+++ b/Framework/Geometry/Volume.h
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/testFourVector.cc b/Framework/Geometry/testFourVector.cc
index fe7378885adf3801364d74dfa7672ea49cf15f8d..824426aad0bdaa4173fff93b26486d1eb423fea6 100644
--- a/Framework/Geometry/testFourVector.cc
+++ b/Framework/Geometry/testFourVector.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/Geometry/testGeometry.cc b/Framework/Geometry/testGeometry.cc
index dc63d6f792d09a108283ed9274d16c570a08c508..0a6dbbdecdad0f49f5dc902f3997c5a0f37afd7c 100644
--- a/Framework/Geometry/testGeometry.cc
+++ b/Framework/Geometry/testGeometry.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Framework/Particles/ParticleProperties.cc b/Framework/Particles/ParticleProperties.cc
index f26513a48345a555a15f3274c1a98c3dd389e300..4932492ddf33028b456670e9ca2da0a5b8d0efe2 100644
--- a/Framework/Particles/ParticleProperties.cc
+++ b/Framework/Particles/ParticleProperties.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
/*
* (c) Copyright 2018 CORSIKA Project, corsika-project@lists.kit.edu
*
diff --git a/Framework/ProcessSequence/BaseProcess.h b/Framework/ProcessSequence/BaseProcess.h
index 4389d74e9818541c0c18e1d86c7653327fc8c1a0..8b4014478f5ebef33e4acd76f6b7315f2c1e5041 100644
--- a/Framework/ProcessSequence/BaseProcess.h
+++ b/Framework/ProcessSequence/BaseProcess.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_baseprocess_h_
#define _include_corsika_baseprocess_h_
diff --git a/Framework/ProcessSequence/ContinuousProcess.h b/Framework/ProcessSequence/ContinuousProcess.h
index c48534e0420216e117b755fcfa55f6f8803083d3..9a3424a35d4637a9e21212a0909f2456f71b3597 100644
--- a/Framework/ProcessSequence/ContinuousProcess.h
+++ b/Framework/ProcessSequence/ContinuousProcess.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_continuousprocess_h_
#define _include_corsika_continuousprocess_h_
diff --git a/Framework/ProcessSequence/DecayProcess.h b/Framework/ProcessSequence/DecayProcess.h
index 0a525897399bc193618b86e07aad1690dcca45a2..82be572d6fc8e19260fa50a5267f1171c20e042b 100644
--- a/Framework/ProcessSequence/DecayProcess.h
+++ b/Framework/ProcessSequence/DecayProcess.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_decayprocess_h_
#define _include_corsika_decayprocess_h_
diff --git a/Framework/ProcessSequence/DiscreteProcess.h b/Framework/ProcessSequence/DiscreteProcess.h
index 8584739cc931265127b5a3b4ae526b58f52deb22..40b54453007855540a72910ab9da708201b17b88 100644
--- a/Framework/ProcessSequence/DiscreteProcess.h
+++ b/Framework/ProcessSequence/DiscreteProcess.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_discreteprocess_h_
#define _include_corsika_discreteprocess_h_
diff --git a/Framework/ProcessSequence/InteractionProcess.h b/Framework/ProcessSequence/InteractionProcess.h
index 71acb595e8973ea5ff0633e778c638b05517c225..96472755376c4cf630f8ac92e92c5c08eb1c2f48 100644
--- a/Framework/ProcessSequence/InteractionProcess.h
+++ b/Framework/ProcessSequence/InteractionProcess.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_interactionprocess_h_
#define _include_corsika_interactionprocess_h_
diff --git a/Framework/ProcessSequence/ProcessReturn.h b/Framework/ProcessSequence/ProcessReturn.h
index 10a92ae14bbf5f1d9d1fc3edebcebe2465948e0f..94a69406ac42c9ec7caccb53e0e42493ec15fe32 100644
--- a/Framework/ProcessSequence/ProcessReturn.h
+++ b/Framework/ProcessSequence/ProcessReturn.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_ProcessReturn_h_
#define _include_ProcessReturn_h_
diff --git a/Framework/ProcessSequence/ProcessSequence.h b/Framework/ProcessSequence/ProcessSequence.h
index e52632c03d97c9bdff090cc89371bb93ce2a97f0..4d4d3fbfdaff3d075f6cc613da78ece584ed7142 100644
--- a/Framework/ProcessSequence/ProcessSequence.h
+++ b/Framework/ProcessSequence/ProcessSequence.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_ProcessSequence_h_
#define _include_ProcessSequence_h_
diff --git a/Framework/ProcessSequence/ProcessSignature.h b/Framework/ProcessSequence/ProcessSignature.h
index 7c4fa22b6b38669af2b0b258aa68c109ad1cec00..38503b87b49fcd900cc8d2b28f4872e9aeabc419 100644
--- a/Framework/ProcessSequence/ProcessSignature.h
+++ b/Framework/ProcessSequence/ProcessSignature.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_process_processsignature_h_
#define _include_process_processsignature_h_
diff --git a/Framework/ProcessSequence/testProcessSequence.cc b/Framework/ProcessSequence/testProcessSequence.cc
index 4396ee0cfaf25c1d328a4558b52e2f439e49174c..8fd46418ac838ca1af0f2beb3691bf599a40eb05 100644
--- a/Framework/ProcessSequence/testProcessSequence.cc
+++ b/Framework/ProcessSequence/testProcessSequence.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Framework/Random/ExponentialDistribution.h b/Framework/Random/ExponentialDistribution.h
index f68c9cef68722a829b2e72d71f8721507ebe5737..dc17b20997e9932aaedfc8f26eeec3c2d63a1392 100644
--- a/Framework/Random/ExponentialDistribution.h
+++ b/Framework/Random/ExponentialDistribution.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_ExponentialDistribution_h
#define _include_ExponentialDistribution_h
diff --git a/Framework/Random/RNGManager.cc b/Framework/Random/RNGManager.cc
index 1b6f5120c105b9df6936612c8271e2ef27c86597..c02f7a4329b52cd397ba78c404381430c6d030b1 100644
--- a/Framework/Random/RNGManager.cc
+++ b/Framework/Random/RNGManager.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/random/RNGManager.h>
void corsika::random::RNGManager::RegisterRandomStream(std::string const& pStreamName) {
diff --git a/Framework/Random/RNGManager.h b/Framework/Random/RNGManager.h
index 32179e2f2d2c08de97fbc7ae1145925a04f8a723..9637b4b8279a48169a523df687eab0146afada38 100644
--- a/Framework/Random/RNGManager.h
+++ b/Framework/Random/RNGManager.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_RNGManager_h_
#define _include_RNGManager_h_
diff --git a/Framework/Random/UniformRealDistribution.h b/Framework/Random/UniformRealDistribution.h
index 4a13127b0fed2f16562d90599428abfa3e3bbe10..1328377dc2d88114c447cd5a4558dfec21cdf112 100644
--- a/Framework/Random/UniformRealDistribution.h
+++ b/Framework/Random/UniformRealDistribution.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_UniformRealDistribution_h
#define _include_UniformRealDistribution_h
diff --git a/Framework/Random/testRandom.cc b/Framework/Random/testRandom.cc
index eeb610822807a94de3687ee28566c399936aaaee..c362d393fea3bc8bf4c4ad72949dd0c6a8d0bf86 100644
--- a/Framework/Random/testRandom.cc
+++ b/Framework/Random/testRandom.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Framework/StackInterface/ParticleBase.h b/Framework/StackInterface/ParticleBase.h
index e148f138982ae313407748a052b865777a84b4d6..59b133a96dbf81071b1c821dc79a0c5da2d59dbd 100644
--- a/Framework/StackInterface/ParticleBase.h
+++ b/Framework/StackInterface/ParticleBase.h
@@ -23,21 +23,24 @@ namespace corsika::stack {
particle stack. Every stack must implement this readout via the
ParticleBase class.
- The StackIterator template argument is derived from StackIteratorInterface, which is of type
- <code>
- template <typename StackData, template <typename> typename ParticleInterface>
- class StackIteratorInterface : public ParticleInterface<StackIteratorInterface<StackData, ParticleInterface>>
+ The StackIterator template argument is derived from StackIteratorInterface, which is of
+ type <code> template <typename StackData, template <typename> typename
+ ParticleInterface> class StackIteratorInterface : public
+ ParticleInterface<StackIteratorInterface<StackData, ParticleInterface>>
</code>
- where StackData must refer to a Stack type, and ParticleInterface<StackIteratorInterface> is the corresponding particle readout class.
+ where StackData must refer to a Stack type, and
+ ParticleInterface<StackIteratorInterface> is the corresponding particle readout class.
- Thus, StackIteratorInterface is a CRTP class, injecting the full StackIteratorInterface machinery into the ParticleInterface (aka ParticleBase) type!
+ Thus, StackIteratorInterface is a CRTP class, injecting the full StackIteratorInterface
+ machinery into the ParticleInterface (aka ParticleBase) type!
- The declartion of a StackIteratorInterface type simultaneously declares the corresponding ParticleInterface type.
+ The declartion of a StackIteratorInterface type simultaneously declares the
+ corresponding ParticleInterface type.
Furthermore, the operator* of the StackIteratorInterface returns a
static_cast to the ParticleInterface type, allowing a direct
- readout of the particle data from the iterator.
+ readout of the particle data from the iterator.
*/
diff --git a/Framework/StackInterface/Stack.h b/Framework/StackInterface/Stack.h
index 7f42bbc5665d667a926e9df56f81489ffdd97d24..ff92fa2383e2614b2f6fa4438d6ca492d77608e6 100644
--- a/Framework/StackInterface/Stack.h
+++ b/Framework/StackInterface/Stack.h
@@ -33,19 +33,19 @@ namespace corsika::stack {
template <typename>
class ParticleInterface; // forward decl
- /**
- The Stack class provides (and connects) the main particle data storage machinery.
+ /**
+ The Stack class provides (and connects) the main particle data storage machinery.
The StackData type is the user-provided bare data storage
object. This can be of any complexity, from a simple struct
(fortran common block), to a combination of different and
- distributed data sources.
+ distributed data sources.
The user-provided ParticleInterface template type is the base
class type of the StackIteratorInterface class (CRTP) and must
provide all functions to read single particle data from the
- StackData, given an 'unsigned int' index.
-
+ StackData, given an 'unsigned int' index.
+
The Stack implements the
std-type begin/end function to allow integration in normal for
loops, ranges, etc.
@@ -56,9 +56,11 @@ namespace corsika::stack {
public:
typedef StackData StackImpl; ///< this is the type of the user-provided data structure
- template<typename SI> using PIType = ParticleInterface<SI>;
- //typedef ParticleInterface<StackIteratorInterface> StackParticleInterface; ///< this is the type of the user-provided ParticleInterface
- //typedef Stack<StackData, ParticleInterface> StackType;
+ template <typename SI>
+ using PIType = ParticleInterface<SI>;
+ // typedef ParticleInterface<StackIteratorInterface> StackParticleInterface; ///<
+ // this is the type of the user-provided ParticleInterface typedef Stack<StackData,
+ // ParticleInterface> StackType;
/**
* Via the StackIteratorInterface and ConstStackIteratorInterface
@@ -67,15 +69,13 @@ namespace corsika::stack {
* object. Using CRTP, this also determines the type of
* ParticleInterface template class simultaneously.
*/
- typedef StackIteratorInterface<StackData, ParticleInterface>
- StackIterator;
- typedef ConstStackIteratorInterface<StackData,
- ParticleInterface> ConstStackIterator;
+ typedef StackIteratorInterface<StackData, ParticleInterface> StackIterator;
+ typedef ConstStackIteratorInterface<StackData, ParticleInterface> ConstStackIterator;
/**
* this is the full type of the declared ParticleInterface: typedef typename
*/
typedef typename StackIterator::ParticleInterfaceType ParticleType;
-
+
friend class StackIteratorInterface<StackData, ParticleInterface>;
friend class ConstStackIteratorInterface<StackData, ParticleInterface>;
@@ -120,7 +120,9 @@ namespace corsika::stack {
return StackIterator(*this, GetSize() - 1, parent, v...);
}
void Swap(StackIterator a, StackIterator b) { Swap(a.GetIndex(), b.GetIndex()); }
- void Swap(ConstStackIterator a, ConstStackIterator b) { Swap(a.GetIndex(), b.GetIndex()); }
+ void Swap(ConstStackIterator a, ConstStackIterator b) {
+ Swap(a.GetIndex(), b.GetIndex());
+ }
void Copy(StackIterator a, StackIterator b) { Copy(a.GetIndex(), b.GetIndex()); }
void Copy(ConstStackIterator a, StackIterator b) { Copy(a.GetIndex(), b.GetIndex()); }
/// delete this particle
diff --git a/Framework/StackInterface/StackIteratorInterface.h b/Framework/StackInterface/StackIteratorInterface.h
index effdd876a987734dc5d98c14b874d158af102366..74f1a7802e1d55c0739686496d0ba568557785ac 100644
--- a/Framework/StackInterface/StackIteratorInterface.h
+++ b/Framework/StackInterface/StackIteratorInterface.h
@@ -57,7 +57,7 @@ namespace corsika::stack {
typename std::conditional<std::is_const<StackData>::value,
const Stack<const StackData, ParticleInterface>&,
Stack<StackData, ParticleInterface>&>::type StackType;*/
-
+
typedef ParticleInterface<StackIteratorInterface<StackData, ParticleInterface>>
ParticleInterfaceType;
@@ -127,7 +127,7 @@ namespace corsika::stack {
return tmp;
}
StackIteratorInterface operator+(int delta) {
- return StackIteratorInterface(*fData, fIndex+delta);
+ return StackIteratorInterface(*fData, fIndex + delta);
}
bool operator==(const StackIteratorInterface& rhs) { return fIndex == rhs.fIndex; }
bool operator!=(const StackIteratorInterface& rhs) { return fIndex != rhs.fIndex; }
@@ -158,8 +158,6 @@ namespace corsika::stack {
///@}
}; // end class StackIterator
-
-
/**
@class ConstStackIteratorInterface
@@ -219,7 +217,7 @@ namespace corsika::stack {
return tmp;
}
ConstStackIteratorInterface operator+(int delta) {
- return ConstStackIteratorInterface(*fData, fIndex+delta);
+ return ConstStackIteratorInterface(*fData, fIndex + delta);
}
bool operator==(const ConstStackIteratorInterface& rhs) {
return fIndex == rhs.fIndex;
diff --git a/Framework/Units/testUnits.cc b/Framework/Units/testUnits.cc
index d4d471165d0374e2eb8807e18cff3030d5f8b0b5..e8f389a05818615475dd988cce1181f6bf66ba42 100644
--- a/Framework/Units/testUnits.cc
+++ b/Framework/Units/testUnits.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Framework/Utilities/Bit.h b/Framework/Utilities/Bit.h
index 9a5237cb5f376c12a627375ab6b419fda802dbfa..7306e76d8d7f979fe18974452cd67a25b75b99c7 100644
--- a/Framework/Utilities/Bit.h
+++ b/Framework/Utilities/Bit.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _corsika_utl_Bit_h_
#define _corsika_utl_Bit_h_
diff --git a/Framework/Utilities/COMBoost.cc b/Framework/Utilities/COMBoost.cc
index 8ab6bc8090875f5ad4aa0a3adfeccc947b124fe5..5d8b00857b66afb73c7cbbe922b65e87c57e767a 100644
--- a/Framework/Utilities/COMBoost.cc
+++ b/Framework/Utilities/COMBoost.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/geometry/CoordinateSystem.h>
#include <corsika/geometry/Vector.h>
#include <corsika/units/PhysicalUnits.h>
diff --git a/Framework/Utilities/COMBoost.h b/Framework/Utilities/COMBoost.h
index 62a2efe0bc527ad4fc77987d709f3ed7b6b7bea5..eebc8358ad5f5891587c3ee9bda036e7c6b98784 100644
--- a/Framework/Utilities/COMBoost.h
+++ b/Framework/Utilities/COMBoost.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_utilties_comboost_h_
#define _include_corsika_utilties_comboost_h_
diff --git a/Framework/Utilities/CorsikaFenv.h b/Framework/Utilities/CorsikaFenv.h
index 3990ce1b65ec4140412da5e6db3710316f122288..e7df5953461aa4d98dab8fa917b8b20847a22ddd 100644
--- a/Framework/Utilities/CorsikaFenv.h
+++ b/Framework/Utilities/CorsikaFenv.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef CORSIKA_CORSIKAFENV_H
#define CORSIKA_CORSIKAFENV_H
diff --git a/Framework/Utilities/CorsikaFenvDefault.cc b/Framework/Utilities/CorsikaFenvDefault.cc
index a5429e1782c0aebd934f386526bbfc48a014539f..f1bb7732bfe111ca3c71018282ac346bacadeee2 100644
--- a/Framework/Utilities/CorsikaFenvDefault.cc
+++ b/Framework/Utilities/CorsikaFenvDefault.cc
@@ -9,5 +9,4 @@
* the license.
*/
-
// do nothing, functions exist in system libraries
diff --git a/Framework/Utilities/CorsikaFenvFallback.cc b/Framework/Utilities/CorsikaFenvFallback.cc
index ccc57f130c6c23c73eade9a4e0284b382566c0c4..ed71c5b6c07096fe3d846fd82d5afa5c284e6599 100644
--- a/Framework/Utilities/CorsikaFenvFallback.cc
+++ b/Framework/Utilities/CorsikaFenvFallback.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/utl/CorsikaFenv.h>
#include <cfenv>
diff --git a/Framework/Utilities/CorsikaFenvOSX.cc b/Framework/Utilities/CorsikaFenvOSX.cc
index b50fa73c15dceb60d35820bc2681f0def2fbd27f..4495ebd1e823ad5a9a1b894d07c09ae8f842d068 100644
--- a/Framework/Utilities/CorsikaFenvOSX.cc
+++ b/Framework/Utilities/CorsikaFenvOSX.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
/**
* Import public domain code
*
diff --git a/Framework/Utilities/Singleton.h b/Framework/Utilities/Singleton.h
index 675fe33668b7a5135ce9bf73e96f1699bac9f9bd..3780cc99a1398833a77729e26eb11f9b089ba753 100644
--- a/Framework/Utilities/Singleton.h
+++ b/Framework/Utilities/Singleton.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _corsika_utl_Singleton_h_
#define _corsika_utl_Singleton_h_
diff --git a/Framework/Utilities/testCOMBoost.cc b/Framework/Utilities/testCOMBoost.cc
index beb7d9cf51f478cce6721586a790ec9707a700bc..501db86435b535f14b47e6f072cbf885878e8293 100644
--- a/Framework/Utilities/testCOMBoost.cc
+++ b/Framework/Utilities/testCOMBoost.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Framework/Utilities/testCorsikaFenv.cc b/Framework/Utilities/testCorsikaFenv.cc
index a11a71e0bd55ca33487b78777822e702ab754079..eb4885b9a233135356e8a047b1dc4c86861e25b4 100644
--- a/Framework/Utilities/testCorsikaFenv.cc
+++ b/Framework/Utilities/testCorsikaFenv.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/utl/CorsikaFenv.h>
#include <cmath>
diff --git a/Framework/Utilities/try_feenableexcept.cc b/Framework/Utilities/try_feenableexcept.cc
index a7d84e4c76777425a6f61cf587c436ad440d24fb..9ca52262c2903878a70e4090f031f8915b619265 100644
--- a/Framework/Utilities/try_feenableexcept.cc
+++ b/Framework/Utilities/try_feenableexcept.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <cfenv>
int main() {
diff --git a/Main/Environment.h b/Main/Environment.h
index 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/Main/Environment.h
+++ b/Main/Environment.h
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-
diff --git a/Main/Stack.h b/Main/Stack.h
index 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/Main/Stack.h
+++ b/Main/Stack.h
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-
diff --git a/Main/shower.cc b/Main/shower.cc
index 04375d5ce9b54e4ef4093e0e67cf7848584f81bb..5ca8d4ab2532081c4654cd51e98b9bcdda9cc2f6 100644
--- a/Main/shower.cc
+++ b/Main/shower.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <utl/Stack.h>
int main(int argc, char** argv) { return 0; }
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.cc b/Processes/HadronicElasticModel/HadronicElasticModel.cc
index 7bb12eeaa5aa0c4550255d8abd70bd49bcdfa15e..943195b681a117ac9b36a1968d78ab8a8ab87629 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.cc
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/process/hadronic_elastic_model/HadronicElasticModel.h>
namespace corsika::process::HadronicElasticModel {
diff --git a/Processes/HadronicElasticModel/HadronicElasticModel.h b/Processes/HadronicElasticModel/HadronicElasticModel.h
index cf87d825f1d40232d97b46e1711d532ae2d1054d..8ddc55fa0504dc0950c7b4cb751c47df61b4ecb0 100644
--- a/Processes/HadronicElasticModel/HadronicElasticModel.h
+++ b/Processes/HadronicElasticModel/HadronicElasticModel.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_HadronicElasticInteraction_h
#define _include_HadronicElasticInteraction_h
diff --git a/Processes/NullModel/NullModel.cc b/Processes/NullModel/NullModel.cc
index 9f7208f268ac7af04d56fa4dc39d3b20c69cbfcc..09956e7c703468d635cf5e7770fc067c036b52b7 100644
--- a/Processes/NullModel/NullModel.cc
+++ b/Processes/NullModel/NullModel.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/process/null_model/NullModel.h>
void corsika::process::null_model::NullModel::Init() {}
diff --git a/Processes/NullModel/NullModel.h b/Processes/NullModel/NullModel.h
index fe03c8d00d0a7214f185e9d1fd8f11154e533d14..6222e290f53e3d2e5d193ad7597f2a086b9eb2ff 100644
--- a/Processes/NullModel/NullModel.h
+++ b/Processes/NullModel/NullModel.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _Physics_NullModel_NullModel_h_
#define _Physics_NullModel_NullModel_h_
diff --git a/Processes/NullModel/testNullModel.cc b/Processes/NullModel/testNullModel.cc
index 07a7254dba80064c3d2b30d1ccecd7999151e3d7..6bf7d99da7af02d8b0b4cd60b6f69628e28532e9 100644
--- a/Processes/NullModel/testNullModel.cc
+++ b/Processes/NullModel/testNullModel.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Processes/Sibyll/SibStack.h b/Processes/Sibyll/SibStack.h
index dd563d90fbada42875b7d5df1c16dfd2eb668da9..95f7011e9a922eace00bf7e0b7c07e95a5d8b181 100644
--- a/Processes/Sibyll/SibStack.h
+++ b/Processes/Sibyll/SibStack.h
@@ -71,14 +71,13 @@ namespace corsika::process::sibyll {
void Copy(const unsigned int i1, const unsigned int i2) {
s_plist_.llist[i2] = s_plist_.llist[i1];
- for (unsigned int i=0; i<5; ++i)
- s_plist_.p[i][i2] = s_plist_.p[i][i1];
+ for (unsigned int i = 0; i < 5; ++i) s_plist_.p[i][i2] = s_plist_.p[i][i1];
}
void Swap(const unsigned int i1, const unsigned int i2) {
std::swap(s_plist_.llist[i1], s_plist_.llist[i2]);
- for (unsigned int i=0; i<5; ++i)
- std::swap(s_plist_.p[i][i1], s_plist_.p[i][i2]);
+ for (unsigned int i = 0; i < 5; ++i)
+ std::swap(s_plist_.p[i][i1], s_plist_.p[i][i2]);
}
protected:
diff --git a/Processes/StackInspector/StackInspector.cc b/Processes/StackInspector/StackInspector.cc
index 95452878eace4a55d3ba79f64e3ad79404c3c9e7..312fe40ec82dfd4f1faf12870e397ef4fbe794bc 100644
--- a/Processes/StackInspector/StackInspector.cc
+++ b/Processes/StackInspector/StackInspector.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/particles/ParticleProperties.h>
#include <corsika/process/stack_inspector/StackInspector.h>
diff --git a/Processes/StackInspector/StackInspector.h b/Processes/StackInspector/StackInspector.h
index 4a776f1cc52fc13eb5b479c71c861a301a29096d..8bb2ca45c498f7535aa6cae2761142ff8dabce74 100644
--- a/Processes/StackInspector/StackInspector.h
+++ b/Processes/StackInspector/StackInspector.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _Physics_StackInspector_StackInspector_h_
#define _Physics_StackInspector_StackInspector_h_
diff --git a/Processes/StackInspector/testStackInspector.cc b/Processes/StackInspector/testStackInspector.cc
index 8697dc21af8c1223df421ebbdbe841a09ffb9efe..784be88f99131372f528b264660e7db6f93d3625 100644
--- a/Processes/StackInspector/testStackInspector.cc
+++ b/Processes/StackInspector/testStackInspector.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one
// cpp file
#include <catch2/catch.hpp>
diff --git a/Processes/TrackWriter/TrackWriter.cc b/Processes/TrackWriter/TrackWriter.cc
index bd453c4ae6edd956fb56292e81b49e8bda6badac..65dec50ca0aab6d87d9471c99a1f32f788c5ddc6 100644
--- a/Processes/TrackWriter/TrackWriter.cc
+++ b/Processes/TrackWriter/TrackWriter.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/process/track_writer/TrackWriter.h>
#include <string>
diff --git a/Processes/TrackWriter/TrackWriter.h b/Processes/TrackWriter/TrackWriter.h
index bf60afb9fa0d7171d02c820bf0b59f505ccc41ef..c61d2a6c883882a7422539dd854e32af964852f5 100644
--- a/Processes/TrackWriter/TrackWriter.h
+++ b/Processes/TrackWriter/TrackWriter.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _Processes_TrackWriter_h_
#define _Processes_TrackWriter_h_
diff --git a/Processes/TrackingLine/TrackingLine.h b/Processes/TrackingLine/TrackingLine.h
index 9628d22711d1cfaaa8fcd8b24ca3f3e8fa279701..b829814766625213c5ed115471a7b50b5ecaaf80 100644
--- a/Processes/TrackingLine/TrackingLine.h
+++ b/Processes/TrackingLine/TrackingLine.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_processes_TrackingLine_h_
#define _include_corsika_processes_TrackingLine_h_
diff --git a/Processes/TrackingLine/testTrackingLine.cc b/Processes/TrackingLine/testTrackingLine.cc
index 61219187014267025577ad441384bc10f1fe0808..7dde7aec23efa39835a673305729f9b2f0782dbc 100644
--- a/Processes/TrackingLine/testTrackingLine.cc
+++ b/Processes/TrackingLine/testTrackingLine.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/environment/Environment.h>
#include <corsika/particles/ParticleProperties.h>
diff --git a/Setup/SetupEnvironment.h b/Setup/SetupEnvironment.h
index 8f747130bd2f6d7317266180e8608435245638c5..08780b73b38311412a11500adb9d37a67a6d4228 100644
--- a/Setup/SetupEnvironment.h
+++ b/Setup/SetupEnvironment.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_setup_environment_h_
#define _include_corsika_setup_environment_h_
diff --git a/Setup/SetupLogger.h b/Setup/SetupLogger.h
index fe3965aa3f5e20e9806e1450672807c1dcf3ccc4..76148050fc5a7f5f5fa8a03a0d96d1b12e465777 100644
--- a/Setup/SetupLogger.h
+++ b/Setup/SetupLogger.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_corsika_setup_logger_h_
#define _include_corsika_setup_logger_h_
diff --git a/Setup/SetupStack.h b/Setup/SetupStack.h
index c06f30d07acc2c9119f9e0ee2791ce7c4a3474b1..0ab05fffbf177b72a21880e5b2b2043a4aba448d 100644
--- a/Setup/SetupStack.h
+++ b/Setup/SetupStack.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _corsika_setup_setupstack_h_
#define _corsika_setup_setupstack_h_
diff --git a/Setup/SetupTrajectory.h b/Setup/SetupTrajectory.h
index 6762343fa3dd3621387fb96ebc7a3c430a4329df..0e93b3e4466eb98caa7ee3ccefd1edcf3946d104 100644
--- a/Setup/SetupTrajectory.h
+++ b/Setup/SetupTrajectory.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _corsika_setup_setuptrajectory_h_
#define _corsika_setup_setuptrajectory_h_
diff --git a/Stack/DummyStack/DummyStack.h b/Stack/DummyStack/DummyStack.h
index b3e000e43d4082038530353a0b6852aff4f5ede1..adcf494a57b1d46f13d09d9f39e153866b70ea04 100644
--- a/Stack/DummyStack/DummyStack.h
+++ b/Stack/DummyStack/DummyStack.h
@@ -9,7 +9,6 @@
* the license.
*/
-
#ifndef _include_dummystack_h_
#define _include_dummystack_h_
diff --git a/Stack/NuclearStackExtension/NuclearStackExtension.h b/Stack/NuclearStackExtension/NuclearStackExtension.h
index 581104e718de44b5627eb675fc4bcb9e12ac99c3..94f94590d1517bdc05d24be1ba0afa4bc28e612e 100644
--- a/Stack/NuclearStackExtension/NuclearStackExtension.h
+++ b/Stack/NuclearStackExtension/NuclearStackExtension.h
@@ -31,15 +31,19 @@ namespace corsika::stack {
typedef corsika::geometry::Vector<corsika::units::si::hepmomentum_d> MomentumVector;
/**
- * Define ParticleInterface for NuclearStackExtension Stack derived from ParticleInterface of Inner stack class
- */
- template<template <typename> typename InnerParticleInterface, typename StackIteratorInterface>
- class NuclearParticleInterface : public InnerParticleInterface<StackIteratorInterface> {
+ * Define ParticleInterface for NuclearStackExtension Stack derived from
+ * ParticleInterface of Inner stack class
+ */
+ template <template <typename> typename InnerParticleInterface,
+ typename StackIteratorInterface>
+ class NuclearParticleInterface
+ : public InnerParticleInterface<StackIteratorInterface> {
public:
- //template<typename >
- using ExtendedParticleInterface = NuclearParticleInterface<InnerParticleInterface, StackIteratorInterface>;
-
+ // template<typename >
+ using ExtendedParticleInterface =
+ NuclearParticleInterface<InnerParticleInterface, StackIteratorInterface>;
+
protected:
using InnerParticleInterface<StackIteratorInterface>::GetStackData;
using InnerParticleInterface<StackIteratorInterface>::GetIndex;
@@ -49,57 +53,48 @@ namespace corsika::stack {
const corsika::units::si::HEPEnergyType vDataE,
const MomentumVector& vMomentum,
const corsika::geometry::Point& vPosition,
- const corsika::units::si::TimeType vTime,
- const int vA = 0,
- const int vZ = 0) {
- if (vDataPID == corsika::particles::Code::Nucleus) {
- if (vA==0 || vZ==0) {
- std::ostringstream err;
- err << "NuclearStackExtension: no A and Z specified for new Nucleus!";
- throw std::runtime_error(err.str());
- }
- //SetNuclearRef(corsika::stack::ParticleBase<StackIteratorInterface>::GetStackData().GetNucleusNextRef()); // store this nucleus data ref
- SetNuclearRef(GetStackData().GetNucleusNextRef()); // store this nucleus data ref
- SetNuclearA(vA);
- SetNuclearZ(vZ);
- } else {
- SetNuclearRef(-1); // this is not a nucleus
- }
- //corsika::stack::super_stupid::NuclearParticleInterface<StackIteratorInterface>::
- InnerParticleInterface<StackIteratorInterface>::
- //InnerParticleInterface::
- SetParticleData(vDataPID,
- vDataE,
- vMomentum,
- vPosition,
- vTime);
+ const corsika::units::si::TimeType vTime, const int vA = 0,
+ const int vZ = 0) {
+ if (vDataPID == corsika::particles::Code::Nucleus) {
+ if (vA == 0 || vZ == 0) {
+ std::ostringstream err;
+ err << "NuclearStackExtension: no A and Z specified for new Nucleus!";
+ throw std::runtime_error(err.str());
+ }
+ // SetNuclearRef(corsika::stack::ParticleBase<StackIteratorInterface>::GetStackData().GetNucleusNextRef());
+ // // store this nucleus data ref
+ SetNuclearRef(
+ GetStackData().GetNucleusNextRef()); // store this nucleus data ref
+ SetNuclearA(vA);
+ SetNuclearZ(vZ);
+ } else {
+ SetNuclearRef(-1); // this is not a nucleus
+ }
+ // corsika::stack::super_stupid::NuclearParticleInterface<StackIteratorInterface>::
+ InnerParticleInterface<StackIteratorInterface>::
+ // InnerParticleInterface::
+ SetParticleData(vDataPID, vDataE, vMomentum, vPosition, vTime);
}
- // void SetParticleData(NuclearParticleInterface<StackIteratorInterface>& parent,
+ // void SetParticleData(NuclearParticleInterface<StackIteratorInterface>&
+ // parent,
void SetParticleData(InnerParticleInterface<StackIteratorInterface>& parent,
- //void SetParticleData(InnerParticleInterface& parent,
+ // void SetParticleData(InnerParticleInterface& parent,
const corsika::particles::Code vDataPID,
const corsika::units::si::HEPEnergyType vDataE,
const MomentumVector& vMomentum,
const corsika::geometry::Point& vPosition,
- const corsika::units::si::TimeType vTime,
- const int vA = 0,
- const int vZ = 0) {
- SetParticleData(vDataPID,
- vDataE,
- vMomentum,
- vPosition,
- vTime,
- vA,
- vZ);
+ const corsika::units::si::TimeType vTime, const int vA = 0,
+ const int vZ = 0) {
+ SetParticleData(vDataPID, vDataE, vMomentum, vPosition, vTime, vA, vZ);
}
-
+
/**
* @name individual setters
* @{
*/
void SetNuclearA(const int vA) { GetStackData().SetNuclearA(GetIndex(), vA); }
- void SetNuclearZ(const int vZ) { GetStackData().SetNuclearZ(GetIndex(), vZ); }
+ void SetNuclearZ(const int vZ) { GetStackData().SetNuclearZ(GetIndex(), vZ); }
/// @}
/**
@@ -114,12 +109,11 @@ namespace corsika::stack {
void SetNuclearRef(const int vR) { GetStackData().SetNuclearRef(GetIndex(), vR); }
};
-
/**
* Memory implementation of the most simple (stupid) particle stack object.
*/
- template<typename InnerStackImpl>
- class NuclearStackExtensionImpl : public InnerStackImpl {
+ template <typename InnerStackImpl>
+ class NuclearStackExtensionImpl : public InnerStackImpl {
public:
void Init() { InnerStackImpl::Init(); }
@@ -134,91 +128,97 @@ namespace corsika::stack {
unsigned int GetSize() const { return fNuclearRef.size(); }
unsigned int GetCapacity() const { return fNuclearRef.size(); }
- void SetNuclearA(const unsigned int i, const int vA) { fNuclearA[GetNucleusRef(i)] = vA; }
- void SetNuclearZ(const unsigned int i, const int vZ) { fNuclearZ[GetNucleusRef(i)] = vZ; }
+ void SetNuclearA(const unsigned int i, const int vA) {
+ fNuclearA[GetNucleusRef(i)] = vA;
+ }
+ void SetNuclearZ(const unsigned int i, const int vZ) {
+ fNuclearZ[GetNucleusRef(i)] = vZ;
+ }
void SetNuclearRef(const unsigned int i, const int v) { fNuclearRef[i] = v; }
-
+
int GetNuclearA(const unsigned int i) const { return fNuclearA[GetNucleusRef(i)]; }
int GetNuclearZ(const unsigned int i) const { return fNuclearZ[GetNucleusRef(i)]; }
- // this function will create new storage for Nuclear Properties, and return the reference to it
- int GetNucleusNextRef() { fNuclearA.push_back(0); fNuclearZ.push_back(0); return fNuclearA.size()-1; }
+ // this function will create new storage for Nuclear Properties, and return the
+ // reference to it
+ int GetNucleusNextRef() {
+ fNuclearA.push_back(0);
+ fNuclearZ.push_back(0);
+ return fNuclearA.size() - 1;
+ }
int GetNucleusRef(const unsigned int i) const {
- if (fNuclearRef[i]>=0)
- return fNuclearRef[i];
- std::ostringstream err;
- err << "NuclearStackExtension: no nucleus at ref=" << i;
- throw std::runtime_error(err.str());
+ if (fNuclearRef[i] >= 0) return fNuclearRef[i];
+ std::ostringstream err;
+ err << "NuclearStackExtension: no nucleus at ref=" << i;
+ throw std::runtime_error(err.str());
}
-
+
/**
* Function to copy particle at location i1 in stack to i2
*/
void Copy(const unsigned int i1, const unsigned int i2) {
- if (i1>=GetSize() || i2>=GetSize()) {
- std::ostringstream err;
- err << "NuclearStackExtension: trying to access data beyond size of stack!";
- throw std::runtime_error(err.str());
- }
+ if (i1 >= GetSize() || i2 >= GetSize()) {
+ std::ostringstream err;
+ err << "NuclearStackExtension: trying to access data beyond size of stack!";
+ throw std::runtime_error(err.str());
+ }
InnerStackImpl::Copy(i1, i2);
- const int ref1 = fNuclearRef[i1];
- const int ref2 = fNuclearRef[i2];
- if (ref2<0) {
- if (ref1>=0) {
- // i1 is nucleus, i2 is not
- fNuclearRef[i2] = GetNucleusNextRef();
- fNuclearA[fNuclearRef[i2]] = fNuclearA[ref1];
- fNuclearZ[fNuclearRef[i2]] = fNuclearZ[ref1];
- } else {
- // neither i1 nor i2 are nuclei
- }
- } else {
- if (ref1>=0) {
- // both are nuclei, i2 is overwritten with nucleus i1
- fNuclearA[ref2] = fNuclearA[ref1];
- fNuclearZ[ref2] = fNuclearZ[ref1];
- } else {
- // i2 is overwritten with non-nucleus i1
- fNuclearA.erase(fNuclearA.cbegin() + ref2);
- fNuclearZ.erase(fNuclearZ.cbegin() + ref2);
- const int n = fNuclearRef.size();
- for (int i=0; i<n; ++i) {
- if (fNuclearRef[i]>=ref2) {
- fNuclearRef[i] -= 1;
- }
- }
- }
- }
+ const int ref1 = fNuclearRef[i1];
+ const int ref2 = fNuclearRef[i2];
+ if (ref2 < 0) {
+ if (ref1 >= 0) {
+ // i1 is nucleus, i2 is not
+ fNuclearRef[i2] = GetNucleusNextRef();
+ fNuclearA[fNuclearRef[i2]] = fNuclearA[ref1];
+ fNuclearZ[fNuclearRef[i2]] = fNuclearZ[ref1];
+ } else {
+ // neither i1 nor i2 are nuclei
+ }
+ } else {
+ if (ref1 >= 0) {
+ // both are nuclei, i2 is overwritten with nucleus i1
+ fNuclearA[ref2] = fNuclearA[ref1];
+ fNuclearZ[ref2] = fNuclearZ[ref1];
+ } else {
+ // i2 is overwritten with non-nucleus i1
+ fNuclearA.erase(fNuclearA.cbegin() + ref2);
+ fNuclearZ.erase(fNuclearZ.cbegin() + ref2);
+ const int n = fNuclearRef.size();
+ for (int i = 0; i < n; ++i) {
+ if (fNuclearRef[i] >= ref2) { fNuclearRef[i] -= 1; }
+ }
+ }
+ }
}
/**
* Function to copy particle at location i2 in stack to i1
*/
void Swap(const unsigned int i1, const unsigned int i2) {
- if (i1>=GetSize() || i2>=GetSize()) {
- std::ostringstream err;
- err << "NuclearStackExtension: trying to access data beyond size of stack!";
- throw std::runtime_error(err.str());
- }
+ if (i1 >= GetSize() || i2 >= GetSize()) {
+ std::ostringstream err;
+ err << "NuclearStackExtension: trying to access data beyond size of stack!";
+ throw std::runtime_error(err.str());
+ }
InnerStackImpl::Swap(i1, i2);
- const int ref1 = fNuclearRef[i1];
- const int ref2 = fNuclearRef[i2];
- if (ref2<0) {
- if (ref1>=0) {
- // i1 is nucleus, i2 is not
- std::swap(fNuclearRef[i2], fNuclearRef[i1]);
- } else {
- // neither i1 nor i2 are nuclei
- }
- } else {
- if (ref1>=0) {
- // both are nuclei, i2 is overwritten with nucleus i1
- std::swap(fNuclearRef[i2], fNuclearRef[i1]);
- } else {
- // i2 is overwritten with non-nucleus i1
- std::swap(fNuclearRef[i2], fNuclearRef[i1]);
- }
- }
+ const int ref1 = fNuclearRef[i1];
+ const int ref2 = fNuclearRef[i2];
+ if (ref2 < 0) {
+ if (ref1 >= 0) {
+ // i1 is nucleus, i2 is not
+ std::swap(fNuclearRef[i2], fNuclearRef[i1]);
+ } else {
+ // neither i1 nor i2 are nuclei
+ }
+ } else {
+ if (ref1 >= 0) {
+ // both are nuclei, i2 is overwritten with nucleus i1
+ std::swap(fNuclearRef[i2], fNuclearRef[i1]);
+ } else {
+ // i2 is overwritten with non-nucleus i1
+ std::swap(fNuclearRef[i2], fNuclearRef[i1]);
+ }
+ }
}
protected:
@@ -230,19 +230,17 @@ namespace corsika::stack {
void DecrementSize() {
InnerStackImpl::DecrementSize();
if (fNuclearRef.size() > 0) {
- const int ref = fNuclearRef.back();
- fNuclearRef.pop_back();
- if (ref>=0) {
- fNuclearA.erase(fNuclearA.begin() + ref);
- fNuclearZ.erase(fNuclearZ.begin() + ref);
- const int n = fNuclearRef.size();
- for (int i=0; i<n; ++i) {
- if (fNuclearRef[i] >= ref) {
- fNuclearRef[i] -= 1;
- }
- }
- }
- }
+ const int ref = fNuclearRef.back();
+ fNuclearRef.pop_back();
+ if (ref >= 0) {
+ fNuclearA.erase(fNuclearA.begin() + ref);
+ fNuclearZ.erase(fNuclearZ.begin() + ref);
+ const int n = fNuclearRef.size();
+ for (int i = 0; i < n; ++i) {
+ if (fNuclearRef[i] >= ref) { fNuclearRef[i] -= 1; }
+ }
+ }
+ }
}
private:
@@ -255,37 +253,48 @@ namespace corsika::stack {
}; // end class NuclearStackExtensionImpl
// template<typename StackIteratorInterface>
- // using NuclearParticleInterfaceType<StackIteratorInterface> = NuclearParticleInterface< ,StackIteratorInterface>
+ // using NuclearParticleInterfaceType<StackIteratorInterface> =
+ // NuclearParticleInterface< ,StackIteratorInterface>
-
// works, but requires stupd _PI class
- //template<typename SS> using TEST = NuclearParticleInterface<corsika::stack::super_stupid::SuperStupidStack::PIType, SS>;
- template <typename InnerStack, template<typename>typename _PI>
- using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, _PI>;
-
+ // template<typename SS> using TEST =
+ // NuclearParticleInterface<corsika::stack::super_stupid::SuperStupidStack::PIType,
+ // SS>;
+ template <typename InnerStack, template <typename> typename _PI>
+ using NuclearStackExtension =
+ Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, _PI>;
+
// ----
-
-
+
// I'm dont't manage to do this properly.......
/*
- template<typename TT, typename SS> using TESTi = typename NuclearParticleInterface<TT::template PIType, SS>::ExtendedParticleInterface;
- template<typename TT, typename SS> using TEST1 = TESTi<TT, SS>;
- template<typename SS> using TEST2 = TEST1<typename corsika::stack::super_stupid::SuperStupidStack, SS>;
-
- using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, TEST2>;
+ template<typename TT, typename SS> using TESTi = typename
+ NuclearParticleInterface<TT::template PIType, SS>::ExtendedParticleInterface;
+ template<typename TT, typename SS> using TEST1 = TESTi<TT, SS>;
+ template<typename SS> using TEST2 = TEST1<typename
+ corsika::stack::super_stupid::SuperStupidStack, SS>;
+
+ using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename
+ InnerStack::StackImpl>, TEST2>;
*/
/*
// .... this should be fixed ....
template <typename InnerStack, typename SS=StackIteratorInterface>
- //using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, NuclearParticleInterface<typename InnerStack::template PIType, StackIteratorInterface>::ExtendedParticleInterface>;
- using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, TEST1<typename corsika::stack::super_stupid::SuperStupidStack, SS> >;
-
+ //using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename
+ InnerStack::StackImpl>, NuclearParticleInterface<typename InnerStack::template PIType,
+ StackIteratorInterface>::ExtendedParticleInterface>; using NuclearStackExtension =
+ Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, TEST1<typename
+ corsika::stack::super_stupid::SuperStupidStack, SS> >;
+
//template <typename InnerStack>
- // using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, TEST<typename corsika::stack::super_stupid::SuperStupidStack::PIType>>;
- //using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename InnerStack::StackImpl>, TEST>;
+ // using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename
+ InnerStack::StackImpl>, TEST<typename
+ corsika::stack::super_stupid::SuperStupidStack::PIType>>;
+ //using NuclearStackExtension = Stack<NuclearStackExtensionImpl<typename
+ InnerStack::StackImpl>, TEST>;
*/
-
+
} // namespace nuclear_extension
} // namespace corsika::stack
diff --git a/Stack/NuclearStackExtension/testNuclearStackExtension.cc b/Stack/NuclearStackExtension/testNuclearStackExtension.cc
index ef0c22dbd9e485373e8dd559e7d7f54ab17fe2af..05983794970285750c462439bd3f1825515c56f7 100644
--- a/Stack/NuclearStackExtension/testNuclearStackExtension.cc
+++ b/Stack/NuclearStackExtension/testNuclearStackExtension.cc
@@ -9,9 +9,9 @@
* the license.
*/
+#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/stack/nuclear_extension/NuclearStackExtension.h>
#include <corsika/stack/super_stupid/SuperStupidStack.h>
-#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/units/PhysicalUnits.h>
#include <boost/type_index.hpp>
@@ -29,10 +29,13 @@ using namespace corsika::stack::nuclear_extension;
// this is an auxiliary help typedef, which I don't know how to put
// into NuclearStackExtension.h where it belongs...
-template<typename StackIter> using ExtendedParticleInterfaceType =
- corsika::stack::nuclear_extension::NuclearParticleInterface<corsika::stack::super_stupid::SuperStupidStack::PIType, StackIter>;
+template <typename StackIter>
+using ExtendedParticleInterfaceType =
+ corsika::stack::nuclear_extension::NuclearParticleInterface<
+ corsika::stack::super_stupid::SuperStupidStack::PIType, StackIter>;
-using ExtStack = NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack, ExtendedParticleInterfaceType>;
+using ExtStack = NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack,
+ ExtendedParticleInterfaceType>;
#include <iostream>
using namespace std;
@@ -44,17 +47,20 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
// cout << "ParticleType=" << type_id_with_cvr<ParticleType>().pretty_name() << endl;
-
SECTION("write non nucleus") {
- NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack, ExtendedParticleInterfaceType> s;
+ NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack,
+ ExtendedParticleInterfaceType>
+ s;
s.AddParticle(particles::Code::Electron, 1.5_GeV,
MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s);
REQUIRE(s.GetSize() == 1);
}
-
+
SECTION("write nucleus") {
- NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack, ExtendedParticleInterfaceType> s;
+ NuclearStackExtension<corsika::stack::super_stupid::SuperStupidStack,
+ ExtendedParticleInterfaceType>
+ s;
s.AddParticle(particles::Code::Nucleus, 1.5_GeV,
MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 10, 10);
@@ -63,9 +69,9 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
SECTION("write invalid nucleus") {
ExtStack s;
- REQUIRE_THROWS(s.AddParticle(particles::Code::Nucleus, 1.5_GeV,
- MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 0, 0));
+ REQUIRE_THROWS(s.AddParticle(
+ particles::Code::Nucleus, 1.5_GeV, MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
+ Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, 0, 0));
}
SECTION("read non nucleus") {
@@ -78,7 +84,7 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
REQUIRE(pout.GetEnergy() == 1.5_GeV);
REQUIRE(pout.GetTime() == 100_s);
}
-
+
SECTION("read nucleus") {
ExtStack s;
s.AddParticle(particles::Code::Nucleus, 1.5_GeV,
@@ -101,119 +107,115 @@ TEST_CASE("NuclearStackExtension", "[stack]") {
REQUIRE_THROWS(pout.GetNuclearA());
REQUIRE_THROWS(pout.GetNuclearZ());
}
-
SECTION("stack fill and cleanup") {
ExtStack s;
// add 99 particles, each 10th particle is a nucleus with A=i and Z=A/2!
for (int i = 0; i < 99; ++i) {
- if ((i+1)%10 == 0) {
- s.AddParticle(particles::Code::Nucleus, 1.5_GeV,
- MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, i, i/2);
+ if ((i + 1) % 10 == 0) {
+ s.AddParticle(particles::Code::Nucleus, 1.5_GeV,
+ MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
+ Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, i, i / 2);
} else {
- s.AddParticle(particles::Code::Electron, 1.5_GeV,
- MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s);
+ s.AddParticle(particles::Code::Electron, 1.5_GeV,
+ MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
+ Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s);
}
}
- REQUIRE(s.GetSize() == 99);
+ REQUIRE(s.GetSize() == 99);
for (int i = 0; i < 99; ++i) s.GetNextParticle().Delete();
REQUIRE(s.GetSize() == 0);
}
-
SECTION("stack operations") {
ExtStack s;
// add 99 particles, each 10th particle is a nucleus with A=i and Z=A/2!
for (int i = 0; i < 99; ++i) {
- if ((i+1)%10 == 0) {
- s.AddParticle(particles::Code::Nucleus, i*15_GeV,
- MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, i, i/2);
+ if ((i + 1) % 10 == 0) {
+ s.AddParticle(particles::Code::Nucleus, i * 15_GeV,
+ MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
+ Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s, i, i / 2);
} else {
- s.AddParticle(particles::Code::Electron, i*1.5_GeV,
- MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
- Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s);
+ s.AddParticle(particles::Code::Electron, i * 1.5_GeV,
+ MomentumVector(dummyCS, {1_GeV, 1_GeV, 1_GeV}),
+ Point(dummyCS, {1 * meter, 1 * meter, 1 * meter}), 100_s);
}
}
// copy
{
- s.Copy(s.begin()+9, s.begin()+10); // nuclei to non-nuclei
+ s.Copy(s.begin() + 9, s.begin() + 10); // nuclei to non-nuclei
const auto& p9 = s.cbegin() + 9;
const auto& p10 = s.cbegin() + 10;
-
+
REQUIRE(p9.GetPID() == particles::Code::Nucleus);
- REQUIRE(p9.GetEnergy() == 9*15_GeV);
+ REQUIRE(p9.GetEnergy() == 9 * 15_GeV);
REQUIRE(p9.GetTime() == 100_s);
REQUIRE(p9.GetNuclearA() == 9);
- REQUIRE(p9.GetNuclearZ() == 9/2);
-
+ REQUIRE(p9.GetNuclearZ() == 9 / 2);
+
REQUIRE(p10.GetPID() == particles::Code::Nucleus);
- REQUIRE(p10.GetEnergy() == 9*15_GeV);
+ REQUIRE(p10.GetEnergy() == 9 * 15_GeV);
REQUIRE(p10.GetTime() == 100_s);
REQUIRE(p10.GetNuclearA() == 9);
- REQUIRE(p10.GetNuclearZ() == 9/2);
+ REQUIRE(p10.GetNuclearZ() == 9 / 2);
}
// copy
{
- s.Copy(s.begin()+93, s.begin()+9); // non-nuclei to nuclei
+ s.Copy(s.begin() + 93, s.begin() + 9); // non-nuclei to nuclei
const auto& p93 = s.cbegin() + 93;
const auto& p9 = s.cbegin() + 9;
-
+
REQUIRE(p9.GetPID() == particles::Code::Electron);
- REQUIRE(p9.GetEnergy() == 93*1.5_GeV);
+ REQUIRE(p9.GetEnergy() == 93 * 1.5_GeV);
REQUIRE(p9.GetTime() == 100_s);
-
+
REQUIRE(p93.GetPID() == particles::Code::Electron);
- REQUIRE(p93.GetEnergy() == 93*1.5_GeV);
+ REQUIRE(p93.GetEnergy() == 93 * 1.5_GeV);
REQUIRE(p93.GetTime() == 100_s);
}
// swap
{
- s.Swap(s.begin()+11, s.begin()+10);
+ s.Swap(s.begin() + 11, s.begin() + 10);
const auto& p11 = s.cbegin() + 11; // now: nucleus
const auto& p10 = s.cbegin() + 10; // now: electron
-
+
REQUIRE(p11.GetPID() == particles::Code::Nucleus);
- REQUIRE(p11.GetEnergy() == 9*15_GeV);
+ REQUIRE(p11.GetEnergy() == 9 * 15_GeV);
REQUIRE(p11.GetTime() == 100_s);
REQUIRE(p11.GetNuclearA() == 9);
- REQUIRE(p11.GetNuclearZ() == 9/2);
-
+ REQUIRE(p11.GetNuclearZ() == 9 / 2);
+
REQUIRE(p10.GetPID() == particles::Code::Electron);
- REQUIRE(p10.GetEnergy() == 11*1.5_GeV);
+ REQUIRE(p10.GetEnergy() == 11 * 1.5_GeV);
REQUIRE(p10.GetTime() == 100_s);
}
// swap two nuclei
{
- s.Swap(s.begin()+29, s.begin()+59);
+ s.Swap(s.begin() + 29, s.begin() + 59);
const auto& p29 = s.cbegin() + 29;
const auto& p59 = s.cbegin() + 59;
-
+
REQUIRE(p29.GetPID() == particles::Code::Nucleus);
- REQUIRE(p29.GetEnergy() == 59*15_GeV);
+ REQUIRE(p29.GetEnergy() == 59 * 15_GeV);
REQUIRE(p29.GetTime() == 100_s);
REQUIRE(p29.GetNuclearA() == 59);
- REQUIRE(p29.GetNuclearZ() == 59/2);
+ REQUIRE(p29.GetNuclearZ() == 59 / 2);
REQUIRE(p59.GetPID() == particles::Code::Nucleus);
- REQUIRE(p59.GetEnergy() == 29*15_GeV);
+ REQUIRE(p59.GetEnergy() == 29 * 15_GeV);
REQUIRE(p59.GetTime() == 100_s);
REQUIRE(p59.GetNuclearA() == 29);
- REQUIRE(p59.GetNuclearZ() == 29/2);
+ REQUIRE(p59.GetNuclearZ() == 29 / 2);
}
-
+
for (int i = 0; i < 99; ++i) s.DeleteLast();
REQUIRE(s.GetSize() == 0);
-
}
-
}
diff --git a/Stack/SuperStupidStack/SuperStupidStack.h b/Stack/SuperStupidStack/SuperStupidStack.h
index b4c8c858c9e4f7d1802b52773b07d813f41c050b..3daa825abcabef8d81bbb058cf62d2338933d1df 100644
--- a/Stack/SuperStupidStack/SuperStupidStack.h
+++ b/Stack/SuperStupidStack/SuperStupidStack.h
@@ -126,21 +126,33 @@ namespace corsika::stack {
unsigned int GetSize() const { return fDataPID.size(); }
unsigned int GetCapacity() const { return fDataPID.size(); }
- void SetPID(const unsigned int i, const corsika::particles::Code id) { fDataPID[i] = id; }
+ void SetPID(const unsigned int i, const corsika::particles::Code id) {
+ fDataPID[i] = id;
+ }
void SetEnergy(const unsigned int i, const corsika::units::si::HEPEnergyType e) {
fDataE[i] = e;
}
- void SetMomentum(const unsigned int i, const MomentumVector& v) { fMomentum[i] = v; }
+ void SetMomentum(const unsigned int i, const MomentumVector& v) {
+ fMomentum[i] = v;
+ }
void SetPosition(const unsigned int i, const corsika::geometry::Point& v) {
fPosition[i] = v;
}
- void SetTime(const unsigned int i, const corsika::units::si::TimeType& v) { fTime[i] = v; }
+ void SetTime(const unsigned int i, const corsika::units::si::TimeType& v) {
+ fTime[i] = v;
+ }
corsika::particles::Code GetPID(const unsigned int i) const { return fDataPID[i]; }
- corsika::units::si::HEPEnergyType GetEnergy(const unsigned int i) const { return fDataE[i]; }
+ corsika::units::si::HEPEnergyType GetEnergy(const unsigned int i) const {
+ return fDataE[i];
+ }
MomentumVector GetMomentum(const unsigned int i) const { return fMomentum[i]; }
- corsika::geometry::Point GetPosition(const unsigned int i) const { return fPosition[i]; }
- corsika::units::si::TimeType GetTime(const unsigned int i) const { return fTime[i]; }
+ corsika::geometry::Point GetPosition(const unsigned int i) const {
+ return fPosition[i];
+ }
+ corsika::units::si::TimeType GetTime(const unsigned int i) const {
+ return fTime[i];
+ }
/**
* Function to copy particle at location i2 in stack to i1
@@ -204,7 +216,7 @@ namespace corsika::stack {
}; // end class SuperStupidStackImpl
typedef Stack<SuperStupidStackImpl, ParticleInterface> SuperStupidStack;
-
+
} // namespace super_stupid
} // namespace corsika::stack
diff --git a/Stack/SuperStupidStack/testSuperStupidStack.cc b/Stack/SuperStupidStack/testSuperStupidStack.cc
index 8076ac1d8078e4001610341d26d2538ade8bfae4..0e3628b46f6639e336a34cc8545f05b39fb98831 100644
--- a/Stack/SuperStupidStack/testSuperStupidStack.cc
+++ b/Stack/SuperStupidStack/testSuperStupidStack.cc
@@ -9,7 +9,6 @@
* the license.
*/
-
#include <corsika/geometry/RootCoordinateSystem.h>
#include <corsika/stack/super_stupid/SuperStupidStack.h>
#include <corsika/units/PhysicalUnits.h>
diff --git a/test.cc b/test.cc
index 4227e0de4f5490ee2ac5a90857d68c5653e865ec..6839def48c2f6fddfafd0beb5fd4ca46058ebd09 100644
--- a/test.cc
+++ b/test.cc
@@ -8,5 +8,3 @@
* Licence version 3 (GPL Version 3). See file LICENSE for a full version of
* the license.
*/
-
-