Commit c922b32d authored by kraus's avatar kraus
Browse files

Merge branch 'develop' into svn: kill compiler warnings

parent 316ec62a
......@@ -33,15 +33,15 @@ int RBend::RBend_counter_m = 0;
RBend::RBend():
Component(),
length_m(0.0),
gap_m(0.0),
reinitialize_m(false),
filename_m(""),
fieldmap_m(NULL),
amplitude_m(0.0),
field_orientation_m(1.0, 0.0),
startField_m(0.0),
endField_m(0.0),
length_m(0.0),
gap_m(0.0),
reinitialize_m(false),
fast_m(false),
sin_face_alpha_m(0.0),
cos_face_alpha_m(1.0),
......@@ -65,15 +65,15 @@ RBend::RBend():
RBend::RBend(const RBend &right):
Component(right),
length_m(right.length_m),
gap_m(right.gap_m),
reinitialize_m(right.reinitialize_m),
filename_m(right.filename_m),
fieldmap_m(right.fieldmap_m),
amplitude_m(right.amplitude_m),
field_orientation_m(right.field_orientation_m),
startField_m(right.startField_m),
endField_m(right.endField_m),
length_m(right.length_m),
gap_m(right.gap_m),
reinitialize_m(right.reinitialize_m),
fast_m(right.fast_m),
sin_face_alpha_m(right.sin_face_alpha_m),
cos_face_alpha_m(right.cos_face_alpha_m),
......@@ -103,15 +103,15 @@ RBend::RBend(const RBend &right):
RBend::RBend(const std::string &name):
Component(name),
length_m(0.0),
gap_m(0.0),
reinitialize_m(false),
filename_m(""),
fieldmap_m(NULL),
amplitude_m(0.0),
field_orientation_m(1.0, 0.0),
startField_m(0.0),
endField_m(0.0),
length_m(0.0),
gap_m(0.0),
reinitialize_m(false),
fast_m(false),
sin_face_alpha_m(0.0),
cos_face_alpha_m(1.0),
......@@ -703,6 +703,5 @@ void RBend::calculateEffectiveCenter() {
effectiveCenter += lengthAdjustment;
}
double deltaZ = effectiveCenter + zBegin;
effectiveCenter_m = effectiveCenter - R_m * sin(angle_m / 2.0) + R_m * angle_m / 2.0;
}
......@@ -14,11 +14,11 @@ FM1DProfile2::FM1DProfile2(std::string aFilename)
: Fieldmap(aFilename),
EngeCoefs_entry_m(NULL),
EngeCoefs_exit_m(NULL),
exit_slope_m(0.0),
xExit_m(0.0),
zExit_m(0.0),
cosExitRotation_m(1.0),
sinExitRotation_m(0.0),
exit_slope_m(0.0) {
sinExitRotation_m(0.0) {
Inform msg("FM1DP ");
int tmpInt;
std::string tmpString;
......
......@@ -23,7 +23,7 @@
#include <iomanip>
#include <sstream>
#include <string>
#include <limits>
#include "Algorithms/ParallelTTracker.h"
......@@ -90,15 +90,15 @@ ParallelTTracker::ParallelTTracker(const Beamline &beamline,
dtTrack_m(0.0),
surfaceEmissionStop_m(-1),
minStepforReBin_m(-1),
minBinEmitted_m(-1),
minBinEmitted_m(std::numeric_limits<size_t>::max()),
repartFreq_m(-1),
lastVisited_m(-1),
numRefs_m(-1),
gunSubTimeSteps_m(-1),
emissionSteps_m(numeric_limits<unsigned int>::max()),
emissionSteps_m(std::numeric_limits<unsigned int>::max()),
maxSteps_m(0),
maxNparts_m(0),
numberOfFieldEmittedParticles_m(numeric_limits<size_t>::max()),
numberOfFieldEmittedParticles_m(std::numeric_limits<size_t>::max()),
bends_m(0),
numParticlesInSimulation_m(0),
space_orientation_m(0.0),
......@@ -143,7 +143,7 @@ ParallelTTracker::ParallelTTracker(const Beamline &beamline,
dtTrack_m(0.0),
surfaceEmissionStop_m(-1),
minStepforReBin_m(-1),
minBinEmitted_m(-1),
minBinEmitted_m(std::numeric_limits<size_t>::max()),
repartFreq_m(-1),
lastVisited_m(-1),
numRefs_m(-1),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment