modification to abr8 printout

Opentrons · Nov 21, 2024 · c429df3 · c429df3
1 parent cb792f2
commit c429df3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/abr-testing/abr_testing/protocols/active_protocols/3_Tartrazine Protocol.py b/abr-testing/abr_testing/protocols/active_protocols/3_Tartrazine Protocol.py
@@ -106,7 +106,7 @@ def run(ctx: ProtocolContext) -> None:
             except ZeroDivisionError:
                 cv = 0.0
             cv_percent = cv * 100
-            cv_dict[sample_plate_name] = cv_percent
+            cv_dict[sample_plate_name] = {"CV": cv_percent, "Mean": avg, "SD": standard_deviation}
         msg = f"result: {result}"
         all_percent_error_dict[sample_plate_name] = percent_error_dict
         ctx.comment(msg=msg)
@@ -117,4 +117,4 @@ def run(ctx: ProtocolContext) -> None:
     # Print percent error dictionary
     ctx.comment("Percent Error: " + str(all_percent_error_dict))
     # Print cv dictionary
-    ctx.comment("CV: " + str(cv_dict))
+    ctx.comment("Plate Reader Result: " + str(cv_dict))
diff --git a/abr-testing/abr_testing/protocols/active_protocols/8_Illumina and Plate Reader.py b/abr-testing/abr_testing/protocols/active_protocols/8_Illumina and Plate Reader.py
@@ -73,6 +73,7 @@ def plate_reader_actions(
     protocol: ProtocolContext,
     plate_reader: AbsorbanceReaderContext,
     hellma_plate: Labware,
+    hellma_plate_name: str,
 ) -> None:
     """Plate reader single and multi wavelength readings."""
     wavelengths = [450, 650]
@@ -95,7 +96,7 @@ def plate_reader_actions(
     protocol.move_labware(hellma_plate, plate_reader, use_gripper=True)
     plate_reader.close_lid()
     result = plate_reader.read(str(datetime.now()))
-    msg = f"result: {result}"
+    msg = f"result {hellma_plate_name}: {result}"
     protocol.comment(msg=msg)
     plate_reader.open_lid()
     protocol.move_labware(hellma_plate, HELLMA_PLATE_SLOT, use_gripper=True)
@@ -107,6 +108,8 @@ def run(protocol: ProtocolContext) -> None:
     # LOAD PARAMETERS
     heater_shaker_speed = protocol.params.heater_shaker_speed  # type: ignore[attr-defined]
     dot_bottom = protocol.params.dot_bottom  # type: ignore[attr-defined]
+    plate_orientation = protocol.params.plate_orientation # type: ignore[attr-defined]
+    plate_name_str = "hellma_plate_" + str(plate_orientation)
     global p200_tips
     global p50_tips
     # WASTE BIN
@@ -182,7 +185,7 @@ def run(protocol: ProtocolContext) -> None:
     PPC = reagent_plate.wells_by_name()["A6"]
     EPM = reagent_plate.wells_by_name()["A7"]
     # Load Liquids
-    plate_reader_actions(protocol, plate_reader, hellma_plate)
+    plate_reader_actions(protocol, plate_reader, hellma_plate, plate_name_str)
 
     # tip and sample tracking
     if COLUMNS == 1:
@@ -948,4 +951,4 @@ def tipcheck() -> None:
                 p1000.return_tip() if TIP_TRASH is False else p1000.drop_tip()
                 p200_tips += 1
                 tipcheck()
-        plate_reader_actions(protocol, plate_reader, hellma_plate)
+        plate_reader_actions(protocol, plate_reader, hellma_plate, plate_name_str)