minor stuff in hrtest.
Merge branch 'master' of github.com:nmohr/pyxar
Merge branch 'master' of github.com:nmohr/pyxar
Merge branch 'master' of github.com:nmohr/pyxar
Xray spectrum
Merge branch 'master' of github.com:nmohr/pyxar
dacParameters for V2.1, test.cfg
resolved merge conflict in data/defaultParameters.../module