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.

Sign up for GitHub

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

Jump to bottom

Pipette transfer #151

Merged
merged 89 commits into from
Feb 7, 2017
Merged

Pipette transfer #151

Changes from 1 commit
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
c6e38fa
len(WellSeries) returns length of Wells contained
andySigler Dec 22, 2016
199f390
adds transfer() command and helper methods
andySigler Dec 22, 2016
80c13a5
adds gradient option to transfer
andySigler Dec 22, 2016
bb0cbf4
adds tests to Pipette.transfer()
andySigler Dec 26, 2016
0025f26
fixes bug when aspirate more volume than max_volume
andySigler Dec 26, 2016
72e01b5
adds helper methods to helpers.py
andySigler Dec 26, 2016
2aaa8f6
pylama
andySigler Dec 26, 2016
7bc0804
adds transfer test for linear gradient
andySigler Dec 26, 2016
199538f
pylama
andySigler Dec 26, 2016
efc6e82
returns tip if no trash attached to pipette
andySigler Dec 26, 2016
2aec640
transfer source/targets can take Placeables with children to iterate …
andySigler Dec 29, 2016
f6db9d8
adding special case where if using multi-channel and accessing WellSe…
andySigler Jan 4, 2017
051b896
Merge branch 'master' into pipette-transfer
andySigler Jan 4, 2017
e299c3e
pylama
andySigler Jan 4, 2017
994b923
tests multichannel transfer with WellSeries
andySigler Jan 4, 2017
44e070f
changes kwarg defaults and key names
andySigler Jan 6, 2017
a13450c
merges with master
andySigler Jan 6, 2017
79c35e4
Merge branch 'master' into pipette-transfer
andySigler Jan 9, 2017
d0270ea
fixes merge conflicts
andySigler Jan 9, 2017
b29e288
fixes tests
andySigler Jan 9, 2017
7ffa24a
adds tests
andySigler Jan 9, 2017
846e236
adds test
andySigler Jan 9, 2017
1365dca
handles Containers of length=1
andySigler Jan 9, 2017
eebd37b
refactors transfer to include consolidate and distribute commands
andySigler Jan 10, 2017
0857271
pylama
andySigler Jan 10, 2017
65a4cb6
adds tests for consolidate
andySigler Jan 10, 2017
84ac0a1
Merge branch 'master' into pipette-transfer
andySigler Jan 12, 2017
26a2a93
adds docstings
andySigler Jan 12, 2017
1c1c90f
adds more docstrings, comments
andySigler Jan 12, 2017
adf71b1
adds comments and organizes a bit
andySigler Jan 13, 2017
d00ba6e
adds mix_after and mix_before
andySigler Jan 13, 2017
ae6e22c
pylama
andySigler Jan 13, 2017
b7b0202
moves multichannel special case to helper method
andySigler Jan 13, 2017
ac35dfa
adds coverage to test
andySigler Jan 13, 2017
3b6da30
removes smoothie config file from repo
andySigler Jan 13, 2017
7a83414
containers with lenght=1 return list [container[0]]
andySigler Jan 18, 2017
922cb34
Merge branch 'master' into pipette-transfer
andySigler Jan 23, 2017
189a8ed
distribute/consolidate can take only 1 or 0 tips
andySigler Jan 23, 2017
9878345
setting kwarg defaults inside consolidate/distribute methods
andySigler Jan 23, 2017
8ca8007
does not drop tip if tips=0
andySigler Jan 23, 2017
3736958
updates tests
andySigler Jan 23, 2017
589d41c
Merge branch 'master' into pipette-transfer
andySigler Jan 23, 2017
c3ce245
Merge branch 'master' into pipette-transfer
andySigler Jan 30, 2017
115a13b
try and avoid small volumes occuring during carryover
andySigler Jan 31, 2017
5b20f24
Merge branch 'master' into pipette-transfer
andySigler Jan 31, 2017
25387ed
merge with master; fixed conflicts
andySigler Jan 31, 2017
13e8cff
adds tests for carryover volumes
andySigler Jan 31, 2017
91ac245
t
andySigler Jan 31, 2017
fa1f6fd
pylama
andySigler Jan 31, 2017
a397d64
adds test
andySigler Jan 31, 2017
86003a8
Merge branch 'master' into pipette-transfer
andySigler Jan 31, 2017
8648146
uses kwargs touch_tip and blow_out
andySigler Jan 31, 2017
eb8965a
adds support for container slices to accept strings for start and stop
andySigler Feb 4, 2017
d2ae7c5
adds Placeable.get_children_from_slice()
andySigler Feb 5, 2017
34279be
uses new method
andySigler Feb 5, 2017
d9a8a03
add Placeable.chain() and Placeable.group()
andySigler Feb 5, 2017
4cccf94
comment
andySigler Feb 5, 2017
5d3e42e
Placeable.chain() length defaults to length of container
andySigler Feb 5, 2017
63d7007
Placeable.well() return single well; Placeable.wells() returns list o…
andySigler Feb 5, 2017
c601162
refactors Placeable.get_name(); adds test for comparing WellSeries
andySigler Feb 5, 2017
0c9335d
methods return WellSeries instead of list
andySigler Feb 5, 2017
908ff60
undoes Placeable.get_name() refactor
andySigler Feb 5, 2017
5dc5a9d
.
andySigler Feb 5, 2017
6861802
typo
andySigler Feb 5, 2017
606f314
removes redudant methods between Placeable and WellSeries
andySigler Feb 5, 2017
28f293f
adds tests
andySigler Feb 5, 2017
eb6b34e
adds test for slices with negative step
andySigler Feb 5, 2017
b79208c
allows group() range() chain() to move in negative direction
andySigler Feb 5, 2017
3c2ba3a
refactors .chain()
andySigler Feb 5, 2017
734632f
add feature for using .chain() or .group() through calling Container …
andySigler Feb 5, 2017
1a98ded
adds access to Container.wells() through call instance
andySigler Feb 5, 2017
f971f4b
pylama
andySigler Feb 5, 2017
26d7308
cleans up parse_string a bit
andySigler Feb 5, 2017
fa37369
adds instance methods to WellSeries
andySigler Feb 5, 2017
25d79ad
multiple parsed argument on callable instrument, oh my
andySigler Feb 6, 2017
98aa16d
adds WellSeries.crop() and WellSeries.flatten()
andySigler Feb 6, 2017
d40435d
trim() and flatten() return new WellSeries
andySigler Feb 6, 2017
d79b8ba
adding blow_out to distribute
andySigler Feb 6, 2017
b87c856
tests Placeable.remove_child()
andySigler Feb 6, 2017
38e782a
includes blow_out commands while distributing with extra volume
andySigler Feb 6, 2017
054cf3a
Merge branch 'master' into container-slices-with-strings
andySigler Feb 6, 2017
c3fad5d
adds access to Placeable.range() through string syntax using ':'
andySigler Feb 6, 2017
e5e512a
Merge branch 'adds-test-to-placeable-remove-child' into pipette-transfer
andySigler Feb 6, 2017
9815092
sets kwarg trash to default to True
andySigler Feb 6, 2017
e252685
allows >3 args to consolidate and distribute
andySigler Feb 7, 2017
5fb8c13
tips kwargs is now new_tip='once'||'never'||'always'; repeater is now…
andySigler Feb 7, 2017
15846ef
adds tests
andySigler Feb 7, 2017
9db8a70
removes all features other than slicing with lists
andySigler Feb 7, 2017
9453e12
merge with slicing with strings branch
andySigler Feb 7, 2017
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
Prev Previous commit
Next Next commit
Merge branch 'master' into container-slices-with-strings
  • Loading branch information
@andySigler
andySigler committed Feb 6, 2017
commit 054cf3aa112f729ec29d1262f5ecdaf7921b4adb

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.