Skip to content

Commit c2d6f80

Browse files
solve comments
1 parent d3b12e1 commit c2d6f80

13 files changed

Lines changed: 1123 additions & 2512 deletions

src/allotropy/parsers/unchained_labs_lunatic_stunner/constants.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,6 @@
7575
"feature": "absorbance",
7676
"unit": UNITLESS,
7777
},
78-
{
79-
"column": "e1%",
80-
"name": "E1%",
81-
"feature": "absorbance",
82-
"unit": UNITLESS,
83-
},
8478
# Dynamic Light Scattering related calculations
8579
{
8680
"column": "kc/r (mol/g)",

src/allotropy/parsers/unchained_labs_lunatic_stunner/unchained_labs_lunatic_stunner_calcdocs.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,6 @@ def create_calculated_data(
9898
view_data=lunatic_view_data,
9999
source_configs=(absorbance_conf,),
100100
),
101-
CalculatedDataConfig(
102-
name="E1%",
103-
value="e1%",
104-
unit=UNITLESS,
105-
view_data=lunatic_view_data,
106-
source_configs=(absorbance_conf,),
107-
),
108101
# Dynamic Light Scattering related calculations
109102
CalculatedDataConfig(
110103
name="KC/R (mol/g)",

src/allotropy/parsers/unchained_labs_lunatic_stunner/unchained_labs_lunatic_stunner_structure.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,11 @@ def _create_measurement(
163163
"blanks": header.get(str, "blanks"),
164164
"plate description": header.get(str, "nan", duplicate_strategy="last"),
165165
"molar attenuation coefficient setting": well_plate_data.get(float, "e1%"),
166-
"analyte": well_plate_data.get(str, "analyte", "N/A"),
166+
"analyte": well_plate_data.get(str, "analyte"),
167167
"buffer": well_plate_data.get(str, "buffer"),
168+
"molecular weight (kda)": well_plate_data.get(
169+
float, "molecular weight (kda)"
170+
),
168171
},
169172
device_control_custom_info={
170173
"path length mode": well_plate_data.get(str, "path length mode"),

tests/parsers/unchained_labs_lunatic_stunner/testdata/2024-07-12_CW288_Plate1.json

Lines changed: 72 additions & 144 deletions
Large diffs are not rendered by default.

tests/parsers/unchained_labs_lunatic_stunner/testdata/2024-07-16_CW288_Plate2.json

Lines changed: 96 additions & 192 deletions
Large diffs are not rendered by default.

tests/parsers/unchained_labs_lunatic_stunner/testdata/Demo_A260_dsDNA_Data.json

Lines changed: 32 additions & 64 deletions
Large diffs are not rendered by default.

tests/parsers/unchained_labs_lunatic_stunner/testdata/Demo_A280_Protein.json

Lines changed: 32 additions & 528 deletions
Large diffs are not rendered by default.

tests/parsers/unchained_labs_lunatic_stunner/testdata/Example_Lunatic_Plate_Reader_csv_no_header.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
"location identifier": "A1",
2424
"sample identifier": "SAMPLE_1",
2525
"batch identifier": "GROUP_1",
26-
"well plate identifier": "PLATE_1",
27-
"custom information document": {
28-
"analyte": "N/A"
29-
}
26+
"well plate identifier": "PLATE_1"
3027
},
3128
"absorbance": {
3229
"value": 3.65,
@@ -76,10 +73,7 @@
7673
"location identifier": "B1",
7774
"sample identifier": "SAMPLE_2",
7875
"batch identifier": "GROUP_1",
79-
"well plate identifier": "PLATE_2",
80-
"custom information document": {
81-
"analyte": "N/A"
82-
}
76+
"well plate identifier": "PLATE_2"
8377
},
8478
"absorbance": {
8579
"value": 3.66,

tests/parsers/unchained_labs_lunatic_stunner/testdata/Example_Lunatic_Plate_Reader_csv_with_header.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929
"plate type": "Lunatic Plate",
3030
"nr of plates": "1",
3131
"blanks": "Sample group 'GROUP_1': On Plate/Chip: (2x)",
32-
"plate description": "- Lunatic_test_BE_31JUL2024",
33-
"analyte": "N/A"
32+
"plate description": "- Lunatic_test_BE_31JUL2024"
3433
}
3534
},
3635
"absorbance": {

tests/parsers/unchained_labs_lunatic_stunner/testdata/Example_Lunatic_Plate_Reader_xlsx_no_header.json

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
"location identifier": "A1",
2424
"sample identifier": "SAMPLE_1",
2525
"batch identifier": "GROUP_1",
26-
"well plate identifier": "PLATE_1",
27-
"custom information document": {
28-
"analyte": "N/A"
29-
}
26+
"well plate identifier": "PLATE_1"
3027
},
3128
"absorbance": {
3229
"value": 3.65,
@@ -76,10 +73,7 @@
7673
"location identifier": "B1",
7774
"sample identifier": "SAMPLE_2",
7875
"batch identifier": "GROUP_1",
79-
"well plate identifier": "PLATE_1",
80-
"custom information document": {
81-
"analyte": "N/A"
82-
}
76+
"well plate identifier": "PLATE_1"
8377
},
8478
"absorbance": {
8579
"value": 3.66,

0 commit comments

Comments
 (0)