new merge scansetup.py