Update Maxpix.py for new way of setting energy threshold
Merge branch 'master' of git://github.com/esrf-bliss/Lima-tango