Upgrade/jmarchan double ecal gain run3

To port fix by @kreps to original branch and to MR !112 (merged)

This will be done after the tests, since we need to use the branch with 'upgrade/' in its name.