Improve and reorganize formal integral integration
Improve and reorganize formal integral integration

* bookkeeping for e-scattering contribution should now be correct

kaushik94/tardis,kaushik94/tardis,kaushik94/tardis,kaushik94/tardis