From 935d6cb40313c814c3559d28d4db41e8dfaa073a Mon Sep 17 00:00:00 2001 From: DavidArmahJr <111519747+DavidArmahJr@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:38:17 -0400 Subject: [PATCH] Update resilientCommunity.py updated addEquipmentInfoToOmd code --- omf/models/resilientCommunity.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/omf/models/resilientCommunity.py b/omf/models/resilientCommunity.py index 8d12c2222..fa3c7be5a 100644 --- a/omf/models/resilientCommunity.py +++ b/omf/models/resilientCommunity.py @@ -882,7 +882,7 @@ def addLoadInfoToOmd(loadsDict, omdDict): return omdDict -def addEquipmentInfoToOmd(obDict, omdDict): +def addEquipmentInfoToOmd(obDict, omdDict, equipList): ''' adds criticality values to omd file for all objects loadsDict -> dict of loads @@ -890,18 +890,20 @@ def addEquipmentInfoToOmd(obDict, omdDict): returns new dict of omd objects ''' for ob in omdDict.get('tree', {}).values(): - obType = ob['object'] - obName = ob['name'] - k = obType + '.' + obName - - bcs_score = obDict[k]['base crit score'] - ccs_score = obDict[k]['community crit score'] - bcs_index = obDict[k]['base crit score'] - ccs_index = obDict[k]['community crit index'] - ob['base crit score'] = bcs_score - ob['community crit score'] = ccs_score - ob['community crit index'] = ccs_index - ob['base crit index'] = bcs_index + if (ob['object'] in equipList): + obType = ob['object'] + obName = ob['name'] + k = obType + '.' + obName + bcs_score = obDict[k]['base crit score'] + ccs_score = obDict[k]['community crit score'] + bcs_index = obDict[k]['base crit score'] + ccs_index = obDict[k]['community crit index'] + ob['base crit score'] = bcs_score + ob['community crit score'] = ccs_score + ob['community crit index'] = ccs_index + ob['base crit index'] = bcs_index + else: + continue return omdDict