reverted previous commit and fixed the counts time slot issues, other analyses may still be affected
Authored by: vsp_neumann 2014-12-19
Parent: [r31575]
Child: [r31577]