Cmssw 7 0 x

align with the most recent (non-release) cvs tag V04-02-08 ;
add norm v2 for pixellumi
fix pixellumicalc