Merge pull request #355 from jgray-19/eseptum_fix

Elseparator Fix

Author: ldeniau

src/mad_dynmap.cpp

@@ -926,7 +926,8 @@ template <typename P, typename T=P::T>
 inline void esept_thick (mflw_t *m, num_t lw, int is)
 {                                           (void)is;
   mdump(0);
-  num_t l = m->el*lw;
+  num_t l  = m->el*lw;
+  num_t k1 = m->volt/m->pc*m->sdir*m->charge;
 
   FOR (i,m->npar) {
     P p(m,i);
@@ -937,12 +938,12 @@ inline void esept_thick (mflw_t *m, num_t lw, int is)
     T  npy = m->ca*p.py - m->sa*p.px;
 
     T   e1 = 1/m->beta+p.pt;
-    T   dp = e1 + m->k1*ny;
+    T   dp = e1 + k1*ny;
     T l_pz = invsqrt(sqr(dp) - 1/sqr(m->betgam) - sqr(npx) - sqr(npy), l);
-    T  arg = m->k1*l_pz;
+    T  arg = k1*l_pz;
     T  shx = sinhc(arg)*l_pz;
     T   ch = cosh(arg), sh = sinh(arg);
-    T  chm = sqr(sinh(0.5*arg))*(2/m->k1);
+    T  chm = sqr(sinh(0.5*arg))*(2/k1);
     T   dt = chm*npy + sh *ny  + e1*shx;
     T   yt = ch *ny  + shx*npy + e1*chm;
     T  pyt = ch *npy + sh*dp;
@@ -967,7 +968,7 @@ inline void rfcav_kick (mflw_t *m, num_t lw, int is)
 {                                          (void)is;
   mdump(0);
   num_t w  = m->freq*twopi_clight;
-  num_t vl = m->volt*lw/m->pc*m->sdir*m->edir*m->charge;
+  num_t vl = lw*m->volt/m->pc*m->sdir*m->edir*m->charge;
 
   FOR (i,m->npar) {
     P p(m,i);
@@ -2016,4 +2017,4 @@ void mad_trk_cpptest (void)
   TRC(       tpsa f =  a+1+a+2+a+2;            )
   TRC(       tpsa g = (a+1)*sqr(a+2)+a*2;      )
 }
-#endif
+#endif