Correct for HF ieta 40 and Depth 1 for Phase2 HB

Correct for HF ieta 40
Correct for depth 1 of HB in PhaseI/PhaseII geoemtry