diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41fb08404ff739df912374c9a748fe896c5dfdd0..b2cad6e599e91c27d4631f05d1c7b136d9cb75d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -39,7 +39,6 @@ stages: - ####### CODE QUALITY CHECK ############## ########################################################## diff --git a/corsika/detail/framework/utility/SaveBoostHistogram.inl b/corsika/detail/framework/utility/SaveBoostHistogram.inl index 817fd6714a0a00ba492c31e9a45fa7c89ac2b5ff..656a776cf48978eb5327ef9dd6591afbcdc6243a 100644 --- a/corsika/detail/framework/utility/SaveBoostHistogram.inl +++ b/corsika/detail/framework/utility/SaveBoostHistogram.inl @@ -25,8 +25,7 @@ namespace corsika { template <class Axes, class Storage> inline void save_hist(boost::histogram::histogram<Axes, Storage> const& h, std::string const& filename, bool overwrite) { - if (boost::filesystem::status(filename).type() != - boost::filesystem::file_type::file_not_found) { + if (boost::filesystem::exists(filename)) { if (overwrite) { boost::filesystem::remove(filename); } else { diff --git a/examples/boundary_example.cpp b/examples/boundary_example.cpp index 797f49502563991b9a94181614bb1719efe9f6ec..083a54559d1a52ac2a0f27d526b97b9614265e49 100644 --- a/examples/boundary_example.cpp +++ b/examples/boundary_example.cpp @@ -151,7 +151,7 @@ int main() { auto const [px, py, pz] = momentumComponents(theta / 180. * M_PI, phi / 180. * M_PI, P0); auto plab = MomentumVector(rootCS, {px, py, pz}); - CORSIKA_LOG_INFO( + CORSIKA_LOG_DEBUG( "input particle: {} " "input angles: theta={} phi={}" "input momentum: {} GeV", diff --git a/examples/cascade_example.cpp b/examples/cascade_example.cpp index 6632e797973aaac278add153b4428860464877f9..da7cdb2d4ab38c9b9b35d9d1b5bebf04750f9239 100644 --- a/examples/cascade_example.cpp +++ b/examples/cascade_example.cpp @@ -131,7 +131,7 @@ int main() { // setup processes, decays and interactions setup::Tracking tracking; - StackInspector<setup::Stack> stackInspect(1, true, E0); + StackInspector<setup::Stack> stackInspect(100, true, E0); RNGManager<>::getInstance().registerRandomStream("sibyll"); RNGManager<>::getInstance().registerRandomStream("pythia"); diff --git a/examples/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp index cd043185db13e95a365a371b438bf3c32abe0293..81d8101d794ce5b0d0b9bc4a1f09431b284d1997 100644 --- a/examples/cascade_proton_example.cpp +++ b/examples/cascade_proton_example.cpp @@ -80,7 +80,7 @@ int main() { UniformMagneticField<HomogeneousMedium<setup::EnvironmentInterface>>>; world->setModelProperties<MyHomogeneousModel>( - Medium::AirDry1Atm, MagneticFieldVector(rootCS, 0_T, 0_T, 1_T), + Medium::AirDry1Atm, MagneticFieldVector(rootCS, 0_T, 0_T, 1_mT), 1_kg / (1_m * 1_m * 1_m), NuclearComposition(std::vector<Code>{Code::Hydrogen}, std::vector<float>{(float)1.})); @@ -92,7 +92,7 @@ int main() { stack.clear(); const Code beamCode = Code::Proton; const HEPMassType mass = Proton::mass; - const HEPEnergyType E0 = 1000_GeV; + const HEPEnergyType E0 = 200_GeV; double theta = 0.; double phi = 0.; @@ -121,10 +121,7 @@ int main() { RNGManager<>::getInstance().registerRandomStream("sibyll"); RNGManager<>::getInstance().registerRandomStream("pythia"); - // corsika::sibyll::Interaction sibyll; corsika::pythia8::Interaction pythia; - // sibyll::NuclearInteraction sibyllNuc(sibyll, env); - // sibyll::Decay decay; corsika::pythia8::Decay decay; ParticleCut cut(60_GeV, true, true); cut.printThresholds(); @@ -140,9 +137,6 @@ int main() { BetheBlochPDG eLoss{showerAxis}; // assemble all processes into an ordered process list - // auto sequence = make_sequence(sibyll, sibyllNuc, decay, eLoss, cut, trackWriter, - // stackInspect); auto sequence = make_sequence(sibyll, decay, eLoss, cut, trackWriter, - // stackInspect); auto sequence = make_sequence(pythia, decay, eLoss, cut, trackWriter, stackInspect); // define air shower object, run simulation diff --git a/examples/corsika.cpp b/examples/corsika.cpp index ab2bdf232872bfc6574ad03fd23bd271004e316e..134da28be6fc96f0f6c8cffed01b227f63fbfc20 100644 --- a/examples/corsika.cpp +++ b/examples/corsika.cpp @@ -88,13 +88,11 @@ void registerRandomStreams(int seed) { RNGManager<>::getInstance().registerRandomStream("pythia"); RNGManager<>::getInstance().registerRandomStream("urqmd"); RNGManager<>::getInstance().registerRandomStream("proposal"); - if (seed == 0) { std::random_device rd; seed = rd(); cout << "new random seed (auto) " << seed << endl; } - RNGManager<>::getInstance().setSeed(seed); } diff --git a/tests/framework/testCascade.cpp b/tests/framework/testCascade.cpp index 607daac9929bf407aae9bb87d904cf7c09f6cb51..8c57b42ff43412b57475f87e32752a65ff61a12e 100644 --- a/tests/framework/testCascade.cpp +++ b/tests/framework/testCascade.cpp @@ -130,8 +130,8 @@ public: } ++p; // next particle } - CORSIKA_LOG_INFO(fmt::format("ProcessCut::doSecondaries size={} count={}", - vS.getEntries(), count_)); + CORSIKA_LOG_DEBUG("ProcessCut::doSecondaries size={} count={}", vS.getEntries(), + count_); } int getCount() const { return count_; } @@ -140,7 +140,7 @@ public: TEST_CASE("Cascade", "[Cascade]") { - logging::set_level(logging::level::trace); + logging::set_level(logging::level::info); HEPEnergyType E0 = 100_GeV; @@ -150,7 +150,7 @@ TEST_CASE("Cascade", "[Cascade]") { auto env = make_dummy_env(); auto const& rootCS = env.getCoordinateSystem(); - StackInspector<TestCascadeStack> stackInspect(1, true, E0); + StackInspector<TestCascadeStack> stackInspect(100, true, E0); NullModel nullModel; const HEPEnergyType Ecrit = 85_MeV; diff --git a/tests/framework/testSolver.cpp b/tests/framework/testSolver.cpp index 423b73b8b60bcb4c90c4f3e2ff9adbf732b2e724..089335ed5ee6d42d25ec8ddee4a47e459c503325 100644 --- a/tests/framework/testSolver.cpp +++ b/tests/framework/testSolver.cpp @@ -40,7 +40,7 @@ void remove_duplicates(vector<double>& v, double const eps) { TEST_CASE("Solver") { - logging::set_level(logging::level::trace); + logging::set_level(logging::level::info); double epsilon_check = 1e-3; // for catch2 asserts diff --git a/tests/modules/testNullModel.cpp b/tests/modules/testNullModel.cpp index 6485b7df95a804e11301c0bc01095d705586fdea..658ec03d13ed50c010ed75fa1f7abb34383fc36a 100644 --- a/tests/modules/testNullModel.cpp +++ b/tests/modules/testNullModel.cpp @@ -14,7 +14,7 @@ using namespace corsika; TEST_CASE("NullModel", "[processes]") { - logging::set_level(logging::level::trace); + logging::set_level(logging::level::info); SECTION("interface") { [[maybe_unused]] NullModel model; // nothing to test... diff --git a/tests/modules/testOnShellCheck.cpp b/tests/modules/testOnShellCheck.cpp index 799049f29d94dd56d1cd1518bbf40029ead4a818..341fc3c88ab0ad4fa5c7b16efa70aaa0a48095ce 100644 --- a/tests/modules/testOnShellCheck.cpp +++ b/tests/modules/testOnShellCheck.cpp @@ -24,7 +24,7 @@ using namespace corsika; TEST_CASE("OnShellCheck", "[processes]") { - logging::set_level(logging::level::debug); + logging::set_level(logging::level::info); feenableexcept(FE_INVALID); using EnvType = setup::Environment; diff --git a/tests/modules/testSibyll.cpp b/tests/modules/testSibyll.cpp index 79caacd961bdfdefa95ea93118d172d4d07dc2b1..3f0c89e08b3e85ece0e59296b9f273414dadac56 100644 --- a/tests/modules/testSibyll.cpp +++ b/tests/modules/testSibyll.cpp @@ -32,7 +32,7 @@ using namespace corsika::sibyll; TEST_CASE("Sibyll", "[processes]") { - logging::set_level(logging::level::trace); + logging::set_level(logging::level::info); SECTION("Sibyll -> Corsika") { CHECK(Code::Electron == @@ -101,7 +101,7 @@ auto sumMomentum(TStackView const& view, CoordinateSystemPtr const& vCS) { TEST_CASE("SibyllInterface", "[processes]") { - logging::set_level(logging::level::trace); + logging::set_level(logging::level::info); auto [env, csPtr, nodePtr] = setup::testing::setup_environment(Code::Oxygen); auto const& cs = *csPtr;