From 439019807688bba19afd7d1121d7b3d2f721f53c Mon Sep 17 00:00:00 2001 From: ralfulrich <ralf.ulrich@kit.edu> Date: Tue, 8 Jun 2021 12:43:22 +0200 Subject: [PATCH] more std boost filesystem use --- corsika/detail/framework/utility/SaveBoostHistogram.inl | 3 +-- examples/cascade_proton_example.cpp | 4 ++-- examples/corsika.cpp | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/corsika/detail/framework/utility/SaveBoostHistogram.inl b/corsika/detail/framework/utility/SaveBoostHistogram.inl index 817fd6714..656a776cf 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/cascade_proton_example.cpp b/examples/cascade_proton_example.cpp index 8779ab4a7..81d8101d7 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.; diff --git a/examples/corsika.cpp b/examples/corsika.cpp index ab2bdf232..134da28be 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); } -- GitLab