Skip to content

Commit 7dfff76

Browse files
Dagney CookeandySigler
Dagney Cooke
authored and
andySigler
committed
added alum-block-pcr-strips container (#148)
* added alum-block-pcr-strips container Added new container that matches the aluminum block pcr strips. * fixes test * adds new container from other PR * fixes -H tipracks * adds missing tip to 1000ul-H * gives trash-box origin-offset in middle of slot
1 parent e1814c1 commit 7dfff76

File tree

2 files changed

+91
-53
lines changed

2 files changed

+91
-53
lines changed

‎opentrons/config/containers/default-containers.json

Lines changed: 90 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,49 @@
11
{
22
"containers":{
3+
"alum-block-pcr-strips":{
4+
5+
"locations":{
6+
"A1":{"x":0, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
7+
"B1":{"x":9, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
8+
"C1":{"x":18, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
9+
"D1":{"x":27, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
10+
"E1":{"x":36, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
11+
"F1":{"x":45, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
12+
"G1":{"x":54, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
13+
"H1":{"x":63, "y":0, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
14+
"A2":{"x":0, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
15+
"B2":{"x":9, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
16+
"C2":{"x":18, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
17+
"D2":{"x":27, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
18+
"E2":{"x":36, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
19+
"F2":{"x":45, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
20+
"G2":{"x":54, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 },
21+
"H2":{"x":63, "y":117, "z":0, "depth":19.5, "diameter":6.4, "total-liquid-volume":280 }
22+
}
23+
},
324
"T75-flask":{
25+
"origin-offset":{
26+
"x":42.75,
27+
"y":63.875
28+
},
429
"locations":{
530
"A1":{"x":0,"y":0,"z":0,"depth":163,"diameter":25,"total-liquid-volume":75000}
631
}
732
},
833
"T25-flask":{
34+
"origin-offset":{
35+
"x":42.75,
36+
"y":63.875
37+
},
938
"locations":{
1039
"A1":{"x":0,"y":0,"z":0,"depth":99,"diameter":18,"total-liquid-volume":25000}
1140
}
1241
},
1342
"trash-box":{
1443
"origin-offset":{
15-
"x":0,
16-
"y":0
17-
},
44+
"x":42.75,
45+
"y":63.875
46+
},
1847
"locations":{
1948
"A1":{"x":0, "y":0, "z":0, "depth":40, "length":120, "width":90}
2049
}
@@ -277,98 +306,50 @@
277306
"B1":{"x":9,"y":0,"z":0,"depth":60, "diameter":6.4},
278307
"C1":{"x":18,"y":0,"z":0,"depth":60, "diameter":6.4},
279308
"D1":{"x":27,"y":0,"z":0,"depth":60, "diameter":6.4},
280-
"E1":{"x":36,"y":0,"z":0,"depth":60, "diameter":6.4},
281-
"F1":{"x":45,"y":0,"z":0,"depth":60, "diameter":6.4},
282-
"G1":{"x":54,"y":0,"z":0,"depth":60, "diameter":6.4},
283-
"H1":{"x":63,"y":0,"z":0,"depth":60, "diameter":6.4},
284309
"A2":{"x":0,"y":9,"z":0,"depth":60, "diameter":6.4},
285310
"B2":{"x":9,"y":9,"z":0,"depth":60, "diameter":6.4},
286311
"C2":{"x":18,"y":9,"z":0,"depth":60, "diameter":6.4},
287312
"D2":{"x":27,"y":9,"z":0,"depth":60, "diameter":6.4},
288-
"E2":{"x":36,"y":9,"z":0,"depth":60, "diameter":6.4},
289-
"F2":{"x":45,"y":9,"z":0,"depth":60, "diameter":6.4},
290-
"G2":{"x":54,"y":9,"z":0,"depth":60, "diameter":6.4},
291-
"H2":{"x":63,"y":9,"z":0,"depth":60, "diameter":6.4},
292313
"A3":{"x":0,"y":18,"z":0,"depth":60, "diameter":6.4},
293314
"B3":{"x":9,"y":18,"z":0,"depth":60, "diameter":6.4},
294315
"C3":{"x":18,"y":18,"z":0,"depth":60, "diameter":6.4},
295316
"D3":{"x":27,"y":18,"z":0,"depth":60, "diameter":6.4},
296-
"E3":{"x":36,"y":18,"z":0,"depth":60, "diameter":6.4},
297-
"F3":{"x":45,"y":18,"z":0,"depth":60, "diameter":6.4},
298-
"G3":{"x":54,"y":18,"z":0,"depth":60, "diameter":6.4},
299-
"H3":{"x":63,"y":18,"z":0,"depth":60, "diameter":6.4},
300317
"A4":{"x":0,"y":27,"z":0,"depth":60, "diameter":6.4},
301318
"B4":{"x":9,"y":27,"z":0,"depth":60, "diameter":6.4},
302319
"C4":{"x":18,"y":27,"z":0,"depth":60, "diameter":6.4},
303320
"D4":{"x":27,"y":27,"z":0,"depth":60, "diameter":6.4},
304-
"E4":{"x":36,"y":27,"z":0,"depth":60, "diameter":6.4},
305-
"F4":{"x":45,"y":27,"z":0,"depth":60, "diameter":6.4},
306-
"G4":{"x":54,"y":27,"z":0,"depth":60, "diameter":6.4},
307-
"H4":{"x":63,"y":27,"z":0,"depth":60, "diameter":6.4},
308321
"A5":{"x":0,"y":36,"z":0,"depth":60, "diameter":6.4},
309322
"B5":{"x":9,"y":36,"z":0,"depth":60, "diameter":6.4},
310323
"C5":{"x":18,"y":36,"z":0,"depth":60, "diameter":6.4},
311324
"D5":{"x":27,"y":36,"z":0,"depth":60, "diameter":6.4},
312-
"E5":{"x":36,"y":36,"z":0,"depth":60, "diameter":6.4},
313-
"F5":{"x":45,"y":36,"z":0,"depth":60, "diameter":6.4},
314-
"G5":{"x":54,"y":36,"z":0,"depth":60, "diameter":6.4},
315-
"H5":{"x":63,"y":36,"z":0,"depth":60, "diameter":6.4},
316325
"A6":{"x":0,"y":45,"z":0,"depth":60, "diameter":6.4},
317326
"B6":{"x":9,"y":45,"z":0,"depth":60, "diameter":6.4},
318327
"C6":{"x":18,"y":45,"z":0,"depth":60, "diameter":6.4},
319328
"D6":{"x":27,"y":45,"z":0,"depth":60, "diameter":6.4},
320-
"E6":{"x":36,"y":45,"z":0,"depth":60, "diameter":6.4},
321-
"F6":{"x":45,"y":45,"z":0,"depth":60, "diameter":6.4},
322-
"G6":{"x":54,"y":45,"z":0,"depth":60, "diameter":6.4},
323-
"H6":{"x":63,"y":45,"z":0,"depth":60, "diameter":6.4},
324329
"A7":{"x":0,"y":54,"z":0,"depth":60, "diameter":6.4},
325330
"B7":{"x":9,"y":54,"z":0,"depth":60, "diameter":6.4},
326331
"C7":{"x":18,"y":54,"z":0,"depth":60, "diameter":6.4},
327332
"D7":{"x":27,"y":54,"z":0,"depth":60, "diameter":6.4},
328-
"E7":{"x":36,"y":54,"z":0,"depth":60, "diameter":6.4},
329-
"F7":{"x":45,"y":54,"z":0,"depth":60, "diameter":6.4},
330-
"G7":{"x":54,"y":54,"z":0,"depth":60, "diameter":6.4},
331-
"H7":{"x":63,"y":54,"z":0,"depth":60, "diameter":6.4},
332333
"A8":{"x":0,"y":63,"z":0,"depth":60, "diameter":6.4},
333334
"B8":{"x":9,"y":63,"z":0,"depth":60, "diameter":6.4},
334335
"C8":{"x":18,"y":63,"z":0,"depth":60, "diameter":6.4},
335336
"D8":{"x":27,"y":63,"z":0,"depth":60, "diameter":6.4},
336-
"E8":{"x":36,"y":63,"z":0,"depth":60, "diameter":6.4},
337-
"F8":{"x":45,"y":63,"z":0,"depth":60, "diameter":6.4},
338-
"G8":{"x":54,"y":63,"z":0,"depth":60, "diameter":6.4},
339-
"H8":{"x":63,"y":63,"z":0,"depth":60, "diameter":6.4},
340337
"A9":{"x":0,"y":72,"z":0,"depth":60, "diameter":6.4},
341338
"B9":{"x":9,"y":72,"z":0,"depth":60, "diameter":6.4},
342339
"C9":{"x":18,"y":72,"z":0,"depth":60, "diameter":6.4},
343340
"D9":{"x":27,"y":72,"z":0,"depth":60, "diameter":6.4},
344-
"E9":{"x":36,"y":72,"z":0,"depth":60, "diameter":6.4},
345-
"F9":{"x":45,"y":72,"z":0,"depth":60, "diameter":6.4},
346-
"G9":{"x":54,"y":72,"z":0,"depth":60, "diameter":6.4},
347-
"H9":{"x":63,"y":72,"z":0,"depth":60, "diameter":6.4},
348341
"A10":{"x":0,"y":81,"z":0,"depth":60, "diameter":6.4},
349342
"B10":{"x":9,"y":81,"z":0,"depth":60, "diameter":6.4},
350343
"C10":{"x":18,"y":81,"z":0,"depth":60, "diameter":6.4},
351344
"D10":{"x":27,"y":81,"z":0,"depth":60, "diameter":6.4},
352-
"E10":{"x":36,"y":81,"z":0,"depth":60, "diameter":6.4},
353-
"F10":{"x":45,"y":81,"z":0,"depth":60, "diameter":6.4},
354-
"G10":{"x":54,"y":81,"z":0,"depth":60, "diameter":6.4},
355-
"H10":{"x":63,"y":81,"z":0,"depth":60, "diameter":6.4},
356345
"A11":{"x":0,"y":90,"z":0,"depth":60, "diameter":6.4},
357346
"B11":{"x":9,"y":90,"z":0,"depth":60, "diameter":6.4},
358347
"C11":{"x":18,"y":90,"z":0,"depth":60, "diameter":6.4},
359348
"D11":{"x":27,"y":90,"z":0,"depth":60, "diameter":6.4},
360-
"E11":{"x":36,"y":90,"z":0,"depth":60, "diameter":6.4},
361-
"F11":{"x":45,"y":90,"z":0,"depth":60, "diameter":6.4},
362-
"G11":{"x":54,"y":90,"z":0,"depth":60, "diameter":6.4},
363-
"H11":{"x":63,"y":90,"z":0,"depth":60, "diameter":6.4},
364349
"A12":{"x":0,"y":99,"z":0,"depth":60, "diameter":6.4},
365350
"B12":{"x":9,"y":99,"z":0,"depth":60, "diameter":6.4},
366351
"C12":{"x":18,"y":99,"z":0,"depth":60, "diameter":6.4},
367-
"D12":{"x":27,"y":99,"z":0,"depth":60, "diameter":6.4},
368-
"E12":{"x":36,"y":99,"z":0,"depth":60, "diameter":6.4},
369-
"F12":{"x":45,"y":99,"z":0,"depth":60, "diameter":6.4},
370-
"G12":{"x":54,"y":99,"z":0,"depth":60, "diameter":6.4},
371-
"H12":{"x":63,"y":99,"z":0,"depth":60, "diameter":6.4}
352+
"D12":{"x":27,"y":99,"z":0,"depth":60, "diameter":6.4}
372353
}
373354
},
374355

@@ -582,6 +563,63 @@
582563
}
583564
},
584565

566+
"tiprack-1000ul-H":{
567+
"origin-offset":{
568+
"x":11.24,
569+
"y":14.34
570+
},
571+
"locations":{
572+
"A1":{"x":0,"y":0,"z":0,"diameter":6.4, "depth":85.0},
573+
"B1":{"x":9,"y":0,"z":0,"diameter":6.4, "depth":85.0},
574+
"C1":{"x":18,"y":0,"z":0,"diameter":6.4, "depth":85.0},
575+
"D1":{"x":27,"y":0,"z":0,"diameter":6.4, "depth":85.0},
576+
"A2":{"x":0,"y":9,"z":0,"diameter":6.4, "depth":85.0},
577+
"B2":{"x":9,"y":9,"z":0,"diameter":6.4, "depth":85.0},
578+
"C2":{"x":18,"y":9,"z":0,"diameter":6.4, "depth":85.0},
579+
"D2":{"x":27,"y":9,"z":0,"diameter":6.4, "depth":85.0},
580+
"A3":{"x":0,"y":18,"z":0,"diameter":6.4, "depth":85.0},
581+
"B3":{"x":9,"y":18,"z":0,"diameter":6.4, "depth":85.0},
582+
"C3":{"x":18,"y":18,"z":0,"diameter":6.4, "depth":85.0},
583+
"D3":{"x":27,"y":18,"z":0,"diameter":6.4, "depth":85.0},
584+
"A4":{"x":0,"y":27,"z":0,"diameter":6.4, "depth":85.0},
585+
"B4":{"x":9,"y":27,"z":0,"diameter":6.4, "depth":85.0},
586+
"C4":{"x":18,"y":27,"z":0,"diameter":6.4, "depth":85.0},
587+
"D4":{"x":27,"y":27,"z":0,"diameter":6.4, "depth":85.0},
588+
"A5":{"x":0,"y":36,"z":0,"diameter":6.4, "depth":85.0},
589+
"B5":{"x":9,"y":36,"z":0,"diameter":6.4, "depth":85.0},
590+
"C5":{"x":18,"y":36,"z":0,"diameter":6.4, "depth":85.0},
591+
"D5":{"x":27,"y":36,"z":0,"diameter":6.4, "depth":85.0},
592+
"A6":{"x":0,"y":45,"z":0,"diameter":6.4, "depth":85.0},
593+
"B6":{"x":9,"y":45,"z":0,"diameter":6.4, "depth":85.0},
594+
"C6":{"x":18,"y":45,"z":0,"diameter":6.4, "depth":85.0},
595+
"D6":{"x":27,"y":45,"z":0,"diameter":6.4, "depth":85.0},
596+
"A7":{"x":0,"y":54,"z":0,"diameter":6.4, "depth":85.0},
597+
"B7":{"x":9,"y":54,"z":0,"diameter":6.4, "depth":85.0},
598+
"C7":{"x":18,"y":54,"z":0,"diameter":6.4, "depth":85.0},
599+
"D7":{"x":27,"y":54,"z":0,"diameter":6.4, "depth":85.0},
600+
"A8":{"x":0,"y":63,"z":0,"diameter":6.4, "depth":85.0},
601+
"B8":{"x":9,"y":63,"z":0,"diameter":6.4, "depth":85.0},
602+
"C8":{"x":18,"y":63,"z":0,"diameter":6.4, "depth":85.0},
603+
"D8":{"x":27,"y":63,"z":0,"diameter":6.4, "depth":85.0},
604+
"A9":{"x":0,"y":72,"z":0,"diameter":6.4, "depth":85.0},
605+
"B9":{"x":9,"y":72,"z":0,"diameter":6.4, "depth":85.0},
606+
"C9":{"x":18,"y":72,"z":0,"diameter":6.4, "depth":85.0},
607+
"D9":{"x":27,"y":72,"z":0,"diameter":6.4, "depth":85.0},
608+
"A10":{"x":0,"y":81,"z":0,"diameter":6.4, "depth":85.0},
609+
"B10":{"x":9,"y":81,"z":0,"diameter":6.4, "depth":85.0},
610+
"C10":{"x":18,"y":81,"z":0,"diameter":6.4, "depth":85.0},
611+
"D10":{"x":27,"y":81,"z":0,"diameter":6.4, "depth":85.0},
612+
"A11":{"x":0,"y":90,"z":0,"diameter":6.4, "depth":85.0},
613+
"B11":{"x":9,"y":90,"z":0,"diameter":6.4, "depth":85.0},
614+
"C11":{"x":18,"y":90,"z":0,"diameter":6.4, "depth":85.0},
615+
"D11":{"x":27,"y":90,"z":0,"diameter":6.4, "depth":85.0},
616+
"A12":{"x":0,"y":99,"z":0,"diameter":6.4, "depth":85.0},
617+
"B12":{"x":9,"y":99,"z":0,"diameter":6.4, "depth":85.0},
618+
"C12":{"x":18,"y":99,"z":0,"diameter":6.4, "depth":85.0},
619+
"D12":{"x":27,"y":99,"z":0,"diameter":6.4, "depth":85.0}
620+
}
621+
},
622+
585623
"tiprack-1000ul-chem":{
586624
"locations":{
587625
"A1":{"x":0,"y":0,"z":0 , "diameter":10, "depth":85.0},

‎tests/opentrons/containers/test_persisted_containers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def test_load_persisted_container(self):
7777
def test_load_all_persisted_containers(self):
7878
all_persisted_containers = \
7979
persisted_containers.load_all_persisted_containers()
80-
self.assertEqual(len(all_persisted_containers), 30)
80+
self.assertEqual(len(all_persisted_containers), 32)
8181

8282
def test_create_container_obj_from_dict(self):
8383
container_data = """{

0 commit comments

Comments
 (0)