scnc
/
qiskit
mirror of https://github.com/Qiskit/qiskit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove outdated code from when backend defaults wasn't done (#3716)

This commit is contained in:
Lauren Capelluto 2020-01-16 14:36:23 -05:00 committed by mergify[bot]
parent 2ca2653a3f
commit 4affa630ed
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
qiskit/compiler/assemble.py
View File

@ -22,7 +22,6 @@ from qiskit.pulse import ScheduleComponent, LoConfig
from qiskit.assembler.run_config import RunConfig from qiskit.assembler.run_config import RunConfig
from qiskit.assembler import assemble_circuits, assemble_schedules from qiskit.assembler import assemble_circuits, assemble_schedules
from qiskit.qobj import QobjHeader from qiskit.qobj import QobjHeader
from qiskit.validation.exceptions import ModelValidationError
from qiskit.qobj.utils import MeasLevel, MeasReturnType from qiskit.qobj.utils import MeasLevel, MeasReturnType
from qiskit.validation.jsonschema import SchemaValidationError from qiskit.validation.jsonschema import SchemaValidationError
@ -250,19 +249,8 @@ def _parse_pulse_args(backend, qubit_lo_freq, meas_lo_freq, qubit_lo_range,
backend_config = None backend_config = None
backend_default = None backend_default = None
if backend: if backend:
backend_default = backend.defaults()
backend_config = backend.configuration() backend_config = backend.configuration()
# TODO : Remove usage of config.defaults when backend.defaults() is updated.
try:
backend_default = backend.defaults()
except (ModelValidationError, AttributeError):
from collections import namedtuple
backend_config_defaults = getattr(backend_config, 'defaults', {})
BackendDefault = namedtuple('BackendDefault', ('qubit_freq_est', 'meas_freq_est'))
backend_default = BackendDefault(
qubit_freq_est=backend_config_defaults.get('qubit_freq_est'),
meas_freq_est=backend_config_defaults.get('meas_freq_est')
)
if meas_level not in getattr(backend_config, 'meas_levels', [MeasLevel.CLASSIFIED]): if meas_level not in getattr(backend_config, 'meas_levels', [MeasLevel.CLASSIFIED]):
raise SchemaValidationError( raise SchemaValidationError(
('meas_level = {} not supported for backend {}, only {} is supported' ('meas_level = {} not supported for backend {}, only {} is supported'