Fix more rebase errors

qiskit-community · May 17, 2021 · c9c2958 · c9c2958
1 parent 3e57636
commit c9c2958
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/qiskit_experiments/characterization/t1_experiment.py b/qiskit_experiments/characterization/t1_experiment.py
@@ -68,6 +68,7 @@ def _run_analysis(
         amplitude_bounds=None,
         offset_bounds=None,
         plot=True,
+        ax=None,
     ) -> Tuple[AnalysisResult, None]:
         """
         Calculate T1
@@ -84,6 +85,7 @@ def _run_analysis(
             offset_bounds (list of two floats): Optional, lower bound and upper
                                                 bound to the offset
             plot (bool): Generator plot of exponential fit.
+            ax (AxesSubplot): Optional, axes to add figure to.
 
         Returns:
             The analysis result with the estimated T1

diff --git a/qiskit_experiments/composite/composite_analysis.py b/qiskit_experiments/composite/composite_analysis.py
@@ -46,7 +46,7 @@ def _run_analysis(self, experiment_data: CompositeExperimentData, **options):
 
         # Run analysis for sub-experiments
         for expr, expr_data in zip(
-            experiment_data._experiment._experiments, experiment_data._composite_expdata
+            experiment_data._experiment._experiments, experiment_data._components
         ):
             expr.run_analysis(expr_data, **options)