trist.h file modified
Merge branch 'master' of https://github.com/BinbinTang/Geomagicians_phase_2