add the rest of the defs that we have

Opentrons · Oct 29, 2024 · bcaf976 · bcaf976
1 parent 821a21d
commit bcaf976
Show file tree

Hide file tree

Showing 17 changed files with 426 additions and 39 deletions.
diff --git a/shared-data/labware/definitions/3/axygen_1_reservoir_90ml/2.json b/shared-data/labware/definitions/3/axygen_1_reservoir_90ml/2.json
@@ -56,7 +56,17 @@
   },
   "innerLabwareGeometry": {
     "a": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "cuboidal",
+          "topXDimension": 106.8,
+          "topYDimension": 70.5,
+          "bottomXDimension": 106.4,
+          "bottomYDimension": 70,
+          "topHeight": 12.42,
+          "bottomHeight": 0.0
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/biorad_384_wellplate_50ul/3.json b/shared-data/labware/definitions/3/biorad_384_wellplate_50ul/3.json
@@ -4714,7 +4714,28 @@
   },
   "innerLabwareGeometry": {
     "a": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 0.94,
+          "topHeight": 0.35,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 1.46,
+          "topDiameter": 3,
+          "topHeight": 5.35,
+          "bottomHeight": 0.35
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 3,
+          "topDiameter": 3.1,
+          "topHeight": 9.35,
+          "bottomHeight": 5.35
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/nest_96_wellplate_100ul_pcr_full_skirt/3.json b/shared-data/labware/definitions/3/nest_96_wellplate_100ul_pcr_full_skirt/3.json
@@ -1145,8 +1145,8 @@
           "shape": "conical",
           "bottomDiameter": 2.16,
           "topDiameter": 5.26,
-          "topHeight": 0.2,
-          "bottomHeight": 9.89
+          "topHeight": 9.89,
+          "bottomHeight": 0.2
         },
         {
           "shape": "conical",

diff --git a/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json b/shared-data/labware/definitions/3/opentrons_10_tuberack_falcon_4x50ml_6x15ml_conical/2.json
@@ -94,7 +94,7 @@
       "x": 71.38,
       "y": 60.25,
       "z": 7.3,
-      "geometryDefinitionId": "a"
+      "geometryDefinitionId": "b"
     },
     "B3": {
       "totalLiquidVolume": 50000,
@@ -104,7 +104,7 @@
       "x": 71.38,
       "y": 25.25,
       "z": 7.3,
-      "geometryDefinitionId": "a"
+      "geometryDefinitionId": "b"
     },
     "A4": {
       "totalLiquidVolume": 50000,
@@ -114,7 +114,7 @@
       "x": 106.38,
       "y": 60.25,
       "z": 7.3,
-      "geometryDefinitionId": "a"
+      "geometryDefinitionId": "b"
     },
     "B4": {
       "totalLiquidVolume": 50000,
@@ -124,7 +124,7 @@
       "x": 106.38,
       "y": 25.25,
       "z": 7.3,
-      "geometryDefinitionId": "a"
+      "geometryDefinitionId": "b"
     }
   },
   "brand": {
@@ -173,7 +173,60 @@
   },
   "innerLabwareGeometry": {
     "a": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 2.9,
+          "topHeight": 0.8,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 4,
+          "topDiameter": 13.5,
+          "topHeight": 20.7,
+          "bottomHeight": 0.8
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 13.5,
+          "topDiameter": 14.5,
+          "topHeight": 108.6,
+          "bottomHeight": 20.7
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 14.5,
+          "topDiameter": 14.7,
+          "topHeight": 118.2,
+          "bottomHeight": 108.6
+        }
+      ]
+    },
+    "b": {
+      "sections": [
+        {
+          "shape": "conical",
+          "bottomDiameter": 6.15,
+          "topDiameter": 26.18,
+          "topHeight": 14.3,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 26.18,
+          "topDiameter": 27.52,
+          "topHeight": 100.65,
+          "bottomHeight": 14.3
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 27.52,
+          "topDiameter": 27.81,
+          "topHeight": 112.85,
+          "bottomHeight": 100.65
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/opentrons_10_tuberack_nest_4x50ml_6x15ml_conical/2.json b/shared-data/labware/definitions/3/opentrons_10_tuberack_nest_4x50ml_6x15ml_conical/2.json
@@ -8,7 +8,7 @@
       "x": 13.88,
       "y": 67.75,
       "z": 6.85,
-      "geometryDefinitionId": "15mLConicalWell"
+      "geometryDefinitionId": "a"
     },
     "B1": {
       "totalLiquidVolume": 15000,
@@ -18,7 +18,7 @@
       "x": 13.88,
       "y": 42.75,
       "z": 6.85,
-      "geometryDefinitionId": "15mLConicalWell"
+      "geometryDefinitionId": "a"
     },
     "C1": {
       "totalLiquidVolume": 15000,
@@ -28,7 +28,7 @@
       "x": 13.88,
       "y": 17.75,
       "z": 6.85,
-      "geometryDefinitionId": "15mLConicalWell"
+      "geometryDefinitionId": "a"
     },
     "A2": {
       "totalLiquidVolume": 15000,
@@ -38,7 +38,7 @@
       "x": 38.88,
       "y": 67.75,
       "z": 6.85,
-      "geometryDefinitionId": "15mLConicalWell"
+      "geometryDefinitionId": "a"
     },
     "B2": {
       "totalLiquidVolume": 15000,
@@ -48,7 +48,7 @@
       "x": 38.88,
       "y": 42.75,
       "z": 6.85,
-      "geometryDefinitionId": "15mLConicalWell"
+      "geometryDefinitionId": "a"
     },
     "C2": {
       "totalLiquidVolume": 15000,
@@ -58,7 +58,7 @@
       "x": 38.88,
       "y": 17.75,
       "z": 6.85,
-      "geometryDefinitionId": "15mLConicalWell"
+      "geometryDefinitionId": "a"
     },
     "A3": {
       "totalLiquidVolume": 50000,
@@ -68,7 +68,7 @@
       "x": 71.38,
       "y": 60.25,
       "z": 7.3,
-      "geometryDefinitionId": "50mLConicalWell"
+      "geometryDefinitionId": "b"
     },
     "B3": {
       "totalLiquidVolume": 50000,
@@ -78,7 +78,7 @@
       "x": 71.38,
       "y": 25.25,
       "z": 7.3,
-      "geometryDefinitionId": "50mLConicalWell"
+      "geometryDefinitionId": "b"
     },
     "A4": {
       "totalLiquidVolume": 50000,
@@ -88,7 +88,7 @@
       "x": 106.38,
       "y": 60.25,
       "z": 7.3,
-      "geometryDefinitionId": "50mLConicalWell"
+      "geometryDefinitionId": "b"
     },
     "B4": {
       "totalLiquidVolume": 50000,
@@ -98,7 +98,7 @@
       "x": 106.38,
       "y": 25.25,
       "z": 7.3,
-      "geometryDefinitionId": "50mLConicalWell"
+      "geometryDefinitionId": "b"
     }
   },
   "groups": [
@@ -168,7 +168,7 @@
     "z": 0
   },
   "innerLabwareGeometry": {
-    "15mLConicalWell": {
+    "a": {
       "sections": [
         {
           "shape": "conical",
@@ -193,7 +193,7 @@
         }
       ]
     },
-    "50mLConicalWell": {
+    "b": {
       "sections": [
         {
           "shape": "conical",

diff --git a/shared-data/labware/definitions/3/opentrons_15_tuberack_falcon_15ml_conical/2.json b/shared-data/labware/definitions/3/opentrons_15_tuberack_falcon_15ml_conical/2.json
@@ -225,7 +225,35 @@
   },
   "innerLabwareGeometry": {
     "a": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 2.9,
+          "topHeight": 0.8,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 4,
+          "topDiameter": 13.5,
+          "topHeight": 20.7,
+          "bottomHeight": 0.8
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 13.5,
+          "topDiameter": 14.5,
+          "topHeight": 108.6,
+          "bottomHeight": 20.7
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 14.5,
+          "topDiameter": 14.7,
+          "topHeight": 118.2,
+          "bottomHeight": 108.6
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/opentrons_15_tuberack_nest_15ml_conical/2.json b/shared-data/labware/definitions/3/opentrons_15_tuberack_nest_15ml_conical/2.json
@@ -223,7 +223,29 @@
   },
   "innerLabwareGeometry": {
     "a": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "conical",
+          "topDiameter": 13.8,
+          "bottomDiameter": 2.5,
+          "topHeight": 22.55,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 14.78,
+          "bottomDiameter": 13.8,
+          "topHeight": 109.03,
+          "bottomHeight": 22.55
+        },
+        {
+          "shape": "conical",
+          "topDiameter": 15.5,
+          "bottomDiameter": 14.78,
+          "topHeight": 117.8,
+          "bottomHeight": 109.03
+        }
+      ]
     }
   }
 }
diff --git a/shared-data/labware/definitions/3/opentrons_24_aluminumblock_nest_0.5ml_screwcap/2.json b/shared-data/labware/definitions/3/opentrons_24_aluminumblock_nest_0.5ml_screwcap/2.json
@@ -322,7 +322,49 @@
   },
   "innerLabwareGeometry": {
     "a": {
-      "sections": []
+      "sections": [
+        {
+          "shape": "spherical",
+          "radiusOfCurvature": 3.64,
+          "topHeight": 0.14,
+          "bottomHeight": 0.0
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 2,
+          "topDiameter": 3,
+          "topHeight": 0.95,
+          "bottomHeight": 0.14
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 3,
+          "topDiameter": 5.8,
+          "topHeight": 10.2,
+          "bottomHeight": 0.95
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 5.8,
+          "topDiameter": 7.9,
+          "topHeight": 11.9,
+          "bottomHeight": 10.2
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 7.9,
+          "topDiameter": 8.56,
+          "topHeight": 13.95,
+          "bottomHeight": 11.9
+        },
+        {
+          "shape": "conical",
+          "bottomDiameter": 8.56,
+          "topDiameter": 8.56,
+          "topHeight": 25.2,
+          "bottomHeight": 13.95
+        }
+      ]
     }
   }
 }