Skip to content

Commit 8d02cd8

Browse files
remove plate reader custom information
1 parent 35eade5 commit 8d02cd8

9 files changed

Lines changed: 209 additions & 276 deletions

src/allotropy/parsers/revvity_kaleido/kaleido_structure.py

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,10 @@ def create(
266266
custom_info=data.get_unread(),
267267
)
268268

269+
def clean_custom_info(self) -> None:
270+
self.custom_info.clear()
271+
272+
269273

270274
@dataclass(frozen=True)
271275
class Platemap:
@@ -625,6 +629,11 @@ def _create_measurements(
625629

626630

627631
def create_measurement_groups(data: Data) -> list[MeasurementGroup]:
632+
protocol_owner = data.measurement_info.custom_info.get("protocol owner", None)
633+
measurement_finished = data.measurement_info.custom_info.get("measurement finished", None)
634+
protocol_name = data.measurement_info.custom_info.get("protocol name", None)
635+
data.measurement_info.clean_custom_info()
636+
628637
return [
629638
MeasurementGroup(
630639
measurement_time=data.measurement_info.measurement_time,
@@ -656,15 +665,9 @@ def create_measurement_groups(data: Data) -> list[MeasurementGroup]:
656665
if data.background_info.experiment_type is ExperimentType.OPTICAL_IMAGING
657666
else None,
658667
custom_info={
659-
"protocol owner": data.measurement_info.custom_info.get(
660-
"protocol owner", None
661-
),
662-
"measurement finished": data.measurement_info.custom_info.get(
663-
"measurement finished", None
664-
),
665-
"protocol name": data.measurement_info.custom_info.get(
666-
"protocol name", None
667-
),
668+
"protocol owner": protocol_owner,
669+
"measurement finished": measurement_finished,
670+
"protocol name": protocol_name,
668671
},
669672
)
670673
for well_position, well_value in data.iter_wells()

tests/parsers/revvity_kaleido/testdata/absorbance/absorbance_endpoint_single_plate_example_01.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5679,16 +5679,7 @@
56795679
"software name": "Kaleido",
56805680
"software version": "2.0.3058.126",
56815681
"ASM converter name": "allotropy_revvity_kaleido",
5682-
"ASM converter version": "0.1.104"
5683-
},
5684-
"custom information document": {
5685-
"measurement finished": "2020-10-26T16:17:14.6440969-04:00",
5686-
"protocol owner": "foo",
5687-
"software version": "Kaleido 2.0.3058.126",
5688-
"number of plate repeats": 1.0,
5689-
"barcode": "V-2020-10-26 16:16:17",
5690-
"start plate repeat each [s]": 0.0,
5691-
"protocol name": "bar"
5682+
"ASM converter version": "0.1.105"
56925683
}
56935684
}
56945685
}

tests/parsers/revvity_kaleido/testdata/fluorescence/fluorescence_endpoint_single_plate_example_01.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24207,15 +24207,7 @@
2420724207
"software name": "Kaleido",
2420824208
"software version": "3.0.3067.117",
2420924209
"ASM converter name": "allotropy_revvity_kaleido",
24210-
"ASM converter version": "0.1.104"
24211-
},
24212-
"custom information document": {
24213-
"measurement finished": "2022-11-10 12:14:17",
24214-
"protocol name": "foo",
24215-
"barcode": "V-2022-11-10 12:11:46",
24216-
"protocol owner": "Admin",
24217-
"software version": "Kaleido 3.0.3067.117",
24218-
"sequence executed by": "Plate Stack"
24210+
"ASM converter version": "0.1.105"
2421924211
}
2422024212
}
2422124213
}

tests/parsers/revvity_kaleido/testdata/fluorescence/fluorescence_v3.5_pure_csv_format_example.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6063,16 +6063,7 @@
60636063
"software name": "Kaleido",
60646064
"software version": "3.5.3082.227",
60656065
"ASM converter name": "allotropy_revvity_kaleido",
6066-
"ASM converter version": "0.1.104"
6067-
},
6068-
"custom information document": {
6069-
"measurement finished": "10/8/2024 12:11",
6070-
"protocol owner": "thomasjm",
6071-
"barcode": "BARCODE_1 12:10:14",
6072-
"nan": "0\nnan NaN\nnan NaN\nnan NaN\nName: 2, dtype: object",
6073-
"sequence executed by": "Plate",
6074-
"software version": "Kaleido 3.5.3082.227",
6075-
"protocol name": "EXAMPLE PROTOCOL 1"
6066+
"ASM converter version": "0.1.105"
60766067
}
60776068
}
60786069
}

0 commit comments

Comments
 (0)