ENH: wrap displacement and similarity point set

Change-Id: If9c1bd40f86d33ea0dbbd80c64d5ea917928e331