Updating for latest geometry version from Sunanda and HGC*DetId definition