Fix filter for ecal_ and collection names for ecal_, ecalcalib_

This is intended to be a quick fix for tonight. There is still an unsolved (less important) issue.
Thank you!