diff --git a/corsika/detail/framework/core/ParticleProperties.inl b/corsika/detail/framework/core/ParticleProperties.inl
index 47504f4ea5f0dd02672418e260eb61dd6971c5c3..6c61177e3842f224ad31526fb7b32c31b7100412 100644
--- a/corsika/detail/framework/core/ParticleProperties.inl
+++ b/corsika/detail/framework/core/ParticleProperties.inl
@@ -54,7 +54,7 @@ namespace corsika {
}
inline bool constexpr is_em(Code const c) {
- return c == Code::Electron || c == Code::Positron || c == Code::Gamma;
+ return c == Code::Electron || c == Code::Positron || c == Code::Photon;
}
inline bool constexpr is_muon(Code const c) {
diff --git a/corsika/detail/modules/LongitudinalProfile.inl b/corsika/detail/modules/LongitudinalProfile.inl
index 5b1f8438bc0438c45940e34c9502cd31ec637196..643ea017313a7358fdfd22a7e02643975bcebfec 100644
--- a/corsika/detail/modules/LongitudinalProfile.inl
+++ b/corsika/detail/modules/LongitudinalProfile.inl
@@ -46,8 +46,8 @@ namespace corsika {
int const binEnd = std::floor(grammageEnd / dX_);
for (int b = binStart; b <= binEnd; ++b) {
- if (pid == Code::Gamma) {
- profiles_.at(b)[ProfileIndex::Gamma]++;
+ if (pid == Code::Photon) {
+ profiles_.at(b)[ProfileIndex::Photon]++;
} else if (pid == Code::Positron) {
profiles_.at(b)[ProfileIndex::Positron]++;
} else if (pid == Code::Electron) {
@@ -68,7 +68,7 @@ namespace corsika {
const int precision) {
CORSIKA_LOG_DEBUG("Write longprof to {}", filename);
std::ofstream f{filename};
- f << "# X / g·cm¯², gamma, e+, e-, mu+, mu-, all hadrons" << std::endl;
+ f << "# X / g·cm¯², photon, e+, e-, mu+, mu-, all hadrons" << std::endl;
for (size_t b = 0; b < profiles_.size(); ++b) {
f << std::setprecision(5) << std::setw(11) << b * (dX_ / (1_g / 1_cm / 1_cm));
for (auto const& N : profiles_.at(b)) {
diff --git a/corsika/detail/modules/ParticleCut.inl b/corsika/detail/modules/ParticleCut.inl
index ffbbbed8ddd51cb99ffe45f92217ed426fe2ee91..7eb690d64abf96e83af22fd255ce1814b315d2da 100644
--- a/corsika/detail/modules/ParticleCut.inl
+++ b/corsika/detail/modules/ParticleCut.inl
@@ -30,7 +30,7 @@ namespace corsika {
set_energy_threshold(p, eMuCut);
else if (p == Code::Electron || p == Code::Positron)
set_energy_threshold(p, eEleCut);
- else if (p == Code::Gamma)
+ else if (p == Code::Photon)
set_energy_threshold(p, ePhoCut);
else if (p == Code::Nucleus)
// nuclei have same threshold as hadrons on the nucleon level.
diff --git a/corsika/detail/modules/conex/CONEXhybrid.inl b/corsika/detail/modules/conex/CONEXhybrid.inl
index 6ab443e49bb7920d1e6a544ec84941236c8a1192..f5cb6592db22ef6c8695c6873dc03ddedbcafd69 100644
--- a/corsika/detail/modules/conex/CONEXhybrid.inl
+++ b/corsika/detail/modules/conex/CONEXhybrid.inl
@@ -246,7 +246,7 @@ namespace corsika {
auto dEdX = std::make_unique<float[]>(maxX);
auto Mu = std::make_unique<float[]>(maxX);
auto dMu = std::make_unique<float[]>(maxX);
- auto Gamma = std::make_unique<float[]>(maxX);
+ auto Photon = std::make_unique<float[]>(maxX);
auto Electrons = std::make_unique<float[]>(maxX);
auto Hadrons = std::make_unique<float[]>(maxX);
@@ -255,17 +255,17 @@ namespace corsika {
::conex::get_shower_data_(icut, iSec, nX, X[0], N[0], fitpars[0], H[0], D[0]);
::conex::get_shower_edep_(icut, nX, dEdX[0], EGround[0]);
::conex::get_shower_muon_(icutm, nX, Mu[0], dMu[0]);
- ::conex::get_shower_gamma_(icutg, nX, Gamma[0]);
+ ::conex::get_shower_gamma_(icutg, nX, Photon[0]);
::conex::get_shower_electron_(icute, nX, Electrons[0]);
::conex::get_shower_hadron_(icuth, nX, Hadrons[0]);
std::ofstream file{"conex_output.txt"};
file << fmt::format("#{:>8} {:>13} {:>13} {:>13} {:>13} {:>13} {:>13} {:>13}\n", "X",
- "N", "dEdX", "Mu", "dMu", "Gamma", "El", "Had");
+ "N", "dEdX", "Mu", "dMu", "Photon", "El", "Had");
for (int i = 0; i < nX; ++i) {
file << fmt::format(
" {:>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], Gamma[i], Electrons[i], Hadrons[i]);
+ X[i], N[i], dEdX[i], Mu[i], dMu[i], Photon[i], Electrons[i], Hadrons[i]);
}
file.close();
diff --git a/corsika/detail/modules/urqmd/UrQMD.inl b/corsika/detail/modules/urqmd/UrQMD.inl
index f0409e815995f93aedd0175cdd31be5b2a834ae4..e6572b37bff6bfcd7e7115a4dbb9ce215f244e35 100644
--- a/corsika/detail/modules/urqmd/UrQMD.inl
+++ b/corsika/detail/modules/urqmd/UrQMD.inl
@@ -337,7 +337,7 @@ namespace corsika::urqmd {
inline std::pair<int, int> convertToUrQMD(Code code) {
static const std::map<int, std::pair<int, int>> mapPDGToUrQMD{
// data mostly from github.com/afedynitch/ParticleDataTool
- {22, {100, 0}}, // gamma
+ {22, {100, 0}}, // photon
{111, {101, 0}}, // pi0
{211, {101, 2}}, // pi+
{-211, {101, -2}}, // pi-
diff --git a/corsika/framework/core/ParticleProperties.hpp b/corsika/framework/core/ParticleProperties.hpp
index d0d17d264d0dbe8e7a7338ecce743482d0e700c1..7be6db2887dea865c53346caa83f3b6df5edfd84 100644
--- a/corsika/framework/core/ParticleProperties.hpp
+++ b/corsika/framework/core/ParticleProperties.hpp
@@ -94,7 +94,7 @@ namespace corsika {
//! true iff the particle is a hard-coded nucleus or Code::Nucleus
bool constexpr is_nucleus(Code const);
bool constexpr is_hadron(Code const); //!< true iff particle is hadron
- bool constexpr is_em(Code const); //!< true iff particle is electron, positron or gamma
+ bool constexpr is_em(Code const); //!< true iff particle is electron, positron or photon
bool constexpr is_muon(Code const); //!< true iff particle is mu+ or mu-
bool constexpr is_neutrino(Code const); //!< true iff particle is (anti-) neutrino
int constexpr get_nucleus_A(
diff --git a/corsika/modules/LongitudinalProfile.hpp b/corsika/modules/LongitudinalProfile.hpp
index b06e2ef852541342f474881a0209a154cf85602e..5dc2729b4c3d2bcb78e6451f4268e25249c06827 100644
--- a/corsika/modules/LongitudinalProfile.hpp
+++ b/corsika/modules/LongitudinalProfile.hpp
@@ -57,7 +57,7 @@ namespace corsika {
ShowerAxis const& shower_axis_;
using ProfileEntry = std::array<uint32_t, 6>;
enum ProfileIndex {
- Gamma = 0,
+ Photon = 0,
Positron = 1,
Electron = 2,
MuPlus = 3,
diff --git a/corsika/modules/ParticleCut.hpp b/corsika/modules/ParticleCut.hpp
index 9842dd034530d7528e1359e63983d8adc85b25f0..11d8049d53e2b2ca817feaa16b7bfaea438ee70a 100644
--- a/corsika/modules/ParticleCut.hpp
+++ b/corsika/modules/ParticleCut.hpp
@@ -64,7 +64,7 @@ namespace corsika {
void reset();
HEPEnergyType getElectronECut() const { return get_energy_threshold(Code::Electron); }
- HEPEnergyType getPhotonECut() const { return get_energy_threshold(Code::Gamma); }
+ HEPEnergyType getPhotonECut() const { return get_energy_threshold(Code::Photon); }
HEPEnergyType getMuonECut() const { return get_energy_threshold(Code::MuPlus); }
HEPEnergyType getHadronECut() const { return get_energy_threshold(Code::Proton); }
HEPEnergyType getInvEnergy() const { return inv_energy_; }
diff --git a/corsika/modules/conex/CONEXhybrid.hpp b/corsika/modules/conex/CONEXhybrid.hpp
index 299f85cbda7ae0298002ae8213ae5c8065950735..659cbe95bda2b0635b15f909e0c3708195946c07 100644
--- a/corsika/modules/conex/CONEXhybrid.hpp
+++ b/corsika/modules/conex/CONEXhybrid.hpp
@@ -46,7 +46,7 @@ namespace corsika {
// data members
//! CONEX e.m. particle codes
static std::array<std::pair<Code, int>, 3> constexpr egs_em_codes_{
- {{Code::Gamma, 0}, {Code::Electron, -1}, {Code::Positron, -1}}};
+ {{Code::Photon, 0}, {Code::Electron, -1}, {Code::Positron, -1}}};
Point const center_; //!< center of CONEX Earth
ShowerAxis const& showerAxis_;
diff --git a/corsika/modules/energy_loss/Properties8.dat b/corsika/modules/energy_loss/Properties8.dat
index 377c3df7748acf71795e02277fbf6cb8c1905943..33cd4ab97c27e98abdf97ad4fafdd4c1b5edd22c 100644
--- a/corsika/modules/energy_loss/Properties8.dat
+++ b/corsika/modules/energy_loss/Properties8.dat
@@ -2280,8 +2280,8 @@ heavymet in ATLAS calorimeter
Note: Tungsten properties except for average Z/A used in calculations
----------------------------------------------------------------------------
280 Heavy 5 -1.0000000000 0.40915 1.9300E+01 1.9300E+01 S 3 1 1 M
- heavymet_in_Rochester_gamma_stop
-heavymet as Rochester gamma stop
+ heavymet_in_Rochester_photon_stop
+heavymet as Rochester photon stop
727.0 5.4059 0.2167 3.4960 0.15509 2.8447 0.14
28 1.000000 0.060000
29 0.615758 0.040000
diff --git a/corsika/modules/proposal/ContinuousProcess.hpp b/corsika/modules/proposal/ContinuousProcess.hpp
index 0efbf12ecd6100ae3e6cc7e9bc777cacb2f2dfcb..c8895c8aa752bcd3a3630d4876ace48578d232f3 100644
--- a/corsika/modules/proposal/ContinuousProcess.hpp
+++ b/corsika/modules/proposal/ContinuousProcess.hpp
@@ -24,7 +24,7 @@
namespace corsika::proposal {
//!
- //! Electro-magnetic and gamma continous losses produced by proposal. It makes
+ //! Electro-magnetic and photon continous losses produced by proposal. It makes
//! use of interpolation tables which are runtime intensive calculation, but can be
//! reused by setting the \param PROPOSAL::InterpolationDef::path_to_tables variable.
//!
diff --git a/corsika/modules/proposal/Interaction.hpp b/corsika/modules/proposal/Interaction.hpp
index c6a389b1e2dcfcbb5308dcd53b9dd7b33589ef00..b492862f0b091aea23251ba449821caa4a8faf54 100644
--- a/corsika/modules/proposal/Interaction.hpp
+++ b/corsika/modules/proposal/Interaction.hpp
@@ -24,7 +24,7 @@
namespace corsika::proposal {
//!
- //! Electro-magnetic and gamma stochastic losses produced by proposal. It makes
+ //! Electro-magnetic and photon stochastic losses produced by proposal. It makes
//! use of interpolation tables which are runtime intensive calculation, but can be
//! reused by setting the \param PROPOSAL::InterpolationDef::path_to_tables variable.
//!
diff --git a/corsika/modules/proposal/ProposalProcessBase.hpp b/corsika/modules/proposal/ProposalProcessBase.hpp
index cedad07efa87d7266764ebd61d9b808983e68de5..bb9e3b721c84d57fcaa8956042fbea99a221d91f 100644
--- a/corsika/modules/proposal/ProposalProcessBase.hpp
+++ b/corsika/modules/proposal/ProposalProcessBase.hpp
@@ -24,7 +24,7 @@ namespace corsika::proposal {
//! propagated and decayed if they decays.
//!
static constexpr std::array<Code, 7> tracked{
- Code::Gamma, Code::Electron, Code::Positron, Code::MuMinus,
+ Code::Photon, Code::Electron, Code::Positron, Code::MuMinus,
Code::MuPlus, Code::TauPlus, Code::TauMinus,
};
@@ -34,7 +34,7 @@ namespace corsika::proposal {
//! particles may be created by reading out the Corsica constants.
//!
static std::map<Code, PROPOSAL::ParticleDef> particle = {
- {Code::Gamma, PROPOSAL::GammaDef()}, {Code::Electron, PROPOSAL::EMinusDef()},
+ {Code::Photon, PROPOSAL::GammaDef()}, {Code::Electron, PROPOSAL::EMinusDef()},
{Code::Positron, PROPOSAL::EPlusDef()}, {Code::MuMinus, PROPOSAL::MuMinusDef()},
{Code::MuPlus, PROPOSAL::MuPlusDef()}, {Code::TauMinus, PROPOSAL::TauMinusDef()},
{Code::TauPlus, PROPOSAL::TauPlusDef()}};
@@ -62,7 +62,7 @@ namespace corsika::proposal {
static std::map<Code, std::function<PROPOSAL::crosssection_list_t<PROPOSAL::ParticleDef,
PROPOSAL::Medium>(
PROPOSAL::Medium&, corsika::units::si::HEPEnergyType)>>
- cross = {{Code::Gamma, cross_builder<PROPOSAL::GammaDef>},
+ cross = {{Code::Photon, cross_builder<PROPOSAL::GammaDef>},
{Code::Electron, cross_builder<PROPOSAL::EMinusDef>},
{Code::Positron, cross_builder<PROPOSAL::EPlusDef>},
{Code::MuMinus, cross_builder<PROPOSAL::MuMinusDef>},
diff --git a/examples/em_shower.cpp b/examples/em_shower.cpp
index 9634b18703905b104b7c882139972d36125cc0f4..606d72b41cf10445d62bb3d769e1465e90a2068b 100644
--- a/examples/em_shower.cpp
+++ b/examples/em_shower.cpp
@@ -151,7 +151,7 @@ int main(int argc, char** argv) {
TrackWriter trackWriter;
output.add("tracks", trackWriter); // register TrackWriter
- // long. profile; columns for gamma, e+, e- still need to be added
+ // long. profile; columns for photon, e+, e- still need to be added
LongitudinalProfile longprof{showerAxis};
Plane const obsPlane(showerCore, DirectionVector(rootCS, {0., 0., 1.}));
diff --git a/src/framework/core/ParticleClassNames.xml b/src/framework/core/ParticleClassNames.xml
index 1a8e249ea63186e80d59d433dd218ab3ea4c8039..ba7ba530da5b5d046f8b928f97ab521ed765bdf5 100644
--- a/src/framework/core/ParticleClassNames.xml
+++ b/src/framework/core/ParticleClassNames.xml
@@ -1,13 +1,19 @@
<chapter name="Particle Names">
<!-- For selected particles it is possible to specify the C++ class
- names for a specific unique PDG code -->
+ names "classname" for a specific unique PDG codes
+
+ This overwrites the default from Pythia8 ParticleData.xml
+
+ If needed, also the text-output form for particles
+ can be changed using "name"
+ -->
<particle pdgID="0" classname="Unknown"/> <!-- VOID in Pythia8 -->
<particle pdgID="11" classname="Electron"/>
<particle pdgID="-11" classname="Positron"/>
- <particle pdgID="22" classname="Gamma"/>
+ <particle pdgID="22" classname="Photon" name="photon"/>
<particle pdgID="130" classname="K0Long"/>
<particle pdgID="310" classname="K0Short"/>
diff --git a/src/framework/core/pdxml_reader.py b/src/framework/core/pdxml_reader.py
index a099dc427ff835ee6bad75bdd5169513ea100d05..d8809a004f5e21690aa37acbea1712da714a2c87 100755
--- a/src/framework/core/pdxml_reader.py
+++ b/src/framework/core/pdxml_reader.py
@@ -1,6 +1,11 @@
#!/usr/bin/env python3
-import sys, math, itertools, re, csv, pprint
+import sys
+import math
+import itertools
+import re
+import csv
+import pprint
import xml.etree.ElementTree as ET
from collections import OrderedDict
import pickle
@@ -9,58 +14,62 @@ import io
GeVfm = 0.19732696312541853
c_speed_of_light = 29.9792458e10 # mm / s
# for nuclear masses
-mneutron = 0.9395654133 # GeV
-mproton = 0.9382720813 # GeV
+mneutron = 0.9395654133 # GeV
+mproton = 0.9382720813 # GeV
namespace = "corsika"
##############################################################
-#
+#
# reading xml input data, return line by line particle data
-#
+#
+
+
def parsePythia(filename):
tree = ET.parse(filename)
root = tree.getroot()
-
+
for particle in root.iter("particle"):
- name = particle.attrib["name"]
+ name = particle.attrib["name"]
antiName = "Unknown"
if ("antiName" in particle.attrib):
antiName = particle.attrib["antiName"]
pdg_id = int(particle.attrib["id"])
mass = float(particle.attrib["m0"]) # GeV
- electric_charge = int(particle.attrib["chargeType"]) # in units of e/3
+ electric_charge = int(particle.attrib["chargeType"]) # in units of e/3
ctau = 0.
if pdg_id in (11, 12, 14, 16, 22, 2212): # these are the stable particles !
ctau = float('Inf')
elif 'tau0' in particle.attrib:
ctau = float(particle.attrib['tau0']) # mm / c
elif 'mWidth' in particle.attrib:
- ctau = GeVfm / float(particle.attrib['mWidth']) * 1e-15 * 1000.0 # mm / s
- elif pdg_id in (0, 423, 433, 4312, 4322, 5112, 5222): # those are certainly not stable....
+ ctau = GeVfm / \
+ float(particle.attrib['mWidth']) * 1e-15 * 1000.0 # mm / s
+ # those are certainly not stable....
+ elif pdg_id in (0, 423, 433, 4312, 4322, 5112, 5222):
ctau = 0.
else:
- print ("missing lifetime: " + str(pdg_id) + " " + str(name))
+ print("missing lifetime: " + str(pdg_id) + " " + str(name))
sys.exit(1)
-
+
yield (pdg_id, name, mass, electric_charge, antiName, ctau/c_speed_of_light)
-
+
# TODO: read decay channels from child elements
-
+
if "antiName" in particle.attrib:
yield (-pdg_id, antiName, mass, -electric_charge, name, ctau/c_speed_of_light)
##############################################################
-#
+#
# reading xml input data, return line by line particle data
-#
+#
def parseNuclei(filename):
tree = ET.parse(filename)
root = tree.getroot()
-
+
for particle in root.iter("particle"):
- name = particle.attrib["name"]
+ name = particle.attrib["name"]
antiName = "Unknown"
if ("antiName" in particle.attrib):
antiName = particle.attrib["antiName"]
@@ -69,47 +78,53 @@ def parseNuclei(filename):
Z = int(particle.attrib["Z"])
# mass in GeV
if ("mass" in particle.attrib):
- mass = particle.attrib["mass"]
+ mass = particle.attrib["mass"]
else:
mass = (A-Z)*mneutron + Z*mproton
- electric_charge = Z*3 # in units of e/3
+ electric_charge = Z*3 # in units of e/3
ctau = float('Inf')
-
+
yield (pdg_id, name, mass, electric_charge, antiName, ctau/c_speed_of_light, A, Z)
-
-
+
##############################################################
-#
+#
# returns dict with particle codes and class names
-#
-def class_names(filename):
+#
+def read_class_names(filename):
tree = ET.parse(filename)
root = tree.getroot()
map = {}
-
+
for particle in root.iter("particle"):
- name = particle.attrib["classname"]
+ classname = None
+ name = None
+ if ("classname" in particle.attrib):
+ classname = particle.attrib["classname"]
+ if ("name" in particle.attrib):
+ name = particle.attrib["name"]
pdg_id = int(particle.attrib["pdgID"])
- map[pdg_id] = name
-
+ map[pdg_id] = {"classname": classname, "name": name}
+
return map
##############################################################
-#
+#
# Automatically produce a string qualifying as C++ class name
-#
+#
# This function produces names of type "DeltaPlusPlus"
-#
+#
+
+
def c_identifier_camel(name):
orig = name
- name = name[0].upper() + name[1:].lower() # all lower case
-
- for c in "() /": # replace funny characters
+ name = name[0].upper() + name[1:].lower() # all lower case
+
+ for c in "() /": # replace funny characters
name = name.replace(c, "_")
-
+
name = name.replace("bar", "Bar")
name = name.replace("*", "Star")
name = name.replace("'", "Prime")
@@ -120,7 +135,7 @@ def c_identifier_camel(name):
ibar = name.find('Bar')
if ibar > 0 and ibar < len(name)-3:
name = name[:ibar] + name[ibar+3:] + 'Bar'
-
+
# cleanup "_"s
while True:
tmp = name.replace("__", "_")
@@ -153,93 +168,99 @@ def c_identifier_camel(name):
if pattern.match(name):
return name
else:
- raise Exception("could not generate C identifier for '{:s}': result '{:s}'".format(orig, name))
+ raise Exception(
+ "could not generate C identifier for '{:s}': result '{:s}'".format(orig, name))
-
##########################################################
-#
+#
# returns dict containing all data from pythia-xml input
-#
-def read_pythia_db(filename, particle_db, classnames):
-
+#
+def read_pythia_db(filename, particle_db, classnames):
+
counter = itertools.count(len(particle_db))
-
+
for (pdg, name, mass, electric_charge, antiName, lifetime) in parsePythia(filename):
c_id = "Unknown"
- if pdg in classnames:
- c_id = classnames[pdg]
+ if pdg in classnames and classnames[pdg]["classname"] != None:
+ c_id = classnames[pdg]["classname"]
else:
- c_id = c_identifier_camel(name) # the camel case names
+ c_id = c_identifier_camel(name) # the camel case names
- hadron =abs(pdg) > 100
+ if pdg in classnames and classnames[pdg]["name"] != None:
+ name = classnames[pdg]["name"]
+
+ hadron = abs(pdg) > 100
if c_id in particle_db.keys():
- raise RuntimeError("particle '{:s}' already known (new PDG id {:d}, stored PDG id: {:d})".format(c_id, pdg, particle_db[c_id]['pdg']))
-
+ raise RuntimeError("particle '{:s}' already known (new PDG id {:d}, stored PDG id: {:d})".format(
+ c_id, pdg, particle_db[c_id]['pdg']))
+
particle_db[c_id] = {
- "name" : name,
- "antiName" : antiName,
- "pdg" : pdg,
- "mass" : mass, # in GeV
- "electric_charge" : electric_charge, # in e/3
- "lifetime" : lifetime,
- "ngc_code" : next(counter),
- "isNucleus" : False,
- "isHadron" : hadron,
+ "name": name,
+ "antiName": antiName,
+ "pdg": pdg,
+ "mass": mass, # in GeV
+ "electric_charge": electric_charge, # in e/3
+ "lifetime": lifetime,
+ "ngc_code": next(counter),
+ "isNucleus": False,
+ "isHadron": hadron,
}
-
+
return particle_db
-
##########################################################
-#
+#
# returns dict containing all data from pythia-xml input
-#
-def read_nuclei_db(filename, particle_db, classnames):
-
+#
+def read_nuclei_db(filename, particle_db, classnames):
+
counter = itertools.count(len(particle_db))
for (pdg, name, mass, electric_charge, antiName, lifetime, A, Z) in parseNuclei(filename):
-
+
c_id = "Unknown"
- if pdg in classnames:
- c_id = classnames[pdg]
+ if pdg in classnames and classnames[pdg]["classname"]:
+ c_id = classnames[pdg]["classname"]
else:
c_id = c_identifier_camel(name)
+ if pdg in classnames and classnames[pdg]["name"] != None:
+ name = classnames[pdg]["name"]
+
particle_db[c_id] = {
- "name" : name,
- "antiName" : antiName,
- "pdg" : pdg,
- "mass" : mass, # in GeV
- "electric_charge" : electric_charge, # in e/3
- "lifetime" : lifetime,
- "ngc_code" : next(counter),
- "A" : A,
- "Z" : Z,
- "isNucleus" : True,
- "isHadron" : True,
+ "name": name,
+ "antiName": antiName,
+ "pdg": pdg,
+ "mass": mass, # in GeV
+ "electric_charge": electric_charge, # in e/3
+ "lifetime": lifetime,
+ "ngc_code": next(counter),
+ "A": A,
+ "Z": Z,
+ "isNucleus": True,
+ "isHadron": True,
}
-
+
return particle_db
###############################################################
-#
+#
# build conversion table PDG -> ngc
-#
+#
def gen_conversion_PDG_ngc(particle_db):
# todo: find a optimum value, think about cache miss with array vs lookup time with map
- P_MAX = 500 # the maximum PDG code that is still filled into the table
-
+ P_MAX = 500 # the maximum PDG code that is still filled into the table
+
conversionDict = dict()
conversionTable = [None] * (2*P_MAX + 1)
for cId, p in particle_db.items():
pdg = p['pdg']
-
+
if abs(pdg) < P_MAX:
if conversionTable[pdg + P_MAX]:
raise Exception("table entry already occupied")
@@ -250,93 +271,98 @@ def gen_conversion_PDG_ngc(particle_db):
raise Exception(f"map entry {pdg} already occupied")
else:
conversionDict[pdg] = cId
-
+
output = io.StringIO()
+
def oprint(*args, **kwargs):
print(*args, **kwargs, file=output)
-
- oprint(f"static std::array<Code, {len(conversionTable)}> constexpr conversionArray {{")
+
+ oprint(
+ f"static std::array<Code, {len(conversionTable)}> constexpr conversionArray {{")
for ngc in conversionTable:
oprint(" Code::{0},".format(ngc if ngc else "Unknown"))
oprint("};")
oprint()
-
+
oprint("static std::map<PDGCode, Code> const conversionMap {")
for ngc in conversionDict.values():
oprint(f" {{PDGCode::{ngc}, Code::{ngc}}},")
oprint("};")
oprint()
-
+
return output.getvalue()
###############################################################
-#
+#
# return string with enum of all internal particle codes
-#
+#
def gen_internal_enum(particle_db):
- string = ("//! @cond EXCLUDE_DOXY\n"
- "enum class Code : CodeIntType {\n"
- " FirstParticle = 1, // if you want to loop over particles, you want to start with \"1\" \n") # identifier for eventual loops...
-
-
+ string = ("//! @cond EXCLUDE_DOXY\n"
+ "enum class Code : CodeIntType {\n"
+ " FirstParticle = 1, // if you want to loop over particles, you want to start with \"1\" \n") # identifier for eventual loops...
+
for k in filter(lambda k: "ngc_code" in particle_db[k], particle_db):
last_ngc_id = particle_db[k]['ngc_code']
- string += " {key:s} = {code:d},\n".format(key = k, code = last_ngc_id)
+ string += " {key:s} = {code:d},\n".format(key=k, code=last_ngc_id)
- string += (" LastParticle = {:d},\n" # identifier for eventual loops...
+ string += (" LastParticle = {:d},\n" # identifier for eventual loops...
"}}; //! @endcond").format(last_ngc_id + 1)
-
- if last_ngc_id > 0x7fff: # does not fit into int16_t
- raise Exception("Integer overflow in internal particle code definition prevented!")
-
+
+ if last_ngc_id > 0x7fff: # does not fit into int16_t
+ raise Exception(
+ "Integer overflow in internal particle code definition prevented!")
+
return string
###############################################################
-#
+#
# return string with enum of all PDG particle codes
-#
+#
def gen_pdg_enum(particle_db):
- string = ("//! @cond EXCLUDE_DOXY\n"
+ string = ("//! @cond EXCLUDE_DOXY\n"
"enum class PDGCode : PDGCodeType {\n")
-
+
for cId in particle_db:
pdgCode = particle_db[cId]['pdg']
- string += " {key:s} = {code:d},\n".format(key = cId, code = pdgCode)
+ string += " {key:s} = {code:d},\n".format(key=cId, code=pdgCode)
string += " }; //! @endcond \n"
-
+
return string
###############################################################
-#
-# return string with all data arrays
-#
+#
+# return string with all data arrays
+#
def gen_properties(particle_db):
# number of particles, size of tables
- string = "static constexpr std::size_t size = {size:d};\n".format(size = len(particle_db))
+ string = "static constexpr std::size_t size = {size:d};\n".format(
+ size=len(particle_db))
string += "\n"
# all particle initializer_list
string += "constexpr std::initializer_list<Code> all_particles = {"
- for k in particle_db:
- string += " Code::{name:s},\n".format(name = k)
+ for k in particle_db:
+ string += " Code::{name:s},\n".format(name=k)
string += "};\n"
string += "\n"
-
+
# particle masses table
- string += "static constexpr std::array<corsika::units::si::HEPMassType const, size> masses = {\n"
+ string += "static constexpr std::array<corsika::units::si::HEPMassType const, size> masses = {\n"
for p in particle_db.values():
- string += " {mass:e} * 1e9 * corsika::units::si::electronvolt, // {name:s}\n".format(mass = p['mass'], name = p['name'])
+ string += " {mass:e} * 1e9 * corsika::units::si::electronvolt, // {name:s}\n".format(
+ mass=p['mass'], name=p['name'])
string += "};\n\n"
# particle threshold table, initially set to the particle mass
- string += "static std::array<corsika::units::si::HEPEnergyType, size> thresholds = {\n"
+ string += "static std::array<corsika::units::si::HEPEnergyType, size> thresholds = {\n"
for p in particle_db.values():
- string += " {mass:e} * 1e9 * corsika::units::si::electronvolt, // {name:s}\n".format(mass = p['mass'], name = p['name'])
+ string += " {mass:e} * 1e9 * corsika::units::si::electronvolt, // {name:s}\n".format(
+ mass=p['mass'], name=p['name'])
string += "};\n\n"
# PDG code table
@@ -344,17 +370,17 @@ def gen_properties(particle_db):
for p in particle_db.keys():
string += f" PDGCode::{p},\n"
string += "};\n"
-
+
# name string table
string += "static constexpr std::array<std::string_view, size> names = {\n"
for p in particle_db.values():
- string += " \"{name:s}\",\n".format(name = p['name'])
+ string += " \"{name:s}\",\n".format(name=p['name'])
string += "};\n"
-
+
# electric charges table
string += "static constexpr std::array<int16_t, size> electric_charges = {\n"
for p in particle_db.values():
- string += " {charge:d},\n".format(charge = p['electric_charge'] // 3)
+ string += " {charge:d},\n".format(charge=p['electric_charge'] // 3)
string += "};\n"
# anti-particle table
@@ -367,52 +393,52 @@ def gen_properties(particle_db):
#string += "static constexpr std::array<corsika::units::si::TimeType const, size> lifetime = {\n"
string += "static constexpr std::array<double const, size> lifetime = {\n"
for p in particle_db.values():
- if p['lifetime'] == float("Inf") :
- string += " std::numeric_limits<double>::infinity(), \n" # * corsika::units::si::second, \n"
- else :
- string += " {tau:e}, \n".format(tau = p['lifetime'])
+ if p['lifetime'] == float("Inf"):
+ # * corsika::units::si::second, \n"
+ string += " std::numeric_limits<double>::infinity(), \n"
+ else:
+ string += " {tau:e}, \n".format(tau=p['lifetime'])
#string += " {tau:e} * corsika::units::si::second, \n".format(tau = p['lifetime'])
string += "};\n"
-
+
# is Hadron flag
string += "static constexpr std::array<bool, size> isHadron = {\n"
for p in particle_db.values():
value = 'false'
if p['isHadron']:
value = 'true'
- string += " {val},\n".format(val = value)
+ string += " {val},\n".format(val=value)
string += "};\n"
-
### nuclear data ###
-
+
# nucleus mass number A
string += "static constexpr std::array<int16_t, size> nucleusA = {\n"
for p in particle_db.values():
A = p.get('A', 0)
- string += " {val},\n".format(val = A)
+ string += " {val},\n".format(val=A)
string += "};\n"
-
+
# nucleus charge number Z
string += "static constexpr std::array<int16_t, size> nucleusZ = {\n"
for p in particle_db.values():
Z = p.get('Z', 0)
- string += " {val},\n".format(val = Z)
+ string += " {val},\n".format(val=Z)
string += "};\n"
return string
###############################################################
-#
+#
# return string with a list of classes for all particles
-#
+#
def gen_classes(particle_db):
string = ("// list of C++ classes to access particle properties\n"
"/** @defgroup ParticleClasses \n"
" @{ */\n")
-
+
for cname in particle_db:
if cname == "Nucleus":
string += "// skipping Nucleus"
@@ -423,18 +449,19 @@ def gen_classes(particle_db):
if (particle_db[cname_anti]['name'] == particle_db[cname]['antiName']):
antiP = cname_anti
break
-
+
string += "\n"
string += "/** @class " + cname + "\n\n"
string += " * Particle properties are taken from the PYTHIA8 ParticleData.xml file:<br>\n"
- string += " * - pdg=" + str(particle_db[cname]['pdg']) +"\n"
+ string += " * - pdg=" + str(particle_db[cname]['pdg']) + "\n"
string += " * - mass=" + str(particle_db[cname]['mass']) + " GeV \n"
- string += " * - charge= " + str(particle_db[cname]['electric_charge'] // 3) + " \n"
+ string += " * - charge= " + \
+ str(particle_db[cname]['electric_charge'] // 3) + " \n"
string += " * - name=" + str(cname) + "\n"
string += " * - anti=" + str(antiP) + "\n"
if (particle_db[cname]['isNucleus']):
string += " * - nuclear A=" + str(particle_db[cname]['A']) + "\n"
- string += " * - nuclear Z=" + str(particle_db[cname]['Z']) + "\n"
+ string += " * - nuclear Z=" + str(particle_db[cname]['Z']) + "\n"
string += "*/\n\n"
string += "class " + cname + " {\n"
string += " /** @cond EXCLUDE_DOXY */ \n"
@@ -455,14 +482,14 @@ def gen_classes(particle_db):
string += " /** @endcond */ \n"
string += "};\n"
- string += " //! @}\n";
+ string += " //! @}\n"
return string
###############################################################
-#
-#
+#
+#
def inc_start():
string = ('// generated by pdxml_reader.py\n'
'// MANUAL EDITS ON OWN RISK. THEY WILL BE OVERWRITTEN. \n'
@@ -476,8 +503,8 @@ def inc_start():
###############################################################
-#
-#
+#
+#
def detail_start():
string = ('/** @cond EXCLUDE_DOXY */\n'
' namespace particle::detail {\n\n')
@@ -485,45 +512,48 @@ def detail_start():
###############################################################
-#
-#
+#
+#
def detail_end():
string = "\n}//end namespace particle::detail\n /** @endcond */"
return string
###############################################################
-#
-#
+#
+#
+
+
def inc_end():
string = "/** @} */\n} // end namespace corsika"
return string
###################################################################
-#
-# Serialize particle_db into file
-#
+#
+# Serialize particle_db into file
+#
def serialize_particle_db(particle_db, file):
pickle.dump(particle_db, file)
-
+
###################################################################
-#
+#
# Main function
-#
+#
if __name__ == "__main__":
-
+
if len(sys.argv) != 4:
- print("usage: {:s} <Pythia8.xml> <Nuclei.xml> <ClassNames.xml>".format(sys.argv[0]), file=sys.stderr)
+ print("usage: {:s} <ParticleData.xml> <NuclearData.xml> <ParticleClassNames.xml>".format(
+ sys.argv[0]), file=sys.stderr)
sys.exit(1)
-
+
print("\n pdxml_reader.py: automatically produce particle properties from input files\n")
-
- names = class_names(sys.argv[3])
+
+ names = read_class_names(sys.argv[3])
particle_db = OrderedDict()
read_pythia_db(sys.argv[1], particle_db, names)
read_nuclei_db(sys.argv[2], particle_db, names)
-
+
with open("GeneratedParticleProperties.inc", "w") as f:
print(inc_start(), file=f)
print(gen_internal_enum(particle_db), file=f)
@@ -531,14 +561,13 @@ if __name__ == "__main__":
print(detail_start(), file=f)
print(gen_properties(particle_db), file=f)
print(gen_conversion_PDG_ngc(particle_db), file=f)
- print(detail_end(), file=f)
+ print(detail_end(), file=f)
print(inc_end(), file=f)
with open("GeneratedParticleClasses.inc", "w") as f:
print(inc_start(), file=f)
print(gen_classes(particle_db), file=f)
print(inc_end(), file=f)
-
+
with open("particle_db.pkl", "wb") as f:
serialize_particle_db(particle_db, f)
-
diff --git a/src/modules/sibyll/sibyll_codes.dat b/src/modules/sibyll/sibyll_codes.dat
index d8cce42e494585023d460a0a50635a12d44139fd..a445af00da01c6b596f78c7dd1b7f514adae115c 100644
--- a/src/modules/sibyll/sibyll_codes.dat
+++ b/src/modules/sibyll/sibyll_codes.dat
@@ -19,7 +19,7 @@ TauMinus 91 0 CannotInteract
TauPlus 90 0 CannotInteract
NuTau 92 0 CannotInteract
NuTauBar 93 0 CannotInteract
-Gamma 1 0 CannotInteract
+Photon 1 0 CannotInteract
Pi0 6 1 Pion
# rho0 could interact but sibyll has no cross section/interaction length. was used for gamma had int
Rho0 27 0 CannotInteract
diff --git a/tests/framework/testParticles.cpp b/tests/framework/testParticles.cpp
index d8c71e6e787ce465d367c29dfa5d06b0b2a51faf..c35f8bca97982e2d2388ab122cfad22269dd4960 100644
--- a/tests/framework/testParticles.cpp
+++ b/tests/framework/testParticles.cpp
@@ -23,13 +23,15 @@ TEST_CASE("ParticleProperties", "[Particles]") {
CHECK(Positron::code == Code::Positron);
CHECK(Proton::code == Code::Proton);
CHECK(Neutron::code == Code::Neutron);
- CHECK(Gamma::code == Code::Gamma);
+ CHECK(Photon::code == Code::Photon);
CHECK(PiPlus::code == Code::PiPlus);
}
SECTION("Masses") {
CHECK(Electron::mass / (511_keV) == Approx(1));
CHECK(Electron::mass / get_mass(Code::Electron) == 1.);
+ CHECK(Photon::mass / (1_eV) == 0.);
+ CHECK(Photon::mass == get_mass(Code::Photon));
CHECK((Proton::mass + Neutron::mass) / constants::nucleonMass == Approx(2));
}
@@ -38,6 +40,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
CHECK(Electron::charge / constants::e == Approx(-1));
CHECK(Positron::charge / constants::e == Approx(+1));
CHECK(get_charge(Positron::anti_code) / constants::e == Approx(-1));
+ CHECK(Photon::charge / constants::e == 0.);
}
SECTION("Names") {
@@ -45,6 +48,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
CHECK(get_name(Code::Electron) == "e-");
CHECK(PiMinus::name == "pi-");
CHECK(Iron::name == "iron");
+ CHECK(Photon::name == "photon");
}
SECTION("PDG") {
@@ -53,12 +57,14 @@ TEST_CASE("ParticleProperties", "[Particles]") {
CHECK(get_PDG(Code::NuMu) == PDGCode::NuMu);
CHECK(get_PDG(Code::NuE) == PDGCode::NuE);
CHECK(get_PDG(Code::MuMinus) == PDGCode::MuMinus);
+ CHECK(get_PDG(Code::Photon) == PDGCode::Photon);
CHECK(static_cast<int>(get_PDG(Code::PiPlus)) == 211);
CHECK(static_cast<int>(get_PDG(Code::DPlus)) == 411);
CHECK(static_cast<int>(get_PDG(Code::NuMu)) == 14);
CHECK(static_cast<int>(get_PDG(Code::NuEBar)) == -12);
CHECK(static_cast<int>(get_PDG(Code::MuMinus)) == 13);
+ CHECK(static_cast<int>(get_PDG(Code::Photon)) == 22);
}
SECTION("Conversion PDG -> internal") {
@@ -70,7 +76,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
SECTION("Lifetimes") {
CHECK(get_lifetime(Code::Electron) ==
std::numeric_limits<double>::infinity() * si::second);
- CHECK(get_lifetime(Code::DPlus) < get_lifetime(Code::Gamma));
+ CHECK(get_lifetime(Code::DPlus) < get_lifetime(Code::Photon));
CHECK(get_lifetime(Code::RhoPlus) / si::second ==
(Approx(4.414566727909413e-24).epsilon(1e-3)));
CHECK(get_lifetime(Code::SigmaMinusBar) / si::second ==
@@ -89,7 +95,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
}
SECTION("Particle groups: electromagnetic") {
- CHECK(is_em(Code::Gamma));
+ CHECK(is_em(Code::Photon));
CHECK(is_em(Code::Electron));
CHECK_FALSE(is_em(Code::MuPlus));
CHECK_FALSE(is_em(Code::NuE));
@@ -99,7 +105,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
}
SECTION("Particle groups: hadrons") {
- CHECK_FALSE(is_hadron(Code::Gamma));
+ CHECK_FALSE(is_hadron(Code::Photon));
CHECK_FALSE(is_hadron(Code::Electron));
CHECK_FALSE(is_hadron(Code::MuPlus));
CHECK_FALSE(is_hadron(Code::NuE));
@@ -110,7 +116,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
}
SECTION("Particle groups: muons") {
- CHECK_FALSE(is_muon(Code::Gamma));
+ CHECK_FALSE(is_muon(Code::Photon));
CHECK_FALSE(is_muon(Code::Electron));
CHECK(is_muon(Code::MuPlus));
CHECK(is_muon(Code::MuMinus));
@@ -121,7 +127,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
}
SECTION("Particle groups: neutrinos") {
- CHECK_FALSE(is_neutrino(Code::Gamma));
+ CHECK_FALSE(is_neutrino(Code::Photon));
CHECK_FALSE(is_neutrino(Code::Electron));
CHECK_FALSE(is_neutrino(Code::MuPlus));
CHECK_FALSE(is_neutrino(Code::Proton));
@@ -137,7 +143,7 @@ TEST_CASE("ParticleProperties", "[Particles]") {
}
SECTION("Nuclei") {
- CHECK_FALSE(is_nucleus(Code::Gamma));
+ CHECK_FALSE(is_nucleus(Code::Photon));
CHECK(is_nucleus(Code::Argon));
CHECK_FALSE(is_nucleus(Code::Proton));
CHECK(is_nucleus(Code::Hydrogen));
diff --git a/tests/modules/conex_output_REF.txt b/tests/modules/conex_output_REF.txt
index c609d74bdfa35897498dd1ba46e68a502079ee78..4baf00f45acc24b110f655fed1f1432fda694a42 100644
--- a/tests/modules/conex_output_REF.txt
+++ b/tests/modules/conex_output_REF.txt
@@ -1,4 +1,4 @@
-# X N dEdX Mu dMu Gamma El Had
+# X N dEdX Mu dMu Photon El Had
0.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
10.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
20.00 0.00 0.00 0.00 0.00 0.00 0.00 0.00
diff --git a/tests/modules/testCONEX.cpp b/tests/modules/testCONEX.cpp
index 2128e0a47a14141bcede691721a6dfea2da32d68..63ca1fd573b3e7e2d0bbfff907d75ea609c7f6f2 100644
--- a/tests/modules/testCONEX.cpp
+++ b/tests/modules/testCONEX.cpp
@@ -109,7 +109,7 @@ TEST_CASE("CONEXSourceCut") {
conex.addParticle(Code::Proton, Eem, 0_eV, emPosition, momentum.normalized(), 0_s);
// supperimpose a photon
auto const momentumPhoton = showerAxis.getDirection() * 1_TeV;
- conex.addParticle(Code::Gamma, 1_TeV, 0_eV, emPosition, momentumPhoton.normalized(),
+ conex.addParticle(Code::Photon, 1_TeV, 0_eV, emPosition, momentumPhoton.normalized(),
0_s);
conex.solveCE();
}
diff --git a/tests/modules/testOnShellCheck.cpp b/tests/modules/testOnShellCheck.cpp
index e28c5ffcd03a2d9eba64a890f5009ba9c9f18fb3..799049f29d94dd56d1cd1518bbf40029ead4a818 100644
--- a/tests/modules/testOnShellCheck.cpp
+++ b/tests/modules/testOnShellCheck.cpp
@@ -38,7 +38,7 @@ TEST_CASE("OnShellCheck", "[processes]") {
const HEPEnergyType E = 10_GeV;
// list of arbitrary particles
std::array const particleList{Code::PiPlus, Code::PiMinus, Code::Helium,
- Code::Gamma, Code::Electron, Code::MuPlus};
+ Code::Photon, Code::Electron, Code::MuPlus};
std::array const mass_shifts{1.1, 1.001, 1.0, 1.0, 1.01, 1.0};
diff --git a/tests/modules/testParticleCut.cpp b/tests/modules/testParticleCut.cpp
index 0a2388772f960667cf99f7431089e5938ae1f66b..ab47527d80a254975e2585d6a8a356ebf7a1a420 100644
--- a/tests/modules/testParticleCut.cpp
+++ b/tests/modules/testParticleCut.cpp
@@ -148,8 +148,9 @@ TEST_CASE("ParticleCut", "processes") {
// only this way the secondary view is populated
auto projectile = view.getProjectile();
// add secondaries
- projectile.addSecondary(std::make_tuple(
- Code::Gamma, 3_MeV, MomentumVector(rootCS, {0_GeV, 0_GeV, 0_GeV}), point0, 0_ns));
+ projectile.addSecondary(std::make_tuple(Code::Photon, 3_MeV,
+ MomentumVector(rootCS, {0_GeV, 0_GeV, 0_GeV}),
+ point0, 0_ns));
projectile.addSecondary(std::make_tuple(Code::Electron, 3_MeV,
MomentumVector(rootCS, {0_GeV, 0_GeV, 0_GeV}),
point0, 0_ns));
diff --git a/tests/modules/testTracking.cpp b/tests/modules/testTracking.cpp
index b8574124227f477d5b2dfda969b10c4110585e95..3c9882f36b6318f78c8754f9fc7d3ac21a034111 100644
--- a/tests/modules/testTracking.cpp
+++ b/tests/modules/testTracking.cpp
@@ -69,7 +69,7 @@ TEMPLATE_TEST_CASE("Tracking", "tracking", tracking_leapfrog_curved::Tracking,
const HEPEnergyType P0 = 10_GeV;
- auto PID = GENERATE(as<Code>{}, Code::MuPlus, Code::MuPlus, Code::Gamma);
+ auto PID = GENERATE(as<Code>{}, Code::MuPlus, Code::MuPlus, Code::Photon);
// for algorithms that know magnetic deflections choose: +-50uT, 0uT
// otherwise just 0uT
auto Bfield = GENERATE(filter(
@@ -301,7 +301,7 @@ TEMPLATE_TEST_CASE("TrackingPlane", "plane", tracking_leapfrog_curved::Tracking,
const HEPEnergyType P0 = 10_GeV;
- auto PID = GENERATE(as<Code>{}, Code::MuPlus, Code::MuPlus, Code::Gamma);
+ auto PID = GENERATE(as<Code>{}, Code::MuPlus, Code::MuPlus, Code::Photon);
// for algorithms that know magnetic deflections choose: +-50uT, 0uT
// otherwise just 0uT
auto Bfield = GENERATE(filter(