Bugfix for #507 for GRASP + return_all=True.

Author: sserita

pygsti/algorithms/germselection.py

@@ -408,17 +408,24 @@ def find_germs(target_model, randomize=True, randomization_strength=1e-2,
 
     #force the line labels on each circuit to match the state space labels for the target model.
     #this is suboptimal for many-qubit models, so will probably want to revisit this. #TODO
-    finalGermList = []
-    if germList is not None:
-        for ckt in germList:
-            if ckt._static:
-                new_ckt = ckt.copy(editable=True)
-                new_ckt.line_labels = target_model.state_space.state_space_labels
-                new_ckt.done_editing()
-                finalGermList.append(new_ckt)
-            else:
-                ckt.line_labels = target_model.state_space.state_space_labels
-                finalGermList.append(ckt)
+    def fix_line_labels(germListToFix):
+        fixedGermList = []
+        if germListToFix is not None:
+            for ckt_or_list in germListToFix:
+                if isinstance(ckt_or_list, _circuits.Circuit) and ckt_or_list._static:
+                    new_ckt = ckt_or_list.copy(editable=True)
+                    new_ckt.line_labels = target_model.state_space.state_space_labels
+                    new_ckt.done_editing()
+                    fixedGermList.append(new_ckt)
+                elif isinstance(ckt_or_list, _circuits.Circuit):
+                    ckt_or_list.line_labels = target_model.state_space.state_space_labels
+                    fixedGermList.append(ckt_or_list)
+                else:
+                    # This is probably a list of circuits from GRASP w/ return_all = True
+                    # Call this function recursively
+                    fixedGermList.append(fix_line_labels(ckt_or_list))
+        return fixedGermList
+    finalGermList = fix_line_labels(germList)
 
     return finalGermList