Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(Release): 2024-07-12 #5070

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions data/data/fields.csv
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,6 @@ csv3_samp,1
csv3_urea,1
csv_aq,1
csv_buff,1
csv_factors,1
csv_file,2
csv_file_1,1
csv_file_2,1
Expand Down Expand Up @@ -1202,7 +1201,7 @@ relative_height,1
remove_empty_racks,1
remove_tube_vol,1
replenish_tips_manually,1
reps_mix,2
reps_mix,1
res,2
res12_type,1
res1_type,1
Expand Down Expand Up @@ -1393,6 +1392,7 @@ start_buff_vol,1
start_col,2
start_column,1
start_index_tip,1
start_place,1
start_tip,3
start_tip_p20,2
start_tip_p300,2
Expand Down Expand Up @@ -1602,7 +1602,6 @@ twelve_well_resv_lname,1
type_matrix,1
type_molecule,1
type_pip,2
type_pipette_small,1
type_sample_rack,1
type_tc,1
udi_start_col,1
Expand Down Expand Up @@ -1668,9 +1667,8 @@ vol_ic,1
vol_initial,1
vol_lys_buffer,1
vol_lysis_mix,1
vol_media_tubes,1
vol_meoh,1
vol_mix,2
vol_mix,1
vol_mm,3
vol_mobile_phase,1
vol_mq,1
Expand Down
29 changes: 28 additions & 1 deletion protoBuilds/039ecb/1_end_prep.ot2.apiv2.py.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions protoBuilds/4a0be6/4a0be6.ot2.apiv2.py.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"content": "import math\nfrom opentrons.protocol_api.labware import Well\n\nmetadata = {\n 'protocolName': 'Tube Filling',\n 'author': 'Opentrons <[email protected]>',\n 'source': 'Custom Protocol Request',\n 'apiLevel': '2.11'\n}\n\n\ndef run(protocol):\n [transferVol, tubeRacks, tubeType, numRacks, srcType, srcVol,\n pipType, pipMnt, startTip, dispMode, touchTip] = get_values( # noqa: F821\n 'transferVol', 'tubeRacks', 'tubeType', 'numRacks', 'srcType', 'srcVol',\n 'pipType', 'pipMnt', 'startTip', 'dispMode', 'touchTip')\n\n # Load labware and pipettes\n\n tipNum = pipType.split('_')[0][1:]\n tipNum = '300' if tipNum == '50' else tipNum\n tipType = f'opentrons_96_tiprack_{tipNum}ul'\n tips = [protocol.load_labware(tipType, '11')]\n pip = protocol.load_instrument(pipType, pipMnt, tip_racks=tips)\n\n firstTip = startTip[0].upper()+str(int(startTip[1:]))\n pip.starting_tip = tips[0][firstTip]\n\n srcLabware = protocol.load_labware(srcType, '1')\n\n destRacks = [\n protocol.load_labware(tubeRacks+tubeType, slot) for slot in range(\n 2, 2+numRacks)]\n\n # Functions and Class creation\n class WellH(Well):\n def __init__(self, well, min_height=5, comp_coeff=1.15,\n current_volume=0):\n super().__init__(well._impl)\n self.well = well\n self.min_height = min_height\n self.comp_coeff = comp_coeff\n self.current_volume = current_volume\n if self.diameter is not None:\n self.radius = self.diameter/2\n cse = math.pi*(self.radius**2)\n elif self.length is not None:\n cse = self.length*self.width\n self.height = (\n current_volume/cse) - (0.2*pip._tip_racks[0].wells()[0].depth)\n if self.height < min_height:\n self.height = min_height\n elif self.height > well.parent.highest_z:\n raise Exception(\"\"\"Specified liquid volume\n can not exceed the height of the labware.\"\"\")\n\n def height_dec(self, vol):\n if self.diameter is not None:\n cse = math.pi*(self.radius**2)\n elif self.length is not None:\n cse = self.length*self.width\n dh = (vol/cse)*self.comp_coeff\n if self.height - dh > self.min_height:\n self.height = self.height - dh\n else:\n self.height = self.min_height\n if self.current_volume - vol > 0:\n self.current_volume = self.current_volume - vol\n else:\n self.current_volume = 0\n return(self.well.bottom(self.height))\n\n def height_inc(self, vol, top=False):\n if self.diameter is not None:\n cse = math.pi*(self.radius**2)\n elif self.length is not None:\n cse = self.length*self.width\n ih = (vol/cse)*self.comp_coeff\n if self.height < self.min_height:\n self.height = self.min_height\n if self.height + ih < self.depth:\n self.height = self.height + ih\n else:\n self.height = self.depth\n self.current_volume += vol\n if top is False:\n return(self.well.bottom(self.height))\n else:\n return(self.well.top())\n\n def yield_groups(list, num):\n \"\"\"\n yield lists based on number of items\n \"\"\"\n for i in range(0, len(list), num):\n yield list[i:i+num]\n\n # get number of distributes pipette can handle\n distribute_num = pip.max_volume // transferVol\n if distribute_num < 1:\n # if transfer volume is greater than pipette max volume,\n # use Transfer mode\n dispMode = 'Transfer'\n\n # create source location with WellH\n source = WellH(\n srcLabware.wells()[0], min_height=3, current_volume=srcVol*1000)\n\n # Protocol: Tube filling\n pip.pick_up_tip()\n all_wells = [well for tuberack in destRacks for well in tuberack.wells()]\n if dispMode == 'Transfer':\n for dest in all_wells:\n pip.transfer(\n transferVol, source.height_dec(transferVol), dest,\n touch_tip=touchTip, new_tip='never')\n else:\n well_groups = list(yield_groups(all_wells, int(distribute_num)))\n for wells in well_groups:\n pip.distribute(\n transferVol, source.height_dec(transferVol), wells,\n blow_out=source, touch_tip=touchTip, new_tip='never')\n pip.drop_tip()\n",
"content": "import math\nfrom opentrons.protocol_api.labware import Well\n\nfrom opentrons import APIVersion\n\nmetadata = {\n 'protocolName': 'Tube Filling',\n 'author': 'Opentrons <[email protected]>',\n 'source': 'Custom Protocol Request',\n 'apiLevel': '2.13'\n}\n\n\ndef run(protocol):\n [transferVol, tubeRacks, tubeType, numRacks, srcType, srcVol,\n pipType, pipMnt, startTip, dispMode, touchTip] = get_values( # noqa: F821\n 'transferVol', 'tubeRacks', 'tubeType', 'numRacks', 'srcType', 'srcVol',\n 'pipType', 'pipMnt', 'startTip', 'dispMode', 'touchTip')\n\n # Load labware and pipettes\n\n tipNum = pipType.split('_')[0][1:]\n tipNum = '300' if tipNum == '50' else tipNum\n tipType = f'opentrons_96_tiprack_{tipNum}ul'\n tips = [protocol.load_labware(tipType, '11')]\n pip = protocol.load_instrument(pipType, pipMnt, tip_racks=tips)\n\n firstTip = startTip[0].upper()+str(int(startTip[1:]))\n pip.starting_tip = tips[0][firstTip]\n\n srcLabware = protocol.load_labware(srcType, '1')\n\n destRacks = [\n protocol.load_labware(tubeRacks+tubeType, slot) for slot in range(\n 2, 2+numRacks)]\n\n # Functions and Class creation\n if not protocol.is_simulating:\n class WellH(Well):\n def __init__(self, well, height=0, min_height=5, comp_coeff=1.15,\n current_volume=0):\n # Change one is that we deprecated well._impl\n super().__init__(well.parent, well._core, APIVersion(2, 13))\n self.well = well\n self.height = height\n self.min_height = min_height\n self.comp_coeff = comp_coeff\n self.radius = self.diameter / 2\n self.current_volume = current_volume\n\n def height_dec(self, vol):\n dh = (vol / (math.pi * (self.radius ** 2))) * self.comp_coeff\n if self.height - dh > self.min_height:\n self.height = self.height - dh\n else:\n self.height = self.min_height\n if self.current_volume - vol > 0:\n self.current_volume = self.current_volume - vol\n else:\n self.current_volume = 0\n return (self.well.bottom(self.height))\n\n def height_inc(self, vol):\n dh = (vol / (math.pi * (self.radius ** 2))) * self.comp_coeff\n if self.height + dh < self.depth:\n self.height = self.height + dh\n else:\n self.height = self.depth\n self.current_volume += vol\n return (self.well.bottom(self.height + 20))\n\n def yield_groups(list, num):\n \"\"\"\n yield lists based on number of items\n \"\"\"\n for i in range(0, len(list), num):\n yield list[i:i+num]\n\n # get number of distributes pipette can handle\n distribute_num = pip.max_volume // transferVol\n if distribute_num < 1:\n # if transfer volume is greater than pipette max volume,\n # use Transfer mode\n dispMode = 'Transfer'\n\n # create source location with WellH\n source = WellH(\n srcLabware.wells()[0], min_height=3, current_volume=srcVol*1000)\n\n # Protocol: Tube filling\n pip.pick_up_tip()\n all_wells = [well for tuberack in destRacks\n for well in tuberack.wells()]\n if dispMode == 'Transfer':\n for dest in all_wells:\n pip.transfer(\n transferVol, source.height_dec(transferVol), dest,\n touch_tip=touchTip, new_tip='never')\n else:\n well_groups = list(yield_groups(all_wells, int(distribute_num)))\n for wells in well_groups:\n pip.distribute(\n transferVol, source.height_dec(transferVol), wells,\n blow_out=source, touch_tip=touchTip, new_tip='never')\n pip.drop_tip()\n",
"custom_labware_defs": [
{
"brand": {
Expand Down Expand Up @@ -3551,7 +3551,7 @@
}
],
"metadata": {
"apiLevel": "2.11",
"apiLevel": "2.13",
"author": "Opentrons <[email protected]>",
"protocolName": "Tube Filling",
"source": "Custom Protocol Request"
Expand Down
Loading
Loading