Changes to incorporate the non-perfect crossing angle compensation

Pull requesting for Anders who has git technical problems

Fixes to the hourglass beam spot given discussions between Anders and Stephane Farthouk - expected luminous region is now 4.4 cm.