This fixes a bug in the ECFG logic reported in https://its.cern.ch/jira/browse/ATLJETMET-1291. Now ECFG_3_1 is calculated by default for use in M2.
Tagging @cdelitzs, @mswiatlo, @tnobe, @farooque, and @lhenkelm