From 6356f3fc7bcc6ef81fe996686e1e7c7c9981ca70 Mon Sep 17 00:00:00 2001 From: "Jens H. Nielsen" Date: Tue, 24 May 2022 08:48:27 -0700 Subject: [PATCH] remove deprecated methods --- broadbean/blueprint.py | 6 +----- broadbean/broadbean.py | 5 ----- broadbean/element.py | 6 +----- broadbean/sequence.py | 10 ---------- 4 files changed, 2 insertions(+), 25 deletions(-) diff --git a/broadbean/blueprint.py b/broadbean/blueprint.py index bcc712cd..87a9e07c 100644 --- a/broadbean/blueprint.py +++ b/broadbean/blueprint.py @@ -9,7 +9,7 @@ import numpy as np -from .broadbean import PulseAtoms, marked_for_deletion +from .broadbean import PulseAtoms class SegmentDurationError(Exception): @@ -680,10 +680,6 @@ def removeSegment(self, name): self._namelist = self._make_names_unique(self._namelist) - @marked_for_deletion(replaced_by='broadbean.plotting.plotter') - def plot(self, SR=None): - pass - def __add__(self, other): """ Add two BluePrints. The second argument is appended to the first diff --git a/broadbean/broadbean.py b/broadbean/broadbean.py index cad8f615..c7ed4d75 100644 --- a/broadbean/broadbean.py +++ b/broadbean/broadbean.py @@ -182,8 +182,3 @@ def __getitem__(self, key): return output raise KeyError('Key must be int or slice!') - - -@marked_for_deletion(replaced_by='broadbean.plotting.plotter') -def bluePrintPlotter(blueprints, fig=None, axs=None): - pass diff --git a/broadbean/element.py b/broadbean/element.py index 579935a4..e5a302c8 100644 --- a/broadbean/element.py +++ b/broadbean/element.py @@ -6,7 +6,7 @@ import numpy as np import json -from .broadbean import marked_for_deletion, PulseAtoms +from .broadbean import PulseAtoms from broadbean.blueprint import BluePrint, _subelementBuilder @@ -433,10 +433,6 @@ def copy(self): new._meta = deepcopy(self._meta) return new - @marked_for_deletion(replaced_by='broadbean.plotting.plotter') - def plotElement(self): - pass - def __eq__(self, other): if not isinstance(other, Element): return False diff --git a/broadbean/sequence.py b/broadbean/sequence.py index 549a6703..7ea09c10 100644 --- a/broadbean/sequence.py +++ b/broadbean/sequence.py @@ -8,13 +8,11 @@ import numpy as np from schema import Schema, Or, Optional import json -import re from broadbean.ripasso import applyInverseRCFilter from broadbean.element import Element # TODO: change import to element.py from broadbean.blueprint import BluePrint from .broadbean import _channelListSorter # TODO: change import to helpers.py -from .broadbean import marked_for_deletion from .broadbean import PulseAtoms from .broadbean import _AWGOutput @@ -677,14 +675,6 @@ def _plotSummary(seq: Dict[int, Dict]) -> Dict[int, Dict[str, np.ndarray]]: return output - @marked_for_deletion(replaced_by='broadbean.plotting.plotter') - def plotSequence(self) -> None: - pass - - @marked_for_deletion(replaced_by='broadbean.plotting.plotter') - def plotAWGOutput(self): - pass - def forge(self, apply_delays: bool=True, apply_filters: bool=True, includetime: bool=False) -> Dict[int, Dict]: