Fixed sweep index counting and recording
Ensure we're using correct table names in HDF5