1. Fix bugs in Macro defintion in geo.h
2. Fix bugs of inconsistency between geo.h and geo.cpp