Add in new ZDef for energy regression study

The new ZDefinition is named ""Combined Relaxed Gen Cuts". The old
"Combined Gen Cuts" has been reverted to have the actual cut values
instead of the relaxed ones.