-
Notifications
You must be signed in to change notification settings - Fork 122
Add agilent_96_wellplate_150uL_Vb #738
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
Merged
Merged
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
3e57a69
add
fderop 0fb4828
revert
fderop c7f75a8
correct
fderop b4bb324
format
rickwierenga de56142
add deprecation warning for agilent_96_wellplate_150uL_Ub
rickwierenga 69859d5
revert dz
rickwierenga 0a1a8d5
update docs
rickwierenga e469313
type
rickwierenga File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -434,6 +434,33 @@ def calculate_liquid_height_container_1segment_round_fbottom( | |
| return liquid_height | ||
|
|
||
|
|
||
| def calculate_liquid_height_container_1segment_round_vbottom( | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. hard to believe that there was no existing v-bottom well calculator? |
||
| d: float, h_pyramid: float, liquid_volume: float | ||
| ) -> float: | ||
| """Calculate the height of liquid in a container with a cylindrical pyramid (cone) shape. | ||
|
|
||
| Parameters: | ||
| d: The diameter of the base of the cone in mm. | ||
| h_pyramid: The height of the cone in mm. | ||
| liquid_volume: The volume of the liquid in the container in cubic millimeters. | ||
|
|
||
| Returns: | ||
| The height of the liquid in the container in mm. | ||
| """ | ||
| r = d / 2 | ||
| max_volume = (1 / 3) * math.pi * r**2 * h_pyramid | ||
|
|
||
| if liquid_volume > max_volume: | ||
| raise ValueError( | ||
| """WARNING: Liquid overflow detected; | ||
| check your labware definition and/or that you are using the right labware.""" | ||
| ) | ||
|
|
||
| scale_factor = (liquid_volume / max_volume) ** (1 / 3) | ||
| liquid_height = scale_factor * h_pyramid | ||
| return liquid_height | ||
|
|
||
|
|
||
| def calculate_liquid_volume_container_1segment_round_fbottom( | ||
| d: float, h_cylinder: float, liquid_height: float | ||
| ) -> float: | ||
|
|
@@ -458,6 +485,33 @@ def calculate_liquid_volume_container_1segment_round_fbottom( | |
| return cylinder_liquid_volume | ||
|
|
||
|
|
||
| def calculate_liquid_volume_container_1segment_round_vbottom( | ||
| d: float, h_pyramid: float, liquid_height: float | ||
| ) -> float: | ||
| """Calculate the volume of liquid in a container with a cylindrical pyramid (cone) shape. | ||
|
|
||
| Parameters: | ||
| d: The diameter of the base of the cone in mm. | ||
| h_pyramid: The height of the cone in mm. | ||
| liquid_height: The height of the liquid in the container in mm. | ||
|
|
||
| Returns: | ||
| The volume of the liquid in cubic millimeters. | ||
| """ | ||
| r = d / 2 | ||
| if liquid_height > h_pyramid: | ||
| raise ValueError( | ||
| """WARNING: Liquid overflow detected; | ||
| check your labware definition and/or that you are using the right labware.""" | ||
| ) | ||
|
|
||
| scale_factor = liquid_height / h_pyramid | ||
| liquid_volume = (1 / 3) * math.pi * r**2 * h_pyramid * (scale_factor**3) | ||
| return liquid_volume | ||
|
|
||
|
|
||
|
|
||
|
|
||
| ### Example of usage using a lambda function: | ||
| # def Rectangular_Reservoir(name: str) -> Plate: | ||
| # """ An 8 well reservoir with a 30mL volume. """ | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
which spec? please link it
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I came to the conclusion that the old definition was simply wrong. There is no
Ubof that type, onlyVb, and the linked spec sheet, PLR dimensions, and part number match theVb. don't think depreciation func is necessary for this correction.