IMPROVED METRICS FOR EVALUATING SELF CONSUMPTION AND SELF X2026