Add SelfContract2edTensor. Also adds use of SelfContractedTensor to trg-s3.