Added method to select trigger mask for ESD analysis + minor changes