#4716 with merge conflicts resolved and Phase2 digitiser updated

[mark-grimes]

#4716 had some small clashes with #4714, fixed those and also copied over the changes to the Phase2 digitiser. @wmtford could you look over my changes to SiPhase2Digitizer and SiPhase2DigitizerAlgorithm to make sure I've done it properly? I pretty much just copied the changes you applied to SiPixelDigitizer and SiPixelDigitizer algorithm.

[cmsbuild]

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

#4716 with merge conflicts resolved and Phase2 digitiser updated

It involves the following packages:

SimDataFormats/TrackerDigiSimLink
SimTracker/Common
SimTracker/SiPhase2Digitizer
SimTracker/SiPixelDigitizer
SimTracker/TrackerHitAssociation

The following packages do not have a category, yet:

SimTracker/SiPhase2Digitizer

@civanch, @nclopezo, @mdhildreth, @cmsbuild, @Degano, @ktf can you please review it and eventually sign? Thanks.
@GiacomoSguazzoni, @rovere, @VinInn, @dkotlins, @wmtford, @cerati, @threus, @venturia 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

Only tested with muons, all fine.

[wmtford]

The updates to SimTracker/SiPhase2Digitizer[Algorithm] look correct to me.