Updated NonLinearDataFilter to also return valid radii and thetas