Fix faulty merge

qutech · Jun 1, 2020 · 580eb01 · 580eb01
1 parent 6a70c6c
commit 580eb01
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/filter_functions/pulse_sequence.py b/filter_functions/pulse_sequence.py
@@ -396,9 +396,12 @@ def is_cached(self, attr: str) -> bool:
                    'total phases': '_total_phases',
                    'filter function': '_F',
                    'fidelity filter function': '_F',
+                   'generalized filter function': '_F_kl',
                    'pulse correlation filter function': '_F_pc',
                    'fidelity pulse correlation filter function': '_F_pc',
-                   'control matrix': '_R'}
+                   'generalized pulse correlation filter function': '_F_pc_kl',
+                   'control matrix': '_R',
+                   'pulse correlation control matrix': '_R_pc'}
 
         alias = attr.lower().replace('_', ' ')
         if alias in aliases:

diff --git a/tests/test_core.py b/tests/test_core.py
@@ -372,6 +372,7 @@ def test_pulse_sequence_attributes(self):
                    'total phases': '_total_phases',
                    'filter function': '_F',
                    'fidelity filter function': '_F',
+                   'generalized filter function': '_F_kl',
                    'pulse correlation filter function': '_F_pc',
                    'fidelity pulse correlation filter function': '_F_pc',
                    'generalized pulse correlation filter function': '_F_pc_kl',