Fix Shashlik assert

[mark-grimes]

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.

[cmsbuild]

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

Fix Shashlik assert

It involves the following packages:

RecoEgamma/EgammaIsolationAlgos

@nclopezo, @cmsbuild, @thspeer, @StoyanStoynev, @slava77, @Degano can you please review it and eventually sign? Thanks.
@lgray 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.
@fratnikov, @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.

[mark-grimes]

merge

This should fix the errors seen in the relvals for SLHC13.
Tested with a different physics process (H130GGgluonfusion) because the normal 4 muons didn't pick up the error.
Tests 10043, 10243, 10443, 11243, 11443, 12043, 12243, 12843, 13043, 13643, 13843, 14043 and 14643 pass all steps.
Test 12643 fails in step 2 with a known error.
Test 12243 fails in step 3 with a known error.
Tests 14243 and 14443 fail in step3 with a crash I don't think I've seen before (previously had same error as 12243):

#5  0x00002adc4f9ab86a in CaloTowersCreationAlgo::hadShwPosFromCells(DetId, DetId, float) () from /cvmfs/cms.cern.ch/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_0_SLHC13/lib/slc5_amd64_gcc472/pluginRecoLocalCaloCaloTowersCreator.so
#6  0x00002adc4f9abb0c in CaloTowersCreationAlgo::hadShwrPos(CaloTowerDetId, float) () from /cvmfs/cms.cern.ch/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_0_SLHC13/lib/slc5_amd64_gcc472/pluginRecoLocalCaloCaloTowersCreator.so
#7  0x00002adc4f9ad336 in CaloTowersCreationAlgo::convert(CaloTowerDetId const&, CaloTowersCreationAlgo::MetaTower const&, edm::SortedCollection<CaloTower, edm::StrictWeakOrdering<CaloTower> >&) () from /cvmfs/cms.cern.ch/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_0_SLHC13/lib/slc5_amd64_gcc472/pluginRecoLocalCaloCaloTowersCreator.so
#8  0x00002adc4f9ad8e5 in CaloTowersCreationAlgo::finish(edm::SortedCollection<CaloTower, edm::StrictWeakOrdering<CaloTower> >&) () from /cvmfs/cms.cern.ch/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_0_SLHC13/lib/slc5_amd64_gcc472/pluginRecoLocalCaloCaloTowersCreator.so
#9  0x00002adc4f9b41e3 in CaloTowersCreator::produce(edm::Event&, edm::EventSetup const&) () from /cvmfs/cms.cern.ch/slc5_amd64_gcc472/cms/cmssw/CMSSW_6_2_0_SLHC13/lib/slc5_amd64_gcc472/pluginRecoLocalCaloCaloTowersCreator.so