gprot.py: Move atomtype suffixing after pair parameter calculation