Addresses Natha's requested changes from the pull request.

- adds __name__ to Logger in analysis_v3 files and multi_qubit_module.py.
- removes measure_multi_parity_multi_round measure and sequence functions.

Author: Stefania Lazar

pycqed/analysis_v3/data_processing.py

@@ -1,6 +1,6 @@
 import logging
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+log = logging.getLogger(__name__)
+
 import lmfit
 import numpy as np
 import scipy as sp
@@ -333,14 +333,15 @@ def arbitrary_mapping(data_dict, data_keys_in, data_keys_out, **params):
         mapping_kwargs (dict): additional arguments to forward to mapping function
 
     """
-    mapping = get_param('mapping', data_dict, **params)
-    mapping_kwargs = get_param('mapping_kwargs', data_dict,
+    mapping = help_func_mod.get_param('mapping', data_dict, **params)
+    mapping_kwargs = help_func_mod.get_param('mapping_kwargs', data_dict,
                                default_value=dict(), **params)
     if mapping is None:
         raise ValueError('mapping is not specified.')
     elif isinstance(mapping, str):
         mapping = eval(mapping)
-    data_to_proc_dict = get_data_to_process(data_dict, data_keys_in)
+    data_to_proc_dict = help_func_mod.get_data_to_process(data_dict,
+                                                          data_keys_in)
 
     if len(data_keys_out) != len(data_to_proc_dict):
         raise ValueError('data_keys_out and data_keys_in do not have '

pycqed/analysis_v3/fitting.py

@@ -1,6 +1,5 @@
 import logging
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+log = logging.getLogger(__name__)
 
 from pycqed.analysis_v3 import helper_functions as help_func_mod
 from pycqed.analysis import fitting_models as fit_mods

pycqed/analysis_v3/helper_functions.py

@@ -1,6 +1,5 @@
 import logging
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+log = logging.getLogger(__name__)
 import os
 import h5py
 import numpy as np

pycqed/analysis_v3/pipeline_analysis.py

@@ -17,8 +17,7 @@
 from pycqed.analysis_v3 import plotting as plot_module
 import copy
 import logging
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+log = logging.getLogger(__name__)
 
 
 class PipelineDataAnalysis(object):

pycqed/analysis_v3/plotting.py

@@ -1,6 +1,5 @@
 import logging
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+log = logging.getLogger(__name__)
 
 import numpy as np
 import numbers

pycqed/analysis_v3/processing_pipeline.py

@@ -29,19 +29,6 @@ def check_keys_in(self, keys_in=None):
             else:
                 raise ValueError('This is the first node in the pipeline. '
                                  'keys_in must be specified.')
-        # else:
-        #     if not isinstance(keys_in, list):
-        #         keys_in = [keys_in]
-        #     # check if keys_in are suffixes of previous keys_out
-        #     keys_out_in_pipe = []
-        #     for d in self:
-        #         if 'keys_out' in d:
-        #             keys_out_in_pipe += [d['keys_out'] for keyi in keys_in if
-        #                                  keyi in d['keys_out'][0]]
-        #             # print(f'Taking keys_in as the keys_out of node '
-        #             #       f'{d["node_type"]} for the key suffix {keyi}')
-        #     if len(keys_out_in_pipe) > 0:
-        #         keys_in = [kk for k in keys_out_in_pipe for kk in k]
         return keys_in
 
     def add_filter_data_node(self, reset_reps, keys_in=None, **params):

pycqed/analysis_v3/saving.py

@@ -1,6 +1,5 @@
 import logging
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+log = logging.getLogger(__name__)
 
 import os
 import json

pycqed/instrument_drivers/meta_instrument/qubit_objects/QuDev_transmon.py

@@ -1,4 +1,5 @@
 import logging
+log = logging.getLogger(__name__)
 import numpy as np
 import matplotlib.pyplot as plt
 from copy import deepcopy
@@ -30,8 +31,6 @@
 from pycqed.measurement import mc_parameter_wrapper
 import pycqed.analysis_v2.spectroscopy_analysis as sa
 from pycqed.utilities import math
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
 
 try:
     import pycqed.simulations.readout_mode_simulations_for_CLEAR_pulse \
@@ -2414,7 +2413,7 @@ def find_T1(self, times, n_cal_points_per_state=2, cal_states='auto',
                     self.T1_ef(T1)
                 else:
                     self.T1(T1)
-        return T1
+            return T1
 
     def find_rb_gate_fidelity(self, cliffords, nr_seeds, label=None,
                               gate_decomposition='HZ', interleaved_gate=None,

pycqed/measurement/multi_qubit_module.py

@@ -8,12 +8,10 @@
 import lmfit
 from copy import deepcopy
 import pygsti
-import logging
-
 from pycqed.utilities.general import temporary_value
 
-log = logging.getLogger()
-log.addHandler(logging.StreamHandler())
+import logging
+log = logging.getLogger(__name__)
 
 import pycqed.measurement.sweep_functions as swf
 import pycqed.measurement.awg_sweep_functions as awg_swf
@@ -729,100 +727,6 @@ def measure_parity_single_round(ancilla_qubit, data_qubits, CZ_map,
             ))
 
 
-def measure_multi_parity_multi_round(ancilla_qubits, data_qubits,
-                                     parity_map, CZ_map,
-                                     prep=None, upload=True, prep_params=None,
-                                     mode='tomo',
-                                     parity_seperation=1100e-9,
-                                     rots_basis=('I', 'Y90', 'X90'),
-                                     parity_loops = 1,
-                                     cal_points=None, analyze=True,
-                                     exp_metadata=None, label=None,
-                                     detector='int_log_det'):
-    """
-
-    :param ancilla_qubit:
-    :param data_qubits:
-    :param CZ_map: example:
-        {'CZ qb1 qb2': ['Y90 qb1', 'CX qb1 qb2', 'mY90 qb1'],
-         'CZ qb3 qb4': ['CZ qb4 qb3']}
-    :param preps:
-    :param upload:
-    :param prep_params:
-    :param cal_points:
-    :param analyze:
-    :param exp_metadata:
-    :param label:
-    :param detector:
-    :return:
-    """
-
-    qubits = ancilla_qubits + data_qubits
-    qb_names = [qb.name for qb in qubits]
-    for qb in qubits:
-        qb.prepare(drive='timedomain')
-
-    if label is None:
-        label = 'S7-rounds_' + str(parity_loops) + '_' + '-'.join(rots_basis) + \
-                '_' + '-'.join([qb.name for qb in qubits])
-
-    if prep_params is None:
-        prep_params = get_multi_qubit_prep_params(
-            [qb.preparation_params() for qb in qubits])
-
-    # if cal_points is None:
-    #     cal_points = CalibrationPoints.multi_qubit(qb_names, 'ge')
-
-    if prep is None:
-        prep = 'g'*len(data_qubits)
-
-    MC = ancilla_qubits[0].instr_mc.get_instr()
-
-    seq, sweep_points = mqs.multi_parity_multi_round_seq(
-                                 [qb.name for qb in ancilla_qubits],
-                                 [qb.name for qb in data_qubits],
-                                 parity_map,
-                                 CZ_map,
-                                 prep,
-                                 operation_dict = get_operation_dict(qubits),
-                                 mode=mode,
-                                 parity_seperation=parity_seperation,
-                                 rots_basis=rots_basis,
-                                 parity_loops=parity_loops,
-                                 cal_points=cal_points,
-                                 prep_params=prep_params,
-                                 upload=upload)
-
-    MC.set_sweep_function(awg_swf.SegmentHardSweep(
-        sequence=seq, upload=False, parameter_name='Tomography'))
-    MC.set_sweep_points(sweep_points)
-
-    rounds = 0
-    for k in range(len(parity_map)):
-        if parity_map[k]['round'] > rounds:
-            rounds = parity_map[k]['round']
-    rounds += 1
-
-    MC.set_detector_function(
-        get_multiplexed_readout_detector_functions(
-            qubits,
-            nr_averages=ancilla_qubits[0].acq_averages(),
-            nr_shots=ancilla_qubits[0].acq_shots(),
-        )[detector])
-    if exp_metadata is None:
-        exp_metadata = {}
-    exp_metadata.update(
-        {'sweep_name': 'Tomography',
-         'preparation_params': prep_params,
-         'hard_sweep_params': {'tomo': {'values': np.arange(0, len(sweep_points)),
-                                         'unit': ''}}
-         })
-
-    MC.run(label, exp_metadata=exp_metadata)
-
-    if analyze:
-        tda.MultiQubit_TimeDomain_Analysis(qb_names=qb_names)
-
 def measure_tomography(qubits, prep_sequence, state_name,
                        rots_basis=('I', 'X180', 'Y90', 'mY90', 'X90', 'mX90'),
                        use_cal_points=True,