Correction of magnetic optics and beam trajectory using LOCO based algorithm with expanded experimental data sets