Merge pull request #400 from jgray-19/rfmult_fix

ldeniau · web-flow · commit 8c560845c222 · 2023-08-31T14:44:38.000+02:00
Continue restoration of _pc
diff --git a/src/mad_dynmap.cpp b/src/mad_dynmap.cpp
@@ -1114,7 +1114,7 @@ inline void rfcav_kickn (cflw<M> &m, num_t lw, int is)
       bx  = p.y*by + p.x*bx;
       by  = byt;
 
-      p.pt -= wchg*w*by*sa;
+      p.pt -= wchg/m.pc*w*by*sa;
     }
   }
   mdump(1);
diff --git a/src/madl_dynmap.mad b/src/madl_dynmap.mad
@@ -1369,7 +1369,7 @@ function M.rfcav_kickn (elm, m, lw, istp) -- [KICKCAV, nmul~=0 or nbsl~=0]   --
       bx  = y*by + x*bx
       by  = byt
 
-      pt = pt - bdir*omega*by*sa
+      pt = pt - bdir*_pc*omega*by*sa
     end
 
     m[i].px = px

Original file line number	Diff line number	Diff line change
`@@ -1114,7 +1114,7 @@ inline void rfcav_kickn (cflw<M> &m, num_t lw, int is)`
`1114`	`1114`	`bx = p.yby + p.xbx;`
`1115`	`1115`	`by = byt;`
`1116`	`1116`
`1117`		`- p.pt -= wchgwby*sa;`
	`1117`	`+ p.pt -= wchg/m.pcwby*sa;`
`1118`	`1118`	`}`
`1119`	`1119`	`}`
`1120`	`1120`	`mdump(1);`