Beam status in TGriffin
made angle function static
small changes
fixed merge conflict