Add option to force Gaussian quad. for energy calcs

Better implementation than before.