New event structure for run17 analysis