Solid angle correction added
Merge branch 'master' of ssh://dascgitolite@dasc-git.diamond.ac.uk/scisoft/scisoft-core.git
Function persistence: Remove unnecessary static members and use instead
class name for Function type