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 79df5e6d authored by snuverink_j's avatar snuverink_j
Browse files

fix clang warnings

parent 0574e6eb
No related branches found
No related tags found
No related merge requests found
......@@ -100,17 +100,17 @@ bool Stripper::doCheck(PartBunchBase<double, 3> *bunch, const int turnnumber, co
if(sk1 == 0.0)
stangle =1.0e12;
else
stangle = abs(1/sk1);
stangle = std::abs(1/sk1);
}else if (meanP(0) == 0.0 ){
sk2 = - A_m/B_m;
if(sk2 == 0.0)
stangle =1.0e12;
else
stangle = abs(1/sk2);
stangle = std::abs(1/sk2);
}else {
sk1 = meanP(1)/meanP(0);
sk2 = - A_m/B_m;
stangle = abs(( sk1-sk2 )/(1 + sk1*sk2));
stangle = std::abs(( sk1-sk2 )/(1 + sk1*sk2));
}
double lstep = (sqrt(1.0-1.0/(1.0+dot(meanP, meanP))) * Physics::c) * tstep*1.0e-6; // [mm]
double Swidth = lstep / sqrt( 1+1/stangle/stangle ) * 1.2;
......@@ -128,17 +128,17 @@ bool Stripper::doCheck(PartBunchBase<double, 3> *bunch, const int turnnumber, co
if (k1 == 0.0)
tangle = 1.0e12;
else
tangle = abs(1/k1);
tangle = std::abs(1/k1);
}else if (bunch->P[i](0) == 0.0 ){
k2 = -A_m/B_m;
if (k2 == 0.0)
tangle = 1.0e12;
else
tangle = abs(1/k2);
tangle = std::abs(1/k2);
}else {
k1 = bunch->P[i](1)/bunch->P[i](0);
k2 = -A_m/B_m;
tangle = abs(( k1-k2 )/(1 + k1*k2));
tangle = std::abs(( k1-k2 )/(1 + k1*k2));
}
double dist2 = dist1 * sqrt( 1+1/tangle/tangle );
double dt = dist2/(sqrt(1.0-1.0/(1.0 + dot(bunch->P[i], bunch->P[i]))) * Physics::c)*1.0e9;
......@@ -199,4 +199,4 @@ bool Stripper::doCheck(PartBunchBase<double, 3> *bunch, const int turnnumber, co
ElementBase::ElementType Stripper::getType() const {
return STRIPPER;
}
\ No newline at end of file
}
......@@ -820,9 +820,7 @@ template<typename Value_type, typename Size_type>
void SigmaGenerator<Value_type, Size_type>::decouple(const matrix_type& Mturn,
sparse_matrix_type& R,
sparse_matrix_type& invR)
{
typedef gsl_complex gsl_complex_t;
{
this->eigsolve_m(Mturn, R);
if ( !this->invertMatrix_m(R, invR) )
......
......@@ -13,8 +13,7 @@
#include "Ippl.h"
MultiBunchDump::MultiBunchDump()
: nBins_m(-1)
, fbase_m(OpalData::getInstance()->getInputBasename())
: fbase_m(OpalData::getInstance()->getInputBasename())
, fext_m(".smb")
{ }
......
......@@ -32,7 +32,6 @@ private:
void close_m(std::ofstream& out) const;
private:
int nBins_m;
std::string fbase_m;
std::string fext_m;
......
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