Simplify PU subtraction code
Add 2x1 ECAL cluster info
Use tower level positioning if possible
Add 2x1 EM info to rate trees