Commit 3e0750e1 authored by frey_m's avatar frey_m
Browse files

directly convert when assigning

parent 761d98c6
...@@ -442,12 +442,12 @@ bool ClosedOrbitFinder<Value_type, Size_type, Stepper>::findOrbit(value_type acc ...@@ -442,12 +442,12 @@ bool ClosedOrbitFinder<Value_type, Size_type, Stepper>::findOrbit(value_type acc
* *
*/ */
value_type E = cycl_m->getFMLowE() * 1.0e3; // starting energy (GeV --> MeV) value_type E = cycl_m->getFMLowE(); // starting energy
value_type E_fin = ekin; // final energy value_type E_fin = ekin; // final energy
const value_type eps = dE * 1.0e-1; // articial constant for stopping criteria const value_type eps = dE * 1.0e-1; // articial constant for stopping criteria
if (isTuneMode) { if (isTuneMode) {
E_fin = cycl_m->getFMHighE() * 1.0e3; // (GeV --> MeV) E_fin = cycl_m->getFMHighE();
} }
namespace fs = boost::filesystem; namespace fs = boost::filesystem;
......
...@@ -354,8 +354,8 @@ SigmaGenerator<Value_type, Size_type>::SigmaGenerator(value_type I, ...@@ -354,8 +354,8 @@ SigmaGenerator<Value_type, Size_type>::SigmaGenerator(value_type I,
, m_m(m) , m_m(m)
, niterations_m(0) , niterations_m(0)
, converged_m(false) , converged_m(false)
, Emin_m(cycl->getFMLowE() * 1.0e3) , Emin_m(cycl->getFMLowE())
, Emax_m(cycl->getFMHighE() * 1.0e3) , Emax_m(cycl->getFMHighE())
, N_m(N) , N_m(N)
, nSectors_m(Nsectors) , nSectors_m(Nsectors)
, nStepsPerSector_m(N/cycl->getSymmetry()) , nStepsPerSector_m(N/cycl->getSymmetry())
......
...@@ -217,8 +217,8 @@ void OpalCyclotron::update() { ...@@ -217,8 +217,8 @@ void OpalCyclotron::update() {
cycl->setMinZ(minz); cycl->setMinZ(minz);
cycl->setMaxZ(maxz); cycl->setMaxZ(maxz);
cycl->setFMLowE(fmLowE); cycl->setFMLowE(fmLowE * 1.0e3); // convert GeV to MeV
cycl->setFMHighE(fmHighE); cycl->setFMHighE(fmHighE * 1.0e3); // convert GeV to MeV
cycl->setSpiralFlag(spiral_flag); cycl->setSpiralFlag(spiral_flag);
cycl->setTrimCoilThreshold(trimCoilThreshold); cycl->setTrimCoilThreshold(trimCoilThreshold);
......
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