Rework Gate and SPAM table error bars

Rework the SPAM and Gate table error bar handling, and re-implement the ability to split off real and imaginary parts for gates. Additionally, add the target HS vector as a column to the SPAM table.

Author: Corey Ostrove

pygsti/report/factory.py

@@ -274,6 +274,7 @@ def _create_master_switchboard(ws, results_dict, confidence_level,
     if confidence_level is not None:
         switchBd.add("cri", (0, 1, 2))
         switchBd.add("cri_gaugeinv", (0, 1))
+        switchBd.add("cri_target_and_final", (0, 1, 2)) 
 
     for d, dslbl in enumerate(dataset_labels):
         results = results_dict[dslbl]
@@ -435,6 +436,7 @@ def _create_master_switchboard(ws, results_dict, confidence_level,
                 for il, l in enumerate(gauge_opt_labels):
                     if l in est.models:
                         switchBd.cri[d, i, il] = None  # default
+                        switchBd.cri_target_and_final[d, i, il] = [None, None] #default
                         crf = _get_viewable_crf(est, lbl, l, printer - 2)
 
                         if crf is not None:
@@ -445,8 +447,13 @@ def _create_master_switchboard(ws, results_dict, confidence_level,
                             region_type = "normal" if misfit_sigma <= nmthreshold \
                                           else "non-markovian"
                             switchBd.cri[d, i, il] = crf.view(confidence_level, region_type)
+                            #Now that we have identifies the gauge-optimization with the CRI
+                            #add this to the switchboard.
+                            switchBd.cri_target_and_final[d,i,il] = [None, crf.view(confidence_level, region_type)]
+                    else: 
+                        switchBd.cri[d, i, il] = NA
+                        switchBd.cri_target_and_final[d, i, il] = NA
 
-                    else: switchBd.cri[d, i, il] = NA
 
                 # "Gauge Invariant Representation" model
                 # If we can't compute CIs for this, ignore SILENTLY, since any

pygsti/report/section/gauge.py

@@ -252,21 +252,23 @@ class GaugeVariantsRawSection(_Section):
     def final_gates_box_table(workspace, switchboard=None, confidence_level=None, ci_brevity=1, **kwargs):
         return workspace.GatesTable(
             switchboard.mdl_target_and_final, ['Target', 'Estimated'], 'boxes',
-            _cri(1, switchboard, confidence_level, ci_brevity)
+            _cri_target_and_final(1, switchboard, confidence_level, ci_brevity)
         )
 
     @_Section.figure_factory(4)
     def final_model_brief_spam_table(workspace, switchboard=None, confidence_level=None, ci_brevity=1, **kwargs):
         return workspace.SpamTable(
             switchboard.mdl_target_and_final, ['Target', 'Estimated'], 'boxes',
-            _cri(1, switchboard, confidence_level, ci_brevity), include_hs_vec=True
+            _cri_target_and_final(1, switchboard, confidence_level, ci_brevity), include_hs_vec=True
         )
 
 
 # Helper functions
 def _cri(el, switchboard, confidence_level, ci_brevity):
     return switchboard.cri if confidence_level is not None and ci_brevity <= el else None
 
+def _cri_target_and_final(el, switchboard, confidence_level, ci_brevity):
+    return switchboard.cri_target_and_final if confidence_level is not None and ci_brevity <= el else [None, None]
 
 def _cri_gauge_inv(el, switchboard, confidence_level, ci_brevity):
     return switchboard.cri_gaugeinv if confidence_level is not None and ci_brevity <= el else None