moved getting om_cal only if ISWCAL not equal to 0#98

yutiPML wants to merge 7 commits intomasterpmlmodelling/ersem:masterfrom

95-code-breaks-if-iswcal=0pmlmodelling/ersem:95-code-breaks-if-iswcal=0Copy head branch name to clipboard