Added MatrixElement and AnayzlerOptics classes from the CSR version of samc