Modfied the filename of two xml files to match the tapered versions and python files
Changed to use the 4 eta constants file
Merge pull request #3159 from mark-grimes/fixSHCalTest

Fix SHCal tests