Merge branch 'ci_fix_halt' into 'master'

CI artifacts

See merge request !367

.gitlab-ci.yml

@@ -253,6 +253,7 @@ build_test-clang-8:
 ##########################################################
 # generic example template job
 # normal pipeline for each commit
+# artefacts are needed as input for python jobs
 .build_test_example:
   stage: build_test_example
   tags:
@@ -269,7 +270,7 @@ build_test-clang-8:
     - cd build_examples
     - cmake -DCMAKE_BUILD_TYPE=Debug ../install/share/corsika/examples
     - cmake --build . -- -j2
-    - cmake --build . --target run_examples -- -j2 | gzip -v -9 > examples.log.gz
+    - cmake --build . --target run_examples -- -j2 
   rules:
     - if: '$CI_MERGE_REQUEST_ID && ($CI_MERGE_REQUEST_TITLE =~ /^Draft:/ || $CI_MERGE_REQUEST_TITLE =~ /^WIP:/)'
       when: manual
@@ -286,7 +287,7 @@ build_test-clang-8:
       junit:
         - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
     paths:
-      - ${CI_PROJECT_DIR}/build/build_examples/examples.log.gz
+      - ${CI_PROJECT_DIR}/build/build_examples/example_outputs
       - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
 
 # build_test_example for gcc
@@ -367,7 +368,7 @@ install-clang-8:
     - cd build_examples
     - cmake -DCMAKE_BUILD_TYPE=Release ../install/share/corsika/examples
     - cmake --build . -- -j2
-    - cmake --build . --target run_examples -- -j2 | gzip -v -9 > examples.log.gz
+    - cmake --build . --target run_examples -- -j2 
   rules:
     - if: '$CI_MERGE_REQUEST_LABELS =~ /Ready for code review/' # run on merge requests, if label 'Ready for code review' is set
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
@@ -386,7 +387,6 @@ install-clang-8:
       junit:
         - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
     paths:
-      - ${CI_PROJECT_DIR}/build/build_examples/examples.log.gz
       - ${CI_PROJECT_DIR}/build/test_outputs/junit*.xml
 
 # release for gcc
@@ -476,6 +476,9 @@ sanity:
       when: manual
       allow_failure: true
 
+
+######  Python ##########
+
 ##########################################################
 # template for all Python jobs
 .python:
@@ -502,8 +505,8 @@ python-3.8:
   extends: .python
   image: corsika/devel:u-18.04
   needs:
-    - job: build-u-18_04
-      artifacts: false
+    - job: build_test_example-u-18_04
+      artifacts: true
   artifacts:
     when: always
     expire_in: 1 year

corsika/detail/modules/ParticleCut.inl

@@ -38,7 +38,6 @@ namespace corsika {
         "hadrons = {} GeV, "
         "muons = {} GeV",
         eEleCut / 1_GeV, ePhoCut / 1_GeV, eHadCut / 1_GeV, eMuCut / 1_GeV);
-    printThresholds();
   }
 
   inline ParticleCut::ParticleCut(HEPEnergyType const eHadCut, HEPEnergyType const eMuCut,
@@ -61,7 +60,6 @@ namespace corsika {
         "setting thresholds: hadrons = {} GeV, "
         "muons = {} GeV",
         eHadCut / 1_GeV, eMuCut / 1_GeV);
-    printThresholds();
   }
 
   inline ParticleCut::ParticleCut(HEPEnergyType const eCut, bool const em, bool const inv)
@@ -76,7 +74,6 @@ namespace corsika {
     for (auto p : get_all_particles()) set_kinetic_energy_threshold(p, eCut);
     CORSIKA_LOG_DEBUG("setting kinetic energy threshold for all particles to {} GeV",
                       eCut / 1_GeV);
-    printThresholds();
   }
 
   inline ParticleCut::ParticleCut(
@@ -92,7 +89,6 @@ namespace corsika {
       , inv_count_(0) {
     set_kinetic_energy_thresholds(eCuts);
     CORSIKA_LOG_DEBUG("setting threshold particles individually");
-    printThresholds();
   }
 
   template <typename TParticle>

examples/cascade_proton_example.cpp

@@ -127,6 +127,7 @@ int main() {
   //  sibyll::Decay decay;
   corsika::pythia8::Decay decay;
   ParticleCut cut(60_GeV, true, true);
+  cut.printThresholds();
 
   // RNGManager::getInstance().registerRandomStream("HadronicElasticModel");
   // HadronicElasticModel::HadronicElasticInteraction

examples/em_shower.cpp

@@ -144,7 +144,7 @@ int main(int argc, char** argv) {
 
   // setup processes, decays and interactions
 
-  ParticleCut cut(10_GeV, 10_GeV, 100_PeV, 100_PeV, true);
+  ParticleCut cut(60_GeV, 60_GeV, 100_PeV, 100_PeV, true);
   corsika::proposal::Interaction emCascade(env);
   corsika::proposal::ContinuousProcess emContinuous(env);
   InteractionCounter emCascadeCounted(emCascade);