cms-sw/cmssw — pull request #4055 by mark-grimes (2014-05-30 12:35:29+00:00)
Title: Fix Shashlik assert

Previous code tried to instantiate StdGeom endcap, then if that failed instantiate Shashlik endcap, then assert that the endcap is Shashlik. Hence the program would terminate if the geometry was anything other than Shashlik.
I just removed the assert. Also changed a tertiary conditional to a binary to avoid repeated calls of the same method.