Updated with energy axis routine