Apply patch from !1490 (merged) to all reco macros used for real data (previous fix addressed only simulation)