Added option to calculate overlap with ground state while specifying expectation values to calculatew