Merge pull request #4888 from Opentrons/fix-0b97ae_reagentupdate

edited reagent plate, add in variable plate type
Opentrons · Sep 13, 2023 · eb9b890 · eb9b890
2 parents c741c39 + f46b4e0
commit eb9b890
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 9 deletions.
diff --git a/protoBuilds/0b97ae-protocol-3B/0b97ae-protocol-3B.ot2.apiv2.py.json b/protoBuilds/0b97ae-protocol-3B/0b97ae-protocol-3B.ot2.apiv2.py.json
diff --git a/protoBuilds/0b97ae-protocol-3B/README.json b/protoBuilds/0b97ae-protocol-3B/README.json
@@ -6,7 +6,7 @@
         ]
     },
     "deck-setup": "\nWater Reservoir (slot 2):\n    Column 1: Nuclease Free Water\n    Column 2: Binding Buffer\n    Column 3 & 4: Ethanol\n    Column 10, 11 & 12: Empty for Supernatent Removal\nDiluted RNA Plate (slot 7 Temperature Module):\n    RNA Samples Starting Plate\nReagent Plate (Slot 10):\n    Column 1: MasterMix\n    Column 2: Magentic Beads",
-    "description": "This is Part 3 to the QIAseq FastSelect 5s, 16s, 23s Protocol. This protocol is used to perform the addition of samples with mastermix into a plate.\nPart 1 to this protocol is the normalization of samples.\nPart 2 to this protocol is the Fragementation.\nLinks:\n Part 1: Sample Normalization\n Part 2: QIAseq FastSelect 5s, 16s, 23s Fragmentation\n* Part 3: QIAseq FastSelect 5s, 16s, 23s Extraction",
+    "description": "This is Part 3 to the QIAseq FastSelect 5s, 16s, 23s Protocol. This protocol is used to perform the addition of samples with mastermix into a plate.\nPart 1 to this protocol is the normalization of samples.\nPart 2 to this protocol is the Fragementation.\nLinks:\n* Part 1: Sample Normalization\n* Part 2: QIAseq FastSelect 5s, 16s, 23s Fragmentation\n* Part 3: QIAseq FastSelect 5s, 16s, 23s Extraction",
     "internal": "0b97ae-protocol-3B",
     "labware": "\nPerkin Elmer 12 Reservoir 21000 \u00b5L\nApplied Biosystems Enduraplate 96 Aluminum Block 220 \u00b5L\nBio-Rad 96 Well Plate 200 \u00b5L PCR #hsp9601\nOpentrons 96 Filter Tip Rack 20 \u00b5L\nNEST 96 Deepwell Plate 2mL #503001\nOpentrons 96 Tip Rack 300 \u00b5L\nOpentrons 96 Well Aluminum Block with Bio-Rad Well Plate 200 \u00b5L\n",
     "markdown": {

diff --git a/protocols/0b97ae-protocol-3B/0b97ae-protocol-3B.ot2.apiv2.py b/protocols/0b97ae-protocol-3B/0b97ae-protocol-3B.ot2.apiv2.py
@@ -53,9 +53,28 @@ def create_thread(ctx, cancel_token):
 def run(ctx: protocol_api.ProtocolContext):
     """PROTOCOLS."""
     [
-     num_samples, vol_dna , flash, bead_timer] = get_values(  # noqa: F821 (<--- DO NOT REMOVE!)
-        "num_samples","vol_dna","flash","bead_timer")
+     num_samples, vol_dna , flash, bead_timer, reservoir, F_Plate, D_Plate, R_Plate] = get_values(  # noqa: F821 (<--- DO NOT REMOVE!)
+        "num_samples","vol_dna","flash","bead_timer","reservoir","final_plate","dilution_plate","reagent_plate")
     num_samples = int(num_samples)
+    if reservoir == 'perkinelmer':
+        res_labware = 'perkinelmer_12_reservoir_21000ul'
+    else:
+        res_labware = 'nest_12_reservoir_15ml'
+
+    if F_Plate == 'Biorad':
+        F_labware = 'opentrons_96_aluminumblock_biorad_wellplate_200ul'
+    else:
+        F_labware = 'appliedbiosystemsenduraplate_96_aluminumblock_220ul'
+
+    if D_Plate == 'Biorad':
+        D_labware = 'opentrons_96_aluminumblock_biorad_wellplate_200ul'
+    else:
+        D_labware = 'appliedbiosystemsenduraplate_96_aluminumblock_220ul'
+
+    if R_Plate == 'Biorad':
+        R_labware = 'biorad_96_wellplate_200ul_pcr'
+    else:
+        R_labware = 'appliedbiosystemsenduraplate_96_aluminumblock_220ul'
 
     'Global variables'
     TEST_MODE = False
@@ -83,13 +102,13 @@ def run(ctx: protocol_api.ProtocolContext):
 
     # load labware
     mag_plate = Mag_mod.load_labware('nest_96_wellplate_2ml_deep','Extraction Plate')
-    final_plate = tempdeck_1.load_labware('opentrons_96_aluminumblock_biorad_wellplate_200ul', #noqa: E501
+    final_plate = tempdeck_1.load_labware(F_labware, #noqa: E501
                                        'Reagent Plate')
-    Diluted_plate = tempdeck_2.load_labware('appliedbiosystemsenduraplate_96_aluminumblock_220ul',  # noqa: E501
+    Diluted_plate = tempdeck_2.load_labware(D_labware,  # noqa: E501
                                             'Diluted RNA plate')
-    water_res = ctx.load_labware('perkinelmer_12_reservoir_21000ul', 2,
+    water_res = ctx.load_labware(res_labware, 2,
                                  'Water reservoir')
-    Reagent_plate = ctx.load_labware('biorad_96_wellplate_200ul_pcr', '1')
+    Reagent_plate = ctx.load_labware(R_labware, '1')
 
     # load tipracks
     tips3 = [ctx.load_labware('opentrons_96_tiprack_300ul', slot)

diff --git a/protocols/0b97ae-protocol-3B/fields.json b/protocols/0b97ae-protocol-3B/fields.json
@@ -38,5 +38,41 @@
     "label": "Bead Timer?",
     "name": "bead_timer",
     "default": 6
+  },
+  {
+    "type": "dropDown",
+    "label": "Is the Reservoir PerkinElmer or Nest?",
+    "name": "reservoir",
+    "options": [
+      {"label": "perkinelmer", "value": "perkinelmer"},
+      {"label": "nest", "value": "nest"}
+    ]
+  },
+  {
+    "type": "dropDown",
+    "label": "Is the Final Plate Biorad or AppliedBio?",
+    "name": "final_plate",
+    "options": [
+      {"label": "Biorad", "value": "Biorad"},
+      {"label": "AppliedBio", "value": "AppliedBio"}
+    ]
+  },
+  {
+    "type": "dropDown",
+    "label": "Is the Diluted DNA Plate Biorad or AppliedBio?",
+    "name": "dilution_plate",
+    "options": [
+      {"label": "Biorad", "value": "Biorad"},
+      {"label": "AppliedBio", "value": "AppliedBio"}
+    ]
+  },
+  {
+    "type": "dropDown",
+    "label": "Is the Reagent Plate Biorad or AppliedBio?",
+    "name": "reagent_plate",
+    "options": [
+      {"label": "Biorad", "value": "Biorad"},
+      {"label": "AppliedBio", "value": "AppliedBio"}
+    ]
   }
 ]