From f27f63e14a906b4dfa379242e420e0ffe8f3a82a Mon Sep 17 00:00:00 2001
From: Maximilian Reininghaus <maximilian.reininghaus@kit.edu>
Date: Fri, 5 Jun 2020 02:02:24 +0200
Subject: [PATCH] fixed InteractionHistogram::operator+()
---
Processes/InteractionCounter/InteractionHistogram.cc | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/Processes/InteractionCounter/InteractionHistogram.cc b/Processes/InteractionCounter/InteractionHistogram.cc
index 556b58f27..61ed9d5c8 100644
--- a/Processes/InteractionCounter/InteractionHistogram.cc
+++ b/Processes/InteractionCounter/InteractionHistogram.cc
@@ -19,7 +19,6 @@ void InteractionHistogram::fill(particles::Code projectile_id,
units::si::HEPEnergyType lab_energy,
units::si::HEPEnergyType mass_target, int A, int Z) {
using namespace units::si;
-
if (projectile_id == particles::Code::Nucleus) {
auto const sqrtS =
sqrt(A * A * (units::constants::nucleonMass * units::constants::nucleonMass) +
@@ -52,7 +51,6 @@ void InteractionHistogram::fill(particles::Code projectile_id,
interaction_histogram_cms_(
static_cast<corsika::particles::CodeIntType>(projectile_id), sqrtS / 1_GeV);
-
interaction_histogram_lab_(
static_cast<corsika::particles::CodeIntType>(projectile_id), lab_energy / 1_GeV);
}
@@ -82,6 +80,9 @@ InteractionHistogram InteractionHistogram::operator+(InteractionHistogram other)
other.nuclear_inthist_lab_ += nuclear_inthist_lab_;
other.nuclear_inthist_cms_ += nuclear_inthist_cms_;
+ other.interaction_histogram_lab_ += interaction_histogram_lab_;
+ other.interaction_histogram_cms_ += interaction_histogram_cms_;
+
return other;
}
--
GitLab