Pulled out the initial conditions from trapEval into trapOptions.
Pulled out conversion from initial conditions into Phi/Psi into convertToPhiPsi