Fix bugs of analysis

May change the pointset in the original data