Silicon tracker layout

Tweak the silicon tracker layout to be close to baseline all-silicon geometry again

• Double-check barrel dimensions
• Ensure inner disks at the right location
• Add back three outer disks