removed NMRCircuitPulseSequence

silq/parameters/acquisition_parameters_composite.py

@@ -10,7 +10,7 @@
     NMRPulseSequenceComposite,
 )
 from silq.pulses.pulse_types import Pulse
-from silq.pulses.pulse_sequences import NMRCircuitPulseSequence
+from silq.pulses.pulse_sequences import CircuitPulseSequence
 from silq.tools import property_ignore_setter
 from silq.analysis.analysis import AnalyseElectronReadout, AnalyseEPR, AnalyseMultiStateReadout
 
@@ -499,7 +499,7 @@ class NMRCircuitParameter(NMRParameterComposite):
     """
 
     def __init__(self, name: str = "NMR_circuit", **kwargs):
-        pulse_sequence = NMRCircuitPulseSequence('NMR_circuit')
+        pulse_sequence = CircuitPulseSequence('NMR_circuit')
         super().__init__(name=name, pulse_sequence=pulse_sequence, **kwargs)
 
         self.circuit = self.pulse_sequence['circuit']

silq/pulses/pulse_sequences.py

@@ -1602,85 +1602,6 @@ def save(self, filepath):
         return self.save_circuits(filepath)
 
 
-class NMRCircuitPulseSequence(NMRPulseSequenceComposite):
-    def __init__(self, name='NMR_circuit', circuits_file=None, **kwargs):
-        super().__init__(name=name, **kwargs)
-        # self.pulse_settings["initialization"] = {"enabled": False}
-
-        self.NMR.settings["pulses"] = {}
-
-        self.circuit_index = Parameter(vals=vals.Ints(), parent=False)
-        self.circuit = Parameter(vals=vals.Strings())
-        self.circuits = Parameter(
-            vals=vals.Lists(vals.Strings()), set_cmd=None, initial_value=[]
-        )
-
-        self.circuits_file = Parameter(initial_value=circuits_file, set_cmd=None)
-        self.circuits_folder = Parameter(config_link='properties.circuits_folder', set_cmd=None)
-
-    @parameter
-    def circuit_index_set(self, parameter, idx):
-        self.circuit = self.circuits[idx]
-
-    @parameter
-    def circuit_set(self, parameter, circuit):
-        # Update current value of circuit
-        parameter._latest["raw_value"] = parameter._latest["value"] = circuit
-
-        gates = convert_circuit(circuit, target_type=list)
-
-        unknown_gates = [gate for gate in gates if gate not in self.NMR.settings['pulses']]
-        if unknown_gates:
-            raise RuntimeError(
-                f'The following pulses are not registered in '
-                f'NMRCircuitPulseSequence.NMR.settings["pulses"]: {unknown_gates}'
-            )
-
-        self.NMR.pulse_settings["RF_pulses"] = [[
-            self.NMR.settings['pulses'][gate] for gate in gates
-        ]]
-
-        self.generate()
-
-    def load_circuits(self, filepath):
-
-        if not isinstance(filepath, Path):
-            filepath = Path(filepath)
-
-        if not filepath.exists():
-            if self.circuits_folder is None:
-                raise RuntimeError(f'Could not find filepath at {filepath}')
-
-            filepath = Path(self.circuits_folder) / filepath
-
-        if not filepath.exists():
-            raise RuntimeError(f'Could not find filepath at {filepath}')
-
-        self.circuits = load_circuits(filepath, target_type=str)
-
-        return self.circuits
-
-    def save_circuits(self, filepath, name='circuits.txt'):
-
-        if isinstance(filepath, Measurement):
-            filepath = filepath.dataset.filepath
-        elif isinstance(filepath, DataSet):
-            filepath = filepath.filepath
-
-        filepath = Path(filepath)
-
-        if filepath.is_dir():
-            filepath = filepath / name
-
-        with filepath.open('w') as f:
-            f.write('\n'.join(self.circuits))
-
-        return filepath
-
-    def save(self, filepath):
-        return self.save_circuits(filepath)
-
-
 class ESRRamseyDetuningPulseSequence(ESRPulseSequence):
     """" Created to implement an arbitrary number of DC pulses in a Ramsey sequence during the wait time. Please Refer to ESRPulseSequence for the ESR pulses.