added antenna types to anoise and add directory to usermodel.py
Merge branch 'devel'