Shashlik Reco Geometry v3

* Make Shashlik geometry part of Calo geometry
* Include it in Calo geometry builder configuration
* Allow for more sub-dets in Calo geometry