changed metadata sample to sample_name

spc-group · Nov 4, 2024 · 085e55b · 085e55b
1 parent 605a085
commit 085e55b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/firefly/plans/regions_display.py b/src/firefly/plans/regions_display.py
@@ -206,7 +206,7 @@ def get_scan_parameters(self):
     def get_meta_data(self):
         # Get meta data info
         md = {
-            "sample": self.ui.lineEdit_sample.text(),
+            "sample_name": self.ui.lineEdit_sample.text(),
             "purpose": self.ui.lineEdit_purpose.text(),
             "notes": self.ui.textEdit_notes.toPlainText(),
         }

diff --git a/src/firefly/plans/xafs_scan.py b/src/firefly/plans/xafs_scan.py
@@ -477,7 +477,7 @@ def queue_plan(self, *args, **kwargs):
         detectors = self.ui.detectors_list.selected_detectors()
         repeat_scan_num = int(self.ui.spinBox_repeat_scan_num.value())
         md = {
-            "sample": self.ui.lineEdit_sample.text(),
+            "sample_name": self.ui.lineEdit_sample.text(),
             "purpose": self.ui.lineEdit_purpose.text(),
             "is_standard": self.ui.checkBox_is_standard.isChecked(),
             "notes": self.ui.textEdit_notes.toPlainText(),

diff --git a/src/firefly/tests/test_grid_scan_window.py b/src/firefly/tests/test_grid_scan_window.py
@@ -98,7 +98,7 @@ async def test_grid_scan_plan_queued(display, qtbot, sim_registry, ion_chamber):
         111.0,
         5,
         snake_axes=["sync_motor_2"],
-        md={"sample": "sam", "purpose": "test", "notes": "notes"},
+        md={"sample_name": "sam", "purpose": "test", "notes": "notes"},
     )
 
     def check_item(item):

diff --git a/src/firefly/tests/test_line_scan_window.py b/src/firefly/tests/test_line_scan_window.py
@@ -108,7 +108,7 @@ async def test_line_scan_plan_queued(qtbot, display):
         2.0,
         222.0,
         num=10,
-        md={"sample": "sam", "purpose": "test", "notes": "notes"},
+        md={"sample_name": "sam", "purpose": "test", "notes": "notes"},
     )
 
     def check_item(item):

diff --git a/src/firefly/tests/test_xafs_scan.py b/src/firefly/tests/test_xafs_scan.py
@@ -119,7 +119,7 @@ def test_xafs_scan_plan_queued_energies(display, qtbot):
         E0=11500.8,
         detectors=["vortex_me4", "I0"],
         md={
-            "sample": "sam",
+            "sample_name": "sam",
             "purpose": "test",
             "is_standard": True,
             "notes": "sam_notes",
@@ -220,7 +220,7 @@ def test_xafs_scan_plan_queued_energies_k_mixed(qtbot, display):
         E0=11500.8,
         detectors=["vortex_me4", "I0"],
         md={
-            "sample": "sam",
+            "sample_name": "sam",
             "is_standard": False,
             "notes": "sam_notes",
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -108,7 +108,7 @@ async def test_line_scan_plan_queued(qtbot, display): @@
 .0,
 .0,
             num=10,
-            md={"sample": "sam", "purpose": "test", "notes": "notes"},
+            md={"sample_name": "sam", "purpose": "test", "notes": "notes"},
         )
         def check_item(item):
@@ Expand Down @@