temp fix for towers
temp fix for towers
fix merge
merge branch 'l1t-devel-CMSSW_7_1_0_pre2' of github.com:cms-l1t-offline/cmssw into mydevel-branch
added stage1 pp tau algorithm, bug fixes to stage1 egamma algo
Fixes for stage 2 clustering algo
Merge branch 'l1t-devel-CMSSW_7_1_0_pre2' of github.com:cms-l1t-offline/cmssw into mydevel-branch
Turn off verbosity
New algorithm for looping over permutations of calo conditions for speed improvements