Merge branch 'master' into fix/validate_paramspec_input_infered

microsoft · Feb 2, 2019 · d1a9e21 · d1a9e21
2 parents 323fd88 + 1743600
commit d1a9e21
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/qcodes/dataset/legacy_import.py b/qcodes/dataset/legacy_import.py
@@ -19,8 +19,8 @@ def setup_measurement(dataset: OldDataSet) -> Measurement:
         if array.is_setpoint:
             setarrays = None
         else:
-            setarrays = [setarray.name for setarray in array.set_arrays]
-        meas.register_custom_parameter(name=array.name,
+            setarrays = [setarray.array_id for setarray in array.set_arrays]
+        meas.register_custom_parameter(name=array.array_id,
                                        label=array.label,
                                        unit=array.unit,
                                        setpoints = setarrays
@@ -33,13 +33,13 @@ def store_array_to_database(datasaver, array):
     if dims == 2:
         for index1, i in enumerate(array.set_arrays[0]):
             for index2, j in enumerate(array.set_arrays[1][index1]):
-                datasaver.add_result((array.set_arrays[0].name, i),
-                                     (array.set_arrays[1].name, j),
-                                     (array.name, array[index1,index2]))
+                datasaver.add_result((array.set_arrays[0].array_id, i),
+                                     (array.set_arrays[1].array_id, j),
+                                     (array.array_id, array[index1,index2]))
     elif dims == 1:
         for index, i in enumerate(array.set_arrays[0]):
-            datasaver.add_result((array.set_arrays[0].name, i),
-                                 (array.name, array[index]))
+            datasaver.add_result((array.set_arrays[0].array_id, i),
+                                 (array.array_id, array[index]))
     else:
         raise NotImplementedError('The exporter only currently handles 1 and 2 Dimentional data')
     return datasaver.run_id
@@ -52,14 +52,14 @@ def store_array_to_database_alt(meas, array):
         with meas.run() as datasaver:
             for index1, i in enumerate(array.set_arrays[0]):
                 outer_data[:] = i
-                datasaver.add_result((array.set_arrays[0].name, outer_data),
-                                     (array.set_arrays[1].name, array.set_arrays[1][index1,:]),
-                                     (array.name, array[index1,:]))
+                datasaver.add_result((array.set_arrays[0].array_id, outer_data),
+                                     (array.set_arrays[1].array_id, array.set_arrays[1][index1,:]),
+                                     (array.array_id, array[index1,:]))
     elif dims == 1:
         with meas.run() as datasaver:
             for index, i in enumerate(array.set_arrays[0]):
-                datasaver.add_result((array.set_arrays[0].name, i),
-                                     (array.name, array[index]))
+                datasaver.add_result((array.set_arrays[0].array_id, i),
+                                     (array.array_id, array[index]))
     else:
         raise NotImplementedError('The exporter only currently handles 1 and 2 Dimentional data')
     return datasaver.run_id

diff --git a/qcodes/tests/dataset/test_measurement_context_manager.py b/qcodes/tests/dataset/test_measurement_context_manager.py
@@ -1554,12 +1554,12 @@ def test_load_legacy_files_2D():
     run_ids = import_dat_file(full_location)
     run_id = run_ids[0]
     data = load_by_id(run_id)
-    assert data.parameters == 'ch1,ch2,voltage'
+    assert data.parameters == 'dac_ch1_set,dac_ch2_set,dmm_voltage'
     assert data.number_of_results == 36
-    expected_names = ['ch1', 'ch2', 'voltage']
+    expected_names = ['dac_ch1_set', 'dac_ch2_set', 'dmm_voltage']
     expected_labels = ['Gate ch1', 'Gate ch2', 'Gate voltage']
     expected_units = ['V', 'V', 'V']
-    expected_depends_on = ['', '', 'ch1, ch2']
+    expected_depends_on = ['', '', 'dac_ch1_set, dac_ch2_set']
     for i, parameter in enumerate(data.get_parameters()):
         assert parameter.name == expected_names[i]
         assert parameter.label == expected_labels[i]
@@ -1580,12 +1580,12 @@ def test_load_legacy_files_1D():
     run_ids = import_dat_file(full_location)
     run_id = run_ids[0]
     data = load_by_id(run_id)
-    assert data.parameters == 'ch1,voltage'
+    assert data.parameters == 'dac_ch1_set,dmm_voltage'
     assert data.number_of_results == 201
-    expected_names = ['ch1', 'voltage']
+    expected_names = ['dac_ch1_set', 'dmm_voltage']
     expected_labels = ['Gate ch1', 'Gate voltage']
     expected_units = ['V', 'V']
-    expected_depends_on = ['', 'ch1']
+    expected_depends_on = ['', 'dac_ch1_set']
     for i, parameter in enumerate(data.get_parameters()):
         assert parameter.name == expected_names[i]
         assert parameter.label == expected_labels[i]