Allowing different SCF types, such as CONV, DF, CD, for DF/CD-OMP2
Changes to ensure PSI4 compiles