Merged ExoCode from repository jruizvar
Fat jets in CMSSW_7_0 AND GEN