Add fixed sp to pstpm2; add in Gaussian quad weights data