Code indexing in gitaly is broken and leads to code not being visible to the user. We work on the issue with highest priority.

Skip to content
Snippets Groups Projects
Commit 8dee3164 authored by snuverink_j's avatar snuverink_j
Browse files

clang compiler fix

parent 43f8d8d2
No related branches found
No related tags found
No related merge requests found
...@@ -25,12 +25,11 @@ ...@@ -25,12 +25,11 @@
#include "Ippl.h" #include "Ippl.h"
#include <cmath>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
#include <algorithm> #include <algorithm>
using Physics::pi;
#ifdef OPAL_DKS #ifdef OPAL_DKS
const int CollimatorPhysics::numpar = 13; const int CollimatorPhysics::numpar = 13;
#endif #endif
...@@ -327,7 +326,7 @@ bool CollimatorPhysics::computeEnergyLoss(Vector_t &P, ...@@ -327,7 +326,7 @@ bool CollimatorPhysics::computeEnergyLoss(Vector_t &P,
constexpr double massProton_keV = Physics::m_p * GeV2keV; constexpr double massProton_keV = Physics::m_p * GeV2keV;
constexpr double massProton_amu = 1.007276466879; constexpr double massProton_amu = 1.007276466879;
constexpr double chargeProton = Physics::z_p; constexpr double chargeProton = Physics::z_p;
constexpr double K = 4.0 * pi * Physics::Avo * std::pow(Physics::r_e * m2cm, 2) * massElectron_keV; constexpr double K = 4.0 * Physics::pi * Physics::Avo * Physics::r_e * m2cm * Physics::r_e * m2cm * massElectron_keV;
double gamma = Util::getGamma(P); double gamma = Util::getGamma(P);
const double gammaSqr = std::pow(gamma, 2); const double gammaSqr = std::pow(gamma, 2);
...@@ -425,7 +424,7 @@ void CollimatorPhysics::computeCoulombScattering(Vector_t &R, ...@@ -425,7 +424,7 @@ void CollimatorPhysics::computeCoulombScattering(Vector_t &R,
constexpr double GeV2eV = 1e9; constexpr double GeV2eV = 1e9;
constexpr double massProton_eV = Physics::m_p * GeV2eV; constexpr double massProton_eV = Physics::m_p * GeV2eV;
constexpr double chargeProton = Physics::z_p; constexpr double chargeProton = Physics::z_p;
constexpr double sqrtThreeInv = 1.0 / sqrt(3.0); constexpr double sqrtThreeInv = 0.57735026918962576451; // sqrt(1.0 / 3.0)
const double normP = euclidean_norm(P); const double normP = euclidean_norm(P);
const double gammaSqr = std::pow(normP, 2) + 1.0; const double gammaSqr = std::pow(normP, 2) + 1.0;
const double beta = sqrt(1.0 - 1.0 / gammaSqr); const double beta = sqrt(1.0 - 1.0 / gammaSqr);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment