LongitudinalWriter figures out the correct number of bins from the shower axis

corsika/detail/modules/writers/LongitudinalWriter.inl

@@ -15,17 +15,16 @@
 #include <corsika/media/ShowerAxis.hpp>
 
 #include <exception>
+#include <algorithm>
 
 namespace corsika {
 
   template <typename TOutput>
   inline LongitudinalWriter<TOutput>::LongitudinalWriter(ShowerAxis const& axis,
-                                                         GrammageType dX,
-                                                         size_t const nBins)
+                                                         GrammageType dX)
       : TOutput(number_profile::ProfileIndexNames)
       , showerAxis_(axis)
-      , dX_(dX)
-      , nBins_(nBins) {}
+      , dX_(dX) {}
 
   template <typename TOutput>
   inline void LongitudinalWriter<TOutput>::startOfLibrary(
@@ -36,8 +35,8 @@ namespace corsika {
   template <typename TOutput>
   inline void LongitudinalWriter<TOutput>::startOfShower(unsigned int const showerId) {
     TOutput::startOfShower(showerId);
-    // reset profile
-    profile_.clear();
+    // figure out the number of bins and resize the profile container accordingly
+    nBins_ = static_cast<unsigned int>(showerAxis_.getMaximumX() / dX_) + 1;
     profile_.resize(nBins_);
   }
 
@@ -66,15 +65,15 @@ namespace corsika {
     GrammageType const grammageEnd = showerAxis_.getProjectedX(track.getPosition(1));
 
     // Note: particle may go also "upward", thus, grammageEnd<grammageStart
-    int const binStart = std::ceil(grammageStart / dX_);
-    int const binEnd = std::floor(grammageEnd / dX_);
+    size_t const binStart = std::ceil(grammageStart / dX_);
+    size_t const binEnd = std::floor(grammageEnd / dX_);
 
     CORSIKA_LOGGER_TRACE(TOutput::getLogger(),
                          "grammageStart={} End={} binStart={}, end={}",
                          grammageStart / 1_g * square(1_cm),
                          grammageEnd / 1_g * square(1_cm), binStart, binEnd);
 
-    for (int bin = binStart; bin <= binEnd; ++bin) {
+    for (size_t bin = binStart; bin <= std::min(binEnd, profile_.size() - 1); ++bin) {
       if (pid == Code::Photon) {
         profile_.at(bin)[static_cast<int>(number_profile::ProfileIndex::Photon)] +=
             weight;

corsika/modules/writers/LongitudinalWriter.hpp

@@ -95,8 +95,7 @@ namespace corsika {
      * Construct a new writer.
      */
     LongitudinalWriter(ShowerAxis const& axis,
-                       GrammageType dX = 10_g / square(1_cm), // profile binning
-                       size_t const nBins = 200);             // number of bins
+                       GrammageType dX = 10_g / square(1_cm)); // profile binning
 
     void startOfLibrary(boost::filesystem::path const& directory) final override;