Adding back a #define for HAADF
Merge branch 'master' of ssh://github.com/OpenMBIR/openmbir