Reordered laser functions.
Merge commit 'b24dcbfde917d209100d2fb95319e171624c19ce'
Added optical pump beam to controller.