[WIP] tracking Pagani detached

pycqed/__init__.py

@@ -2,6 +2,7 @@
 
 from pycqed.version import __version__
 import sys
+import warnings
 
 if 1:   # FIXME: hack should be removed
     module_name = "qcodes"
@@ -13,7 +14,12 @@
             "NB: Any `qcodes` submodule must also be imported after pycqed.")
     # We need to import this here so that any later imports of `QtPlot` from qcodes
     # KEEP ABOVE any QtPlot import!!!
-    from pycqed.measurement import qcodes_QtPlot_monkey_patching
+    warnings.warn(message="Attempts to apply qcodes QtPlot monkey patch.")
+    try:
+        from qcodes import plots
+        from pycqed.measurement import qcodes_QtPlot_monkey_patching
+    except ImportError as e:
+        warnings.warn(message="Failed to apply qcodes QtPlot monkey patch.")
 
 # from pycqed import measurement
 # from pycqed import analysis

pycqed/analysis/measurement_analysis.py

@@ -2539,8 +2539,8 @@ def run_default_analysis(self, print_fit_results=False,
 
         verbose = kw.get('verbose', False)
         # Get old values for qubit frequency
-        instr_set = self.data_file['Instrument settings']
         try:
+            instr_set = self.data_file['Instrument settings']
             if self.for_ef:
                 self.qubit_freq_spec = \
                     float(instr_set[self.qb_name].attrs['f_ef_qubit'])
@@ -4705,24 +4705,11 @@ def run_default_analysis(self, show=False, close_file=False, **kw):
 
             units = SI_prefix_and_scale_factor(val=max(abs(self.ax.get_xticks())),
                                                unit=self.sweep_unit[0])[1]
-            # Get old values
-            instr_set = self.data_file['Instrument settings']
-            try:
-                if self.for_ef:
-                    T1_old = float(
-                        instr_set[self.qb_name].attrs['T1_ef']) * 1e6
-                else:
-                    T1_old = float(instr_set[self.qb_name].attrs['T1']) * 1e6
-                old_vals = '\nold $T_1$ = {:.5f} '.format(T1_old) + units
-            except (TypeError, KeyError, ValueError):
-                logging.warning('qb_name is None. Old parameter values will '
-                                'not be retrieved.')
-                old_vals = ''
 
             textstr = ('$T_1$ = {:.5f} '.format(T1_micro_sec) +
                        units +
                        ' $\pm$ {:.5f} '.format(T1_err_micro_sec) +
-                       units + old_vals)
+                       units)
 
             self.fig.text(0.5, -0.2, textstr, transform=self.ax.transAxes,
                           fontsize=self.font_size,
@@ -4786,7 +4773,8 @@ class Ramsey_Analysis(TD_Analysis):
     Most kw parameters for Rabi_Analysis are also used here.
     """
 
-    def __init__(self, label='Ramsey', phase_sweep_only=False, **kw):
+    def __init__(self, label='Ramsey', phase_sweep_only=False,
+                 **kw):
         kw['label'] = label
         kw['h5mode'] = 'r+'
         self.phase_sweep_only = phase_sweep_only
@@ -4978,15 +4966,17 @@ def run_default_analysis(self, print_fit_results=False,
             close_main_figure=True, save_fig=False, **kw)
 
         verbose = kw.get('verbose', False)
-        # Get old values for qubit frequency
-        instr_set = self.data_file['Instrument settings']
         try:
             if self.for_ef:
+                # Get old values for qubit frequency
+                instr_set = self.data_file['Instrument settings']
                 self.qubit_freq_spec = \
                     float(instr_set[self.qb_name].attrs['f_ef_qubit'])
             elif 'freq_qubit' in kw.keys():
                 self.qubit_freq_spec = kw['freq_qubit']
             else:
+                # Get old values for qubit frequency
+                instr_set = self.data_file['Instrument settings']
                 try:
                     self.qubit_freq_spec = \
                         float(instr_set[self.qb_name].attrs['f_qubit'])
@@ -6345,16 +6335,8 @@ def run_default_analysis(self, print_fit_results=False,
 
         scale = SI_prefix_and_scale_factor(val=max(abs(ax.get_xticks())),
                                            unit=self.sweep_unit[0])[0]
-
-        instr_set = self.data_file['Instrument settings']
-        try:
-            old_RO_freq = float(instr_set[self.qb_name].attrs['f_RO'])
-            old_vals = '\n$f_{\mathrm{old}}$ = %.5f GHz' % (
-                old_RO_freq * scale)
-        except (TypeError, KeyError, ValueError):
-            logging.warning('qb_name is None. Old parameter values will '
-                            'not be retrieved.')
-            old_vals = ''
+
+        old_vals = ''
 
         if ('hanger' in fitting_model) or ('complex' in fitting_model):
             if kw['custom_power_message'] is None: