Trigger_efficiency_calculations
Merge branch 'master' of https://github.com/rockybala/usercode

Conflicts:
	Trig_analyzer/src/Trig_analyzer.cc
	Trig_analyzer/test/trig_analyzer_cfg.py