Integrate pull request feedback before merge with master

Author: nathlacroix

pycqed/analysis/measurement_analysis.py

@@ -1830,7 +1830,7 @@ def normalize_data_to_calibration_points(self, values, calsteps,
                         list(range(int(NoPts - int(self.NoCalPoints) / 2), NoPts))
                 ch_to_measure = \
                     0 if len(self.measured_values) == 1 else self.RO_channels[0]
-                print('ch to measure ', ch_to_measure)
+                log.debug('ch to measure ', ch_to_measure)
                 self.corr_data = a_tools.rotate_and_normalize_data_1ch(
                     self.measured_values[ch_to_measure],
                     cal_zero_points, cal_one_points)

pycqed/analysis_v2/readout_analysis.py

@@ -1055,7 +1055,7 @@ def recurse(node, thresholds_final, loc, mapping, feature_depth_path):
                 recurse(tree_.children_right[node], thresholds_final,
                         loc + [1], mapping, feature_depth_path)
             else:
-                print(loc, tree_.value[node], feature_depth_path)
+                log.debug(loc, tree_.value[node], feature_depth_path)
                 if len(loc) < tree_.n_features:
                     log.warning(
                         "Location < n_features, threshold mapping might not be "
@@ -1231,7 +1231,7 @@ def plot_std(mean, cov, ax, n_std=1.0, facecolor='none', **kwargs):
         # two-dimensionl dataset.
         ell_radius_x = 1#np.sqrt(1 + pearson)
         ell_radius_y = 1# np.sqrt(1 - pearson)
-        print(ell_radius_x)
+
         ellipse = Ellipse((0, 0),
                           width=ell_radius_x * 2,
                           height=ell_radius_y * 2,
@@ -1462,7 +1462,6 @@ def probability_table(shots_of_qubits, observables, n_readouts):
 
         table = np.zeros((n_readouts, len(observables)))
 
-        print(observables)
 
         for qubit, results in shots_of_qubits.items():
             res_e[qubit] = np.array(results).reshape((n_readouts, -1),
@@ -1487,9 +1486,6 @@ def probability_table(shots_of_qubits, observables, n_readouts):
                     else:
                         mask = np.logical_and(mask, res_g[qubit][seg])
                 table[readout_n, state_n] = np.count_nonzero(mask)
-        print(n_readouts)
-        print(n_shots)
-        print(np.sum(table))
         return table*n_readouts/n_shots
 
     @staticmethod

pycqed/analysis_v2/spectroscopy_analysis.py

@@ -1030,7 +1030,6 @@ def find_f_RO(self, states):
                 self.proc_data_dict['spectra'],
                 self.proc_data_dict['plot_frequency'][0],
                 **self.options_dict.get('qutrit_fit_options', dict()))
-            print(states)
             self.proc_data_dict["fit_raw_results"][key] = raw_results
         else:
             raise ValueError("{} states were given but method expects 1, "
@@ -1046,11 +1045,11 @@ def _find_f_RO_qutrit(spectra, freqs, sigma_init=0.01,
         optimal_frequency = []
         sigmas = [sigma_init]
 
-        logging.debug("###### Starting Analysis to find qutrit f_RO ######")
+        log.debug("###### Starting Analysis to find qutrit f_RO ######")
 
         while ResonatorSpectroscopy_v2.update_sigma(avg_fidelities, sigmas, freqs,
                                 optimal_frequency, n_iter, **kw):
-            logging.debug("Iteration {}".format(n_iter))
+            log.debug("Iteration {}".format(n_iter))
             sigma = sigmas[-1]
             if sigma in avg_fidelities.keys():
                 continue
@@ -1066,7 +1065,7 @@ def _find_f_RO_qutrit(spectra, freqs, sigma_init=0.01,
         qutrit_key = "".join(list(spectra))
 
 
-        logging.debug("###### Finished Analysis. Optimal f_RO: {} ######"
+        log.debug("###### Finished Analysis. Optimal f_RO: {} ######"
                       .format(optimal_frequency[-1]))
 
         return optimal_frequency[-1], raw_results if return_full else \
@@ -1098,7 +1097,7 @@ def update_sigma(avg_fidelities, sigmas, freqs,
             fid, idx_width = ResonatorSpectroscopy_v2.fidelity_and_width(
                 avg_fidelities[sigma_current], target_fidelity)
             width = idx_width * delta_freq
-            logging.debug("sigmas " + str(sigmas) + " width (MHz): "
+            log.debug("sigmas " + str(sigmas) + " width (MHz): "
                           + str(width / 1e6))
             f_opt = freqs[np.argmax(avg_fidelities[sigma_current])]
             optimal_frequency.append(f_opt)
@@ -1121,7 +1120,7 @@ def update_sigma(avg_fidelities, sigmas, freqs,
                     sigma_new = \
                         10 ** (np.log10(sigma_current) + np.abs(log_diff))
                 msg = "Width > max_width, update sigma to: {}"
-                logging.debug(msg.format(sigma_new))
+                log.debug(msg.format(sigma_new))
                 sigmas.append(sigma_new)
             elif fid < target_fidelity:
                 # sigma is too high, update higher bound
@@ -1131,7 +1130,7 @@ def update_sigma(avg_fidelities, sigmas, freqs,
                     sigma_new = 10 ** (np.log10(sigma_current) -
                                        np.abs(log_diff) / 2)
                 msg = "Fidelity < target fidelity, update sigma to: {}"
-                logging.debug(msg.format(sigma_new))
+                log.debug(msg.format(sigma_new))
                 sigmas.append(sigma_new)
 
         return continue_search

pycqed/analysis_v3/saving.py

@@ -62,10 +62,10 @@ def save_data(self, data_dict, savedir: str = None, savebase: str = None,
 
     filepath = os.path.join(savedir, savebase + tstag + '.' + fmt)
     if self.verbose:
-        print('Saving raw data to %s' % filepath)
+        log.info('Saving raw data to %s' % filepath)
     with open(filepath, 'w') as file:
         json.dump(save_dict, file, cls=NumpyJsonEncoder, indent=4)
-    print('Data saved to "{}".'.format(filepath))
+    log.info('Data saved to "{}".'.format(filepath))
 
 
 def save_processed_data(self, key=None, overwrite=True):
@@ -99,7 +99,7 @@ def save_processed_data(self, key=None, overwrite=True):
             pass
 
         if self.verbose:
-            print('Saving fitting results to %s' % fn)
+            log.info('Saving fitting results to %s' % fn)
 
         with h5py.File(fn, 'a') as data_file:
             try:
@@ -136,7 +136,7 @@ def save_fit_results(data_dict, fit_res_dict, **params):
         pass
 
     if params.get('verbose', False):
-        print('Saving fitting results to %s' % fn)
+        log.info('Saving fitting results to %s' % fn)
 
     with h5py.File(fn, 'a') as data_file:
         try:
@@ -199,7 +199,7 @@ def save_figures(data_dict, figs, **params):
         pass
 
     if params.get('verbose', False):
-        print('Saving figures to %s' % savedir)
+        log.info('Saving figures to %s' % savedir)
 
     for key in key_list:
         if params.get('presentation_mode', False):

pycqed/instrument_drivers/meta_instrument/qubit_objects/QuDev_transmon.py

@@ -1321,7 +1321,7 @@ def measure_randomized_benchmarking(
             if classified_ro:
                 ba3.BaseDataAnalysis()
             else:
-                print('Currently only classified ro is supported.')
+                log.error('Currently only classified ro is supported.')
 
     def measure_transients(self, states=('g', 'e'), upload=True,
                            analyze=True, acq_length=4097/1.8e9,

pycqed/measurement/detector_functions.py

@@ -1315,7 +1315,6 @@ def process_data(self, data_raw):
             #                             state_prob_mtx_list[i],
             #                             self.get_values_function_kwargs.get(
             #                                'average', True), self.correlated)
-        print(classified_data.shape)
         return classified_data.T
 
     def classify_shots(self, data, classifier_params_list,
@@ -1352,7 +1351,7 @@ def classify_shots(self, data, classifier_params_list,
                     state_prob_mtx_list[i]).T @ clf_data.T
                 log.info('Data corrected based on state_prob_mtx.')
             else:
-                print('not correcting data')
+                log.info('not correcting data')
                 clf_data = clf_data.T
             # print(clf_data.shape)
             classified_data[nr_states * i: nr_states * i + nr_states, :] = \

pycqed/measurement/measurement_control.py

@@ -1268,8 +1268,6 @@ def get_datawriting_start_idx(self):
             max_sweep_points = np.shape(self.get_sweep_points())[0]
 
         start_idx = int(self.total_nr_acquired_values % max_sweep_points)
-        print('total_nr_acquired_values ', self.total_nr_acquired_values)
-        print('max_sweep_points ', max_sweep_points)
         self.soft_iteration = int(
             self.total_nr_acquired_values//max_sweep_points)
 

pycqed/measurement/multi_qubit_module.py

@@ -377,7 +377,6 @@ def measure_multiplexed_readout(qubits, liveplot=False,
 
     if analyse and thresholds is not None:
         channel_map = {qb.name: qb.int_log_det.value_names[0]+' '+qb.instr_uhf() for qb in qubits}
-        print('MRO channel map ', channel_map)
         ra.Multiplexed_Readout_Analysis(options_dict=dict(
             n_readouts=(2 if preselection else 1) * 2 ** len(qubits),
             thresholds=thresholds,
@@ -429,7 +428,7 @@ def measure_arbitrary_sequence(qubits, sequence=None, sequence_function=None,
                                detector_function=None, df_kwargs=dict(),
                                sweep_function=awg_swf.SegmentHardSweep,
                                sweep_points=None, temporary_values=(),
-                               exp_metadata=dict(), upload=True,
+                               exp_metadata=None, upload=True,
                                analyze=True):
     """
     Measures arbitrary sequence provided in input.
@@ -490,6 +489,9 @@ def measure_arbitrary_sequence(qubits, sequence=None, sequence_function=None,
     if label is None:
         label = f'{sequence.name}_{",".join(qb_names)}'
 
+    if exp_metadata is None:
+        exp_metadata = {}
+
     exp_metadata.update({'preparation_params': prep_params,
                     # 'sweep_points': ,
                     })
@@ -2188,7 +2190,7 @@ def measure_cphase(qbc, qbt, soft_sweep_params, cz_pulse_name,
                                         n_per_state=n_cal_points_per_state)
 
     if max_flux_length is not None:
-        print(f'max_flux_length = {max_flux_length*1e9:.2f} ns, set by user')
+        log.debug(f'max_flux_length = {max_flux_length*1e9:.2f} ns, set by user')
 
     if prep_params is None:
         prep_params = get_multi_qubit_prep_params(

pycqed/measurement/pulse_sequences/multi_qubit_tek_seq_elts.py

@@ -1049,10 +1049,6 @@ def multi_parity_multi_round_seq(ancilla_qubit_names,
         all_pulses += end_pulses
         all_pulses += generate_mux_ro_pulse_list(qb_names, operation_dict)
         all_pulsess.append(all_pulses)
-        if t==0:
-            from pprint import pprint
-            # pprint(all_pulses)
-
 
 
     if prep_params is not None:
@@ -1088,13 +1084,13 @@ def multi_parity_multi_round_seq(ancilla_qubit_names,
         repeat_dict[uhf] = (len(end_sequences),
                  (parity_loops, ROs), 1
                  )
-    print(repeat_dict)
+    log.debug(repeat_dict)
 
     if upload:
         ps.Pulsar.get_instance().program_awgs(seq, repeat_dict=repeat_dict)
 
 
-    print('sweep_points: ', seq.n_acq_elements())
+    log.debug('sweep_points: ', seq.n_acq_elements())
     return seq, np.arange(seq.n_acq_elements())
 
 

pycqed/measurement/waveform_control/pulsar.py

@@ -285,7 +285,7 @@ def repeat_func(n, el_played, index, playback_strings, wave_definitions):
 
 
             if int(el_played) != int(el_total):
-                print(el_played, ' is not ', el_total)
+                log.error(el_played, ' is not ', el_total)
                 raise ValueError('Check number of sequences in repeat pattern')
 
 

pycqed/measurement/waveform_control/segment.py

@@ -169,7 +169,7 @@ def resolve_timing(self):
 
             ref_points = new_ref_points
         if len(visited_pulses) != len(self.unresolved_pulses):
-            print(len(visited_pulses), len(self.unresolved_pulses))
+            log.error(len(visited_pulses), len(self.unresolved_pulses))
             for unpulse in visited_pulses:
                 if unpulse not in self.unresolved_pulses:
                     print(unpulse)

pycqed/utilities/general.py

@@ -18,6 +18,7 @@
 from functools import reduce  # forward compatibility for Python 3
 import operator
 import string
+log = logging.getLogger(__name__)
 
 digs = string.digits + string.ascii_letters
 
@@ -163,7 +164,7 @@ def load_settings_onto_instrument(instrument, load_from_instr=None,
                 ins_group = sets_group[instrument_name]
             else:
                 ins_group = sets_group[load_from_instr]
-            print('Loaded Settings Successfully')
+            log.info('Loaded Settings Successfully')
             success = True
         except:
             older_than = os.path.split(folder)[0][-8:] \
@@ -173,7 +174,7 @@ def load_settings_onto_instrument(instrument, load_from_instr=None,
         count += 1
 
     if not success:
-        print('Could not open settings for instrument "%s"' % (
+        log.warning('Could not open settings for instrument "%s"' % (
             instrument_name))
         return False
 
@@ -184,14 +185,14 @@ def load_settings_onto_instrument(instrument, load_from_instr=None,
                     try:
                         instrument.set(parameter, False)
                     except:
-                        print('Could not set parameter: "%s" to "%s" for '
+                        log.error('Could not set parameter: "%s" to "%s" for '
                               'instrument "%s"' % (
                             parameter, value, instrument_name))
                 elif value == 'True':
                     try:
                         instrument.set(parameter, True)
                     except:
-                        print('Could not set parameter: "%s" to "%s" for '
+                        log.error('Could not set parameter: "%s" to "%s" for '
                               'instrument "%s"' % (
                             parameter, value, instrument_name))
                 else:
@@ -204,7 +205,7 @@ def load_settings_onto_instrument(instrument, load_from_instr=None,
                             try:
                                 instrument.set(parameter, int(value))
                             except:
-                                print('Could not set parameter: "%s" to "%s" '
+                                log.error('Could not set parameter: "%s" to "%s" '
                                       'for instrument "%s"' % (
                                     parameter, value, instrument_name))
             else:
@@ -314,7 +315,7 @@ def load_settings(instrument,
                                         instrument.set(parameter,
                                                        value)
                                     except Exception:
-                                        print('Could not set parameter '
+                                        log.error('Could not set parameter '
                                               '"%s" to "%s" '
                                               'for instrument "%s"' % (
                                                   parameter, value,
@@ -335,7 +336,7 @@ def load_settings(instrument,
         count += 1
 
     if not success:
-        print('Could not open settings for instrument {}.'.format(
+        log.error('Could not open settings for instrument {}.'.format(
             instrument_name))
     print()
     return