Merge pull request #186 from tahuang1991/CSC_Upgrade_Trigger_SLCH16

use correct geometry in calcuating gemdphi in ME11
Merge pull request #249 from gem-sw/CSC-Trigger-Upgrade-GEM-RPC-forSLHC14

Merge pull request #186 from tahuang1991/CSC_Upgrade_Trigger_SLCH16