From a9d242c25e5c574783b01a945c3090a213694ad9 Mon Sep 17 00:00:00 2001
From: Matthias Frey <matthias.frey@psi.ch>
Date: Wed, 15 Jul 2020 12:20:23 +0200
Subject: [PATCH] use Util:getBetaGamma function
---
src/Distribution/Distribution.cpp | 4 +---
src/Distribution/SigmaGenerator.cpp | 3 +--
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/Distribution/Distribution.cpp b/src/Distribution/Distribution.cpp
index 744df64db..4cc0ce4c9 100644
--- a/src/Distribution/Distribution.cpp
+++ b/src/Distribution/Distribution.cpp
@@ -2374,9 +2374,7 @@ void Distribution::generateMatchedGauss(const SigmaGenerator::matrix_t& sigma,
"Negative value on the diagonal of the sigma matrix.");
}
- double gamma = E_m / massIneV + 1.0;
- // beta * gamma
- double bgam = std::sqrt(gamma * gamma - 1.0);
+ double bgam = Util::getBetaGamma(E_m, massIneV);
/*
* only used for printing
diff --git a/src/Distribution/SigmaGenerator.cpp b/src/Distribution/SigmaGenerator.cpp
index 1c468e386..beb378a7e 100644
--- a/src/Distribution/SigmaGenerator.cpp
+++ b/src/Distribution/SigmaGenerator.cpp
@@ -98,8 +98,7 @@ SigmaGenerator::SigmaGenerator(double I,
, prinit_m(0.0)
{
// minimum beta*gamma
- double minGamma = Emin_m / m_m + 1.0;
- double bgam = std::sqrt(minGamma * minGamma - 1.0);
+ double bgam = Util::getBetaGamma(Emin_m, m_m);
// set emittances (initialization like that due to old compiler version)
// [ex] = [ey] = [ez] = pi*mm*mrad --> [emittance] = m rad
--
GitLab