master
add numberOfAPVs method to SiStripDetId
Changes requested by Nazar
move headers around to avoid circular dependencies