Rivet_i: restore weight order after weight cleaning

The weight-name cleaning applied to GenEvent breaks the mapping between weight name and weight value. 😕 This change set will maintain the mapping.

cc/ @ewelina @lcorpe