Merged cmssw-for-TimeEventStudies from repository franzoni
Merged cmssw-for-TimeEventStudies from repository franzoni
fixing for changed interface