Analysis and Correction of Geometrical Non-Linearities of ELI-NP BPMs on Position and Current Measurements