IAP GITLAB

Skip to content
Snippets Groups Projects
Commit d66de4f7 authored by Ralf Ulrich's avatar Ralf Ulrich
Browse files

Merge branch 'conex_output_precision' into 'master'

Increased CONEX output precision

See merge request !363
parents 545512cc b034b71d
No related branches found
No related tags found
No related merge requests found
...@@ -260,14 +260,13 @@ namespace corsika { ...@@ -260,14 +260,13 @@ namespace corsika {
::conex::get_shower_hadron_(icuth, nX, Hadrons[0]); ::conex::get_shower_hadron_(icuth, nX, Hadrons[0]);
std::ofstream file{"conex_output.txt"}; std::ofstream file{"conex_output.txt"};
file << fmt::format("#{:>8} {:>13} {:>13} {:>13} {:>13} {:>13} {:>13} {:>13}\n", "X", file << fmt::format("#{:>10} {:>13} {:>13} {:>13} {:>13} {:>13} {:>13} {:>13}\n", "X",
"N", "dEdX", "Mu", "dMu", "Photon", "El", "Had"); "N", "dEdX", "Mu", "dMu", "Photon", "El", "Had");
for (int i = 0; i < nX; ++i) { for (int i = 0; i < nX; ++i) {
file << fmt::format( file << fmt::format(" {:>10.2f} {:.5e} {:.5e} {:.5e} {:.5e} {:.5e} {:.5e} {:.5e}\n",
" {:>8.2f} {:>13.3} {:>13.3} {:>13.3} {:>13.3} {:>13.3} {:>13.3} {:>13.3}\n", X[i], N[i], dEdX[i], Mu[i], dMu[i], Photon[i], Electrons[i],
X[i], N[i], dEdX[i], Mu[i], dMu[i], Photon[i], Electrons[i], Hadrons[i]); Hadrons[i]);
} }
file.close();
std::ofstream fitout{"conex_fit.txt"}; std::ofstream fitout{"conex_fit.txt"};
fitout << fitpars[1 - 1] << " # log10(eprima/eV)" << std::endl; fitout << fitpars[1 - 1] << " # log10(eprima/eV)" << std::endl;
...@@ -283,7 +282,6 @@ namespace corsika { ...@@ -283,7 +282,6 @@ namespace corsika {
fitout << fitpars[11 - 1] << " # phi" << std::endl; fitout << fitpars[11 - 1] << " # phi" << std::endl;
fitout << fitpars[12 - 1] << " # inelasticity 1st int." << std::endl; fitout << fitpars[12 - 1] << " # inelasticity 1st int." << std::endl;
fitout << fitpars[13 - 1] << " # ???" << std::endl; fitout << fitpars[13 - 1] << " # ???" << std::endl;
fitout.close();
} }
inline HEPEnergyType CONEXhybrid::getEnergyEM() const { return energy_em_; } inline HEPEnergyType CONEXhybrid::getEnergyEM() const { return energy_em_; }
......
This diff is collapsed.
...@@ -297,7 +297,7 @@ TEMPLATE_TEST_CASE("TrackingFail", "doesntwork", tracking_leapfrog_curved::Track ...@@ -297,7 +297,7 @@ TEMPLATE_TEST_CASE("TrackingFail", "doesntwork", tracking_leapfrog_curved::Track
TEMPLATE_TEST_CASE("TrackingPlane", "plane", tracking_leapfrog_curved::Tracking, TEMPLATE_TEST_CASE("TrackingPlane", "plane", tracking_leapfrog_curved::Tracking,
tracking_leapfrog_straight::Tracking, tracking_line::Tracking) { tracking_leapfrog_straight::Tracking, tracking_line::Tracking) {
logging::set_level(logging::level::trace); logging::set_level(logging::level::info);
const HEPEnergyType P0 = 10_GeV; const HEPEnergyType P0 = 10_GeV;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment