Add more parameters to pandas export

Author: jenshnielsen

src/qcodes/dataset/exporters/export_to_pandas.py

@@ -23,7 +23,7 @@ def load_to_dataframe_dict(
         index = _generate_pandas_index(
             subdict, interdeps=interdeps, top_level_param_name=name
         )
-        dfs[name] = _data_to_dataframe(subdict, index)
+        dfs[name] = _data_to_dataframe(subdict, index, interdeps, name)
     return dfs
 
 
@@ -47,13 +47,16 @@ def load_to_concatenated_dataframe(
 
 
 def _data_to_dataframe(
-    data: Mapping[str, npt.NDArray], index: pd.Index | pd.MultiIndex | None
+    data: Mapping[str, npt.NDArray],
+    index: pd.Index | pd.MultiIndex | None,
+    interdeps: InterDependencies_,
+    dependent_parameter: str,
 ) -> pd.DataFrame:
     import pandas as pd
 
     if len(data) == 0:
         return pd.DataFrame()
-    dependent_col_name = next(iter(data.keys()))
+    dependent_col_name = dependent_parameter
     dependent_data = data[dependent_col_name]
     if dependent_data.dtype == np.dtype("O"):
         # ravel will not fully unpack a numpy array of arrays

src/qcodes/dataset/exporters/export_to_xarray.py

@@ -97,16 +97,29 @@ def _load_to_xarray_dataset_dict_no_metadata(
 
             if index is None:
                 xr_dataset: xr.Dataset = _data_to_dataframe(
-                    data=sub_dict, index=index
+                    data=sub_dict,
+                    index=index,
+                    interdeps=dataset.description.interdeps,
+                    dependent_parameter=name,
                 ).to_xarray()
                 xr_dataset_dict[name] = xr_dataset
             elif index_is_unique:
-                df = _data_to_dataframe(sub_dict, index)
+                df = _data_to_dataframe(
+                    sub_dict,
+                    index,
+                    interdeps=dataset.description.interdeps,
+                    dependent_parameter=name,
+                )
                 xr_dataset_dict[name] = _xarray_data_set_from_pandas_multi_index(
                     dataset, use_multi_index, name, df, index
                 )
             else:
-                df = _data_to_dataframe(sub_dict, index)
+                df = _data_to_dataframe(
+                    sub_dict,
+                    index,
+                    interdeps=dataset.description.interdeps,
+                    dependent_parameter=name,
+                )
                 xr_dataset_dict[name] = df.reset_index().to_xarray()
 
     return xr_dataset_dict