Revert "Refs #10199 use same cost function as ISAW"

This reverts commit 0cd3ae9e217d9d1736083b2b4e1bbed4cac0b2b3.
Revert "Refs #10535 zero edge intensity"

This reverts commit 2671ccba22e916f44f63b84a8cc23b5c1977c6a3.
Merge branch 'feature/10199_GoniometerCalibration' into develop