diff --git a/LCU/Maintenance/DBInterface/monitoringdb/views/controllers.py b/LCU/Maintenance/DBInterface/monitoringdb/views/controllers.py index 239e049db5253b3dfe202e96e9dd1b6158af31f5..e5a172285c30d2db298c51c3b80d48588a821fb3 100644 --- a/LCU/Maintenance/DBInterface/monitoringdb/views/controllers.py +++ b/LCU/Maintenance/DBInterface/monitoringdb/views/controllers.py @@ -95,13 +95,12 @@ def antenna_id_polarization_from_rcu_type_polarization(rcu, type): """ polarization_index = rcu % 2 - if type in ['LBH', 'HBA']: antenna_id = rcu - polarization_index antenna_id /= 2. polarization = 'Y' if polarization_index > 0 else 'X' elif type == 'LBL': - antenna_id = (rcu - polarization_index)/2. + 48 + antenna_id = (rcu - polarization_index) / 2. + 48 polarization = 'X' if polarization_index > 0 else 'Y' else: antenna_id = -1 @@ -109,6 +108,7 @@ def antenna_id_polarization_from_rcu_type_polarization(rcu, type): return int(antenna_id), polarization + def rcus_from_antenna_and_type(antenna_id, type): rcu_x = rcu_from_antenna_type_polarization(antenna_id, type, 'X') rcu_y = rcu_from_antenna_type_polarization(antenna_id, type, 'Y') @@ -874,7 +874,8 @@ class ControllerStationComponentErrors(ValidableReadOnlyView): for component_error in component_errors: rcu_id = component_error['rcu'] - component_id, polarization = antenna_id_polarization_from_rcu_type_polarization(rcu_id, component_name) + component_id, polarization = antenna_id_polarization_from_rcu_type_polarization( + rcu_id, component_name) details = dict(percentage=component_error['percentage'], start_frequency=component_error['start_frequency'], stop_frequency=component_error['stop_frequency'], @@ -895,7 +896,9 @@ class ControllerStationComponentErrors(ValidableReadOnlyView): else: rtsm_error_summary = component_errors_dict[str(component_id)][error_type] - rtsm_error_summary[polarization] = dict(details=details, error_type=error_type, rcu_id=rcu_id, polarization=polarization,) + rtsm_error_summary[polarization] = dict(details=details, error_type=error_type, + rcu_id=rcu_id, + polarization=polarization, ) if component_name not in response_payload: response_payload[component_name] = rtsm_errors_per_component_type