Bug fix in the calo towers for endcaps

Two little things: the number of phi bins was hardcoded and too many eta
bins were considered.