master
Make the HcalCollapseAnalyzer as a DQM class
Add back explicit categories where needed
move to the geometry from DB