clang-format is now CLANG_FORMAT

try to perform a proper submodule update on the gitlab CI

ci

removed spdlog submodule

re-added spdlog as submodule... fixed gitignore

.gitignore

 *gcov
 **/*~
 **/*.bak
-**/*log
 build/
 Framework/Particles/GeneratedParticleProperties.inc
 flymd.html

.gitlab-ci.yml

 variables:
-  GIT_STRATEGY: fetch
+  GIT_STRATEGY: fetch # clone: fresh clone, fetch: update
   GIT_SSL_NO_VERIFY: "1"
   GIT_DEPTH: "1"
   # to re-use clones also in different forks
@@ -13,7 +13,8 @@ variables:
   # location of AirShowerPhysics/corsika-data
   CORSIKA_DATA: "${CI_PROJECT_DIR}/Data" # the git submodule
   # _alternatively_ corsika-data can be downloaded as submodule:
-  GIT_SUBMODULE_STRATEGY: normal
+  GIT_SUBMODULE_STRATEGY: normal # none: we get the submodules in before_script,
+                                 # normal: get submodules automatically
 
 
 #
@@ -79,11 +80,7 @@ check-clang-format:
   stage: config
   tags:
     - corsika
-  variables:
-  before_script:
-   - cd Data && for F in `find . -name "*.bz2" | grep -v ".git"`; do [ ! -f ${F%%.bz2} ] && bunzip2 -vk $F; done
-   - cd ${CI_PROJECT_DIR}
-  script:
+  script:    
     - mkdir -p build
     - cd build
     - cmake .. -DCMAKE_BUILD_TYPE=Debug -DWITH_PYTHIA=ON
@@ -94,7 +91,6 @@ check-clang-format:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull-push
 
@@ -138,7 +134,6 @@ config-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull-push
 
@@ -195,7 +190,6 @@ build-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull-push
 
@@ -252,7 +246,6 @@ test-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull-push
 
@@ -305,7 +298,6 @@ build_test-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
 
@@ -365,7 +357,6 @@ example-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
 
@@ -415,7 +406,6 @@ build_test_example-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
 
@@ -470,7 +460,6 @@ install-clang-8:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
   artifacts:
@@ -540,7 +529,6 @@ coverage:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
     key: "${CI_COMMIT_REF_SLUG}-gcc"
@@ -580,7 +568,6 @@ documentation:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
     key: "${CI_COMMIT_REF_SLUG}-gcc"
@@ -613,7 +600,6 @@ sanity:
   cache:
     paths:
       - ${CI_PROJECT_DIR}/build/
-      - ${CI_PROJECT_DIR}/Data/
     untracked: true
     policy: pull
     key: "${CI_COMMIT_REF_SLUG}-gcc"

Documentation/Examples/vertical_EAS.cc

@@ -18,7 +18,6 @@
 #include <corsika/process/ProcessSequence.h>
 #include <corsika/process/StackProcess.h>
 #include <corsika/process/energy_loss/EnergyLoss.h>
-#include <corsika/process/interaction_counter/InteractionCounter.h>
 #include <corsika/process/longitudinal_profile/LongitudinalProfile.h>
 #include <corsika/process/observation_plane/ObservationPlane.h>
 #include <corsika/process/on_shell_check/OnShellCheck.h>
@@ -37,6 +36,7 @@
 #include <corsika/setup/SetupTrajectory.h>
 #include <corsika/units/PhysicalUnits.h>
 #include <corsika/utl/CorsikaFenv.h>
+#include <corsika/process/interaction_counter/InteractionCounter.hpp>
 
 #include <iomanip>
 #include <iostream>

Processes/InteractionCounter/CMakeLists.txt

 set (
   MODEL_HEADERS
-  InteractionCounter.h
-  InteractionHistogram.h
+  InteractionCounter.hpp
+  InteractionHistogram.hpp
   )
 
 set (

Processes/InteractionCounter/InteractionCounter.h → Processes/InteractionCounter/InteractionCounter.hpp

@@ -8,9 +8,10 @@
 
 #pragma once
 
+#include <corsika/process/interaction_counter/InteractionHistogram.hpp>
+
 #include <corsika/process/InteractionProcess.h>
 #include <corsika/process/ProcessSequence.h>
-#include <corsika/process/interaction_counter/InteractionHistogram.h>
 #include <corsika/setup/SetupStack.h>
 
 namespace corsika::process::interaction_counter {

Processes/InteractionCounter/InteractionHistogram.cc

@@ -6,7 +6,7 @@
  * the license.
  */
 
-#include <corsika/process/interaction_counter/InteractionHistogram.h>
+#include <corsika/process/interaction_counter/InteractionHistogram.hpp>
 
 #include <fstream>
 #include <string>

Processes/InteractionCounter/InteractionHistogram.h → Processes/InteractionCounter/InteractionHistogram.hpp

@@ -6,6 +6,8 @@
  * the license.
  */
 
+#pragma once
+
 #include <corsika/particles/ParticleProperties.h>
 #include <corsika/units/PhysicalUnits.h>
 

Processes/InteractionCounter/testInteractionCounter.cc

@@ -6,7 +6,7 @@
  * the license.
  */
 
-#include <corsika/process/interaction_counter/InteractionCounter.h>
+#include <corsika/process/interaction_counter/InteractionCounter.hpp>
 
 #include <corsika/environment/Environment.h>
 #include <corsika/environment/HomogeneousMedium.h>

ThirdParty/.gitignore

 eigen-eigen-b3f3d4950030/
-

ThirdParty/CMakeLists.txt

+add_subdirectory (spdlog) # this is a git submodule 
+
 add_library (CORSIKAthirdparty INTERFACE)
 
 target_include_directories (CORSIKAthirdparty SYSTEM
@@ -16,9 +18,6 @@ set (ThirdPartyChoiceValues "C8;SYSTEM" CACHE STRING
     "List of possible values for the ThirdParty package choice")
 mark_as_advanced (ThirdPartyChoiceValues)
 
-##############################################################################
-# Build spdlog
-add_subdirectory (spdlog)
 
 ##############################################################################
 # check for boost: either use C8 or system-level installation

do-clang-format.py

@@ -28,7 +28,7 @@ if args.all:
         if doExclude:
             continue
         for f in filenames:
-            if f.endswith(".h") or f.endswith(".cc"):
+            if f.endswith(".h") or f.endswith(".cc") or f.endswith(".hpp") or f.endswith(".cpp") or f.endswith(".cxx"):
                 filename = os.path.join(dirpath, f)
                 if not os.path.islink(filename):
                     filelist.append(filename)
@@ -52,7 +52,7 @@ else:
 cmd = "clang-format"
 if "CLANG_FORMAT" in os.environ:
   cmd = os.environ["CLANG_FORMAT"]
-  cmd +=  " -style=file"
+cmd +=  " -style=file"
 if args.apply:
     for filename in filelist:
         subp.check_call(cmd.split() + ["-i", filename])