Commit e8cfad52 authored by cortes_c's avatar cortes_c
Browse files

light changes on numerics (stepsize for integration, etc.)

parent ffd03f26
...@@ -3502,7 +3502,7 @@ void Distribution::setAttributes() { ...@@ -3502,7 +3502,7 @@ void Distribution::setAttributes() {
itsAttr[Attrib::Distribution::MAXSTEPSCO] itsAttr[Attrib::Distribution::MAXSTEPSCO]
= Attributes::makeReal("MAXSTEPSCO", "Maximum steps used to find closed orbit ", 100); = Attributes::makeReal("MAXSTEPSCO", "Maximum steps used to find closed orbit ", 100);
itsAttr[Attrib::Distribution::MAXSTEPSSI] itsAttr[Attrib::Distribution::MAXSTEPSSI]
= Attributes::makeReal("MAXSTEPSSI", "Maximum steps used to find matched distribution ",1000); = Attributes::makeReal("MAXSTEPSSI", "Maximum steps used to find matched distribution ",250);
itsAttr[Attrib::Distribution::ORDERMAPS] itsAttr[Attrib::Distribution::ORDERMAPS]
= Attributes::makeReal("ORDERMAPS", "Order used in the field expansion ", 7); = Attributes::makeReal("ORDERMAPS", "Order used in the field expansion ", 7);
itsAttr[Attrib::Distribution::MAGSYM] itsAttr[Attrib::Distribution::MAGSYM]
......
...@@ -503,19 +503,19 @@ template<typename Value_type, typename Size_type> ...@@ -503,19 +503,19 @@ template<typename Value_type, typename Size_type>
} }
if (!harmonic) { if (!harmonic) {
ClosedOrbitFinder<value_type, size_type, ClosedOrbitFinder<value_type, size_type,
boost::numeric::odeint::runge_kutta_cash_karp54 <container_type> > cof(E_m, m_m, wo_m, N_m, accuracy, boost::numeric::odeint::runge_kutta4 <container_type> > cof(E_m, m_m, wo_m, N_m, accuracy,
maxitOrbit, Emin_m, Emax_m, maxitOrbit, Emin_m, Emax_m,
nSector_m, fieldmap_m, rguess, nSector_m, fieldmap_m, rguess,
type, scaleFactor_m, false); type, scaleFactor_m, false);
tunes = cof.getTunes();
ravg = cof.getAverageRadius(); // average radius
// properties of one turn // properties of one turn
container_type h_turn = cof.getInverseBendingRadius(angle); container_type h_turn = cof.getInverseBendingRadius(angle);
container_type r_turn = cof.getOrbit(angle); container_type r_turn = cof.getOrbit(angle);
container_type ds_turn = cof.getPathLength(angle); container_type ds_turn = cof.getPathLength(angle);
container_type fidx_turn = cof.getFieldIndex(angle); container_type fidx_turn = cof.getFieldIndex(angle);
tunes = cof.getTunes();
ravg = cof.getAverageRadius(); // average radius
container_type peo = cof.getMomentum(angle); //radial Momentum container_type peo = cof.getMomentum(angle); //radial Momentum
// write to terminal // write to terminal
......
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