Modifications to support combined NSW&BIS78 layouts

Hi,

this MR brings the necessary modifications of master to support the new combined NSW&BIS78 layouts (symmetric and asymmetric scenario for Run3).

Best, Nico