added ann= and norm= parameters
perftool.py: removed _inpc_ related code in favor of norm=True