Miscellaneous fixes

pygsti/algorithms/fiducialselection.py

@@ -1973,7 +1973,7 @@ def create_candidate_fiducial_list(target_model, omit_identity= True, ops_to_omi
     if ops_to_omit is None:
         ops_to_omit = []
 
-    fidOps = [gate for gate in target_model.operations if gate not in ops_to_omit]
+    fidOps = [gate for gate in target_model.operations if str(gate) not in ops_to_omit]
 
     if omit_identity:
         # we assume identity gate is always the identity mx regardless of basis
@@ -2013,6 +2013,10 @@ def create_candidate_fiducial_list(target_model, omit_identity= True, ops_to_omi
         else:
             availableFidList.extend(_circuits.list_random_circuits_onelen(
                 fidOps, fidLength, count, seed=candidate_seed))
+
+    for ckt in availableFidList:
+        ckt.line_labels = target_model.state_space.state_space_labels
+        print(ckt.line_labels)
     return availableFidList
 
 

pygsti/algorithms/gaugeopt.py

@@ -161,7 +161,7 @@ def gaugeopt_to_target(model, target_model, item_weights=None,
         model = model.copy()  # don't alter the original model's parameterization (this would be unexpected)
         for args in conversion_args:
             if isinstance(args, str):
-                model.convert_members_inplace(args, set_default_gauge_group=True)
+                model.convert_members_inplace(args, set_default_gauge_group=True, convert_new_inst=False)
             elif isinstance(args, dict):
                 model.convert_members_inplace(**args)
             else:

pygsti/circuits/circuit.py

@@ -4047,6 +4047,7 @@ def convert_to_openqasm(self, num_qubits=None,
         if include_delay_on_idle:
             # Include a delay instruction
             openqasm += 'opaque delay(t) q;\n\n'
+        openqasm += 'gate rzx(param0) q0,q1 { h q1; cx q0,q1; rz(param0) q1; cx q0,q1; h q1; }\ngate ecr q0,q1 { rzx(pi/4) q0,q1; x q0; rzx(-pi/4) q0,q1; }' 
 
         openqasm += 'qreg q[{0}];\n'.format(str(num_qubits))
         # openqasm += 'creg cr[{0}];\n'.format(str(num_qubits))

pygsti/data/dataset.py

@@ -1365,6 +1365,7 @@ def degrees_of_freedom(self, circuits=None, method="present_outcomes-1",
         nDOF = 0
         Nout = len(self.olIndex)
         if model is not None: 
+            prev_sim = model.sim
             model.sim = 'map'
 
         def compute_tuned_expected_llr(cur_outcomes):
@@ -1449,7 +1450,7 @@ def exp_llr_func(x):
                 nDOF += nOutcomes - 1  # last time stamp
 
         if model is not None: 
-            model.sim = 'matrix'
+            model.sim = prev_sim
 
         if keyerrors != 0:
             _warnings.warn(f'The dataset includes circuits the model cannot calculate probabilities for (e.g. the model does not include instruments for an instrument-containing dataset). Skipping KeyErrors = {keyerrors} circuits in calculation of degrees of freedom.')

pygsti/modelmembers/instruments/composedinstrument.py

@@ -252,12 +252,13 @@ def transform_inplace(self,s):
         Smx = s.transform_matrix
         Si = s.transform_matrix_inverse
         self.noise_map = _op.FullTPOp(_np.kron(Si, _np.eye(4)) @ self.noise_map.to_dense() @ self.aux_GATES @ _np.kron(Smx, _np.eye(4))  @ self.aux_GATES)
+
         for i in range(2): 
             self[f'p{i}'] = _ComposedInstrumentOp(self.noise_map, i, self.right_isometry, self.left_isometry, 'pp')
         self.dirty = True
 
     def __str__(self):
-            s = f'MCMInstrument representing a MCM with elements:\n'
+            s = f'ComposedInstrument representing a mid-curcuit measurement with elements:\n'
             for lbl, element in self.items():
                 s += "%s:\n%s\n" % (lbl, _mt.mx_to_string(element.to_dense(), width=4, prec=3))
             return s

pygsti/modelmembers/instruments/tpinstrument.py

@@ -254,7 +254,9 @@ def simplify_operations(self, prefix=""):
     @property
     def parameter_labels(self):  # same as in Instrument CONSOLIDATE?
         """
-        An array of labels (usually strings) describing this model member's parameters.
+        An array of labels (usually strings) describing this model member's parameters. Here, 
+        we will have d^2(d^2-1) parameters corresponding to the sum of the instrument elements
+        followed by d^2*d^2 parameters for each of the instrument elements (except the first one). 
         """
         plabels_per_local_index = _collections.defaultdict(list)
         for operation, factorgate_local_inds in zip(self.submembers(), self._submember_rpindices):

pygsti/models/explicitmodel.py

@@ -372,7 +372,7 @@ def __getitem__(self, label):
             raise KeyError("Key %s has an invalid prefix" % label)
 
     def convert_members_inplace(self, to_type, categories_to_convert='all', labels_to_convert='all',
-                                ideal_model=None, flatten_structure=False, set_default_gauge_group=False, cptp_truncation_tol= 1e-6):
+                                ideal_model=None, flatten_structure=False, set_default_gauge_group=False, cptp_truncation_tol= 1e-6, convert_new_inst = True):
         """
         TODO: docstring -- like set_all_parameterizations but doesn't set default gauge group by default
         """
@@ -385,8 +385,9 @@ def convert_members_inplace(self, to_type, categories_to_convert='all', labels_t
         if any([c in categories_to_convert for c in ('all', 'instruments')]):
             for lbl, inst in self.instruments.items():
                 if labels_to_convert == 'all' or lbl in labels_to_convert:
-                    ideal = ideal_model.instruments.get(lbl, None) if (ideal_model is not None) else None
-                    self.instruments[lbl] = _instrument.convert(inst, to_type, self.basis, ideal, flatten_structure)
+                    if not isinstance(inst, _instrument.ComposedInstrument) and not convert_new_inst:
+                        ideal = ideal_model.instruments.get(lbl, None) if (ideal_model is not None) else None
+                        self.instruments[lbl] = _instrument.convert(inst, to_type, self.basis, ideal, flatten_structure)
         if any([c in categories_to_convert for c in ('all', 'preps')]):
             for lbl, prep in self.preps.items():
                 if labels_to_convert == 'all' or lbl in labels_to_convert:
@@ -564,7 +565,7 @@ def num_nongauge_params(self):
         int
             the number of non-gauge model parameters.
         """
-        return self.num_params - self.num_gauge_params
+        return self.num_params - self.num_gauge_params 
 
     @property
 

pygsti/tools/internalgates.py

@@ -651,6 +651,7 @@ def standard_gatenames_openqasm_conversions(version='u3'):
         std_gatenames_to_qasm['Gc23'] = ['rz(4.71238898038469)']
         std_gatenames_to_qasm['Gt'] = ['rz(0.7853981633974485)']
         std_gatenames_to_qasm['Gtdag'] = ['rz(5.497787143782138)']
+        std_gatenames_to_qasm['Gecr'] = ['ecr']
 
         std_gatenames_to_argmap = {}
         std_gatenames_to_argmap['Gzr'] = lambda gatearg: ['rz(' + str(gatearg[0]) + ')']