pulled in changes from approx_plastic
dagon changes
removed jump terms, reset r and P at impact
after trying a lot of stuff, settled on original jump injection
small change in sin_optim for running benchmark