Access shashlik geometry correctly
Merge pull request #4795 from bsunanda/Phase2-shk25

Phase2-shk25