code review: unified usage of MODEL and SCALAR template parameters
Merge branch 'master' of github.com:WilstonOreo/Tomo