Skip to content

Fix getBaseFaultName() #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zdomke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix getBaseFaultName() #37

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 2 additions & 27 deletions mps_database/tools/mps_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,33 +137,8 @@ def getFaultNameFromId(self, faultId):
return self.getFaultName(fault)

def getBaseFaultName(self, fault):
is_digital = False

if len(fault.inputs) <= 0:
print(('ERROR: Fault {0} (id={1}) has no inputs, please fix this error!'.format(fault.name, fault.id)))
return None

for fault_input in fault.inputs:
if fault_input.bit_position == 0:
try:
device = self.session.query(models.DigitalDevice).filter(models.DigitalDevice.id==fault_input.device_id).one()
for input in device.inputs:
if input.bit_position == 0:
device_input = input
is_digital = True
except:
is_digital = False

if not is_digital:
try:
device = self.session.query(models.AnalogDevice).filter(models.AnalogDevice.id==fault_input.device_id).one()
except:
print(("Bonkers, device " + str(fault_input.device_id) + " is not digital nor analog - what?!?"))

if is_digital:
base = self.getDeviceName(device)
else:
base = self.getDeviceName(device)
device = self.getDeviceFromFault(fault)
base = self.getDeviceName(device)

return base + ":" + fault.name

Expand Down