Fix SHCal tests

[mark-grimes]

This should fix the 138xx and 148xx tests that are currently failing in step 1. They'll fail in step 2 though.
Moved two files to what they're called in the python files. Decided to move them rather than change the python config because the names will then match the tapered version.

[mark-grimes]

@ianna Could you check this line in particular? I assume it's fixing a typo, but it needs confirmation.

[ianna]

@mark-grimes - thanks, yes, it is correct.

[cmsbuild]

A new Pull Request was created by @mark-grimes (Mark Grimes) for CMSSW_6_2_X_SLHC.

Fix SHCal tests

It involves the following packages:

Geometry/CMSCommonData
Geometry/HGCalCommonData

@civanch, @Dr15Jones, @ianna, @mdhildreth, @cmsbuild, @nclopezo, @Degano, @ktf can you please review it and eventually sign? Thanks.
@ghellwig this is something you requested to watch as well.
You can sign-off by replying to this message having '+1' in the first line of your reply.
You can reject by replying to this message having '-1' in the first line of your reply.
@andersonjacob, @mark-grimes you are the release manager for this.
You can merge this pull request by typing 'merge' in the first line of your comment.

[ianna]

+1

[cmsbuild]

This pull request is fully signed and it will be integrated in one of the next CMSSW_6_2_X_SLHC IBs unless changes or unless it breaks tests. @andersonjacob, @mark-grimes can you please take care of it?

[mark-grimes]

merge

Tests either pass or fail with known errors.