FFAG injection/extraction update

FFAG injection/extraction update