Merge branch 'improvements' into 'master'

Improvements

See merge request !134

Environment/NuclearComposition.h

@@ -64,9 +64,13 @@ namespace corsika::environment {
         , fComponents(pComponents)
         , fAvgMassNumber(std::inner_product(
               pComponents.cbegin(), pComponents.cend(), pFractions.cbegin(), 0.,
-              [](double x, double y) { return x + y; },
-              [](auto const& compID, auto const& fraction) {
-                return corsika::particles::GetNucleusA(compID) * fraction;
+              std::plus<double>(), [](auto const compID, auto const fraction) -> double {
+                if (particles::IsNucleus(compID)) {
+                  return particles::GetNucleusA(compID) * fraction;
+                } else {
+                  return particles::GetMass(compID) /
+                         units::si::ConvertSIToHEP(units::constants::u) * fraction;
+                }
               })) {
       assert(pComponents.size() == pFractions.size());
       auto const sumFractions =

Framework/Particles/ParticleProperties.h

@@ -93,7 +93,7 @@ namespace corsika::particles {
   corsika::units::si::ElectricChargeType constexpr GetCharge(Code const p) {
     if (p == Code::Nucleus)
       throw std::runtime_error("Cannot GetCharge() of particle::Nucleus -> unspecified");
-    return GetChargeNumber(p) * (corsika::units::constants::e);
+    return GetChargeNumber(p) * corsika::units::constants::e;
   }
 
   constexpr std::string const& GetName(Code const p) {
@@ -119,10 +119,6 @@ namespace corsika::particles {
            c == Code::NuMuBar || c == Code::NuTauBar;
   }
 
-  bool constexpr IsNucleus(Code const p) {
-    return detail::isNucleus[static_cast<CodeIntType>(p)];
-  }
-
   int constexpr GetNucleusA(Code const p) {
     return detail::nucleusA[static_cast<CodeIntType>(p)];
   }
@@ -131,11 +127,13 @@ namespace corsika::particles {
     return detail::nucleusZ[static_cast<CodeIntType>(p)];
   }
 
+  bool constexpr IsNucleus(Code const p) { return GetNucleusA(p) != 0; }
+
   /**
-   * the output operator for particles
+   * the output operator for humand-readable particle codes
    **/
 
-  std::ostream& operator<<(std::ostream& stream, corsika::particles::Code const p);
+  std::ostream& operator<<(std::ostream&, corsika::particles::Code);
 
   Code ConvertFromPDG(PDGCode);
 

Framework/Particles/pdxml_reader.py

@@ -369,38 +369,23 @@ def gen_properties(particle_db):
     
     ### nuclear data ###
     
-    # is nucleus flag
-    string += "static constexpr std::array<bool, size> isNucleus = {\n"
-    for p in particle_db.values():
-        value = 'false'
-        if p['isNucleus']:
-            value = 'true'
-        string += "  {val},\n".format(val = value)
-    string += "};\n"
-
     # nucleus mass number A
     string += "static constexpr std::array<int16_t, size> nucleusA = {\n"
     for p in particle_db.values():
-        A = 0
-        if p['isNucleus']:
-            A = p['A']
+        A = p.get('A', 0)
         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 = 0
-        if p['isNucleus']:
-            Z = p['Z']
+        Z = p.get('Z', 0)
         string += "  {val},\n".format(val = Z)
     string += "};\n"
 
     return string
 
 
-
-
 ###############################################################
 # 
 # return string with a list of classes for all particles

Framework/Random/RNGManager.cc

@@ -33,6 +33,20 @@ std::stringstream corsika::random::RNGManager::dumpState() const {
 
   return buffer;
 }
+
+void corsika::random::RNGManager::SeedAll(uint64_t vSeed) {
+  for (auto& entry : rngs) { entry.second.seed(vSeed++); }
+}
+
+void corsika::random::RNGManager::SeedAll() {
+  std::random_device rd;
+
+  for (auto& entry : rngs) {
+    std::seed_seq sseq{rd(), rd(), rd(), rd(), rd(), rd()};
+    entry.second.seed(sseq);
+  }
+}
+
 /*
 void corsika::random::RNGManager::SetSeedSeq(std::string const& pStreamName,
                                              std::seed_seq const& pSeedSeq) {

Framework/Random/RNGManager.h

@@ -61,6 +61,14 @@ namespace corsika::random {
      * set seed_seq of \a pStreamName to \a pSeedSeq
      */
     // void SetSeedSeq(std::string const& pStreamName, std::seed_seq& const pSeedSeq);
+
+    /**
+     * Set explicit seeds for all currently registered streams. The actual seed values
+     * are incremented from \a vSeed.
+     */
+    void SeedAll(uint64_t vSeed);
+
+    void SeedAll(); //!< seed all currently registered streams with "real" randomness
   };
 
 } // namespace corsika::random