Phase2 he18

Add scenario for ECAL+HCAL in PhaseI and PhaseII