Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion SUPPORTED_INSTRUMENT_SOFTWARE.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ The parsers follow maturation levels of: Recommended, Candidate Release, Working
|CTL ImmunoSpot|Recommended|BENCHLING/2023/09
|Mabtech Apex|Recommended|BENCHLING/2023/09
|MSD Methodical Mind|Recommended|REC/2024/06
|Molecular Devices SoftMax Pro|Recommended|REC/2024/06
|Molecular Devices SoftMax Pro|Recommended|REC/2025/03
|MSD Discovery Workbench|Recommended|REC/2024/06
|PerkinElmer Envision|Recommended|REC/2024/06
|Revvity Kaleido|Recommended|BENCHLING/2023/09
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
FieldComponentDatatype,
)
from allotropy.allotrope.models.shared.definitions.units import UNITLESS
from allotropy.allotrope.schema_mappers.adm.plate_reader.rec._2024._06.plate_reader import (
from allotropy.allotrope.schema_mappers.adm.plate_reader.rec._2025._03.plate_reader import (
Measurement,
MeasurementGroup,
MeasurementType,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from allotropy.allotrope.models.adm.plate_reader.rec._2024._06.plate_reader import Model
from allotropy.allotrope.schema_mappers.adm.plate_reader.rec._2024._06.plate_reader import (
from allotropy.allotrope.models.adm.plate_reader.rec._2025._03.plate_reader import Model
from allotropy.allotrope.schema_mappers.adm.plate_reader.rec._2025._03.plate_reader import (
Data,
Mapper,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import pandas as pd

from allotropy.allotrope.schema_mappers.adm.plate_reader.rec._2024._06.plate_reader import (
from allotropy.allotrope.schema_mappers.adm.plate_reader.rec._2025._03.plate_reader import (
ErrorDocument,
MeasurementType,
ScanPositionSettingPlateReader,
Expand Down
3,054 changes: 1,527 additions & 1,527 deletions tests/parsers/moldev_softmax_pro/testdata/MD_SMP_absorbance_endpoint_example01.json

Large diffs are not rendered by default.

3,054 changes: 1,527 additions & 1,527 deletions tests/parsers/moldev_softmax_pro/testdata/MD_SMP_absorbance_endpoint_example02.json

Large diffs are not rendered by default.

4,214 changes: 2,107 additions & 2,107 deletions tests/parsers/moldev_softmax_pro/testdata/MD_SMP_absorbance_endpoint_example04.json

Large diffs are not rendered by default.

4,214 changes: 2,107 additions & 2,107 deletions tests/parsers/moldev_softmax_pro/testdata/MD_SMP_absorbance_endpoint_example05.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

966 changes: 483 additions & 483 deletions tests/parsers/moldev_softmax_pro/testdata/abs_endpoint_plates.json

Large diffs are not rendered by default.

318 changes: 159 additions & 159 deletions tests/parsers/moldev_softmax_pro/testdata/fl_kinetic_plates.json

Large diffs are not rendered by default.

2,422 changes: 1,211 additions & 1,211 deletions tests/parsers/moldev_softmax_pro/testdata/group_cols_with_int_sample_names.json

Large diffs are not rendered by default.

3,074 changes: 1,537 additions & 1,537 deletions tests/parsers/moldev_softmax_pro/testdata/group_with_partial_rows.json

Large diffs are not rendered by default.

66 changes: 33 additions & 33 deletions tests/parsers/moldev_softmax_pro/testdata/no_measurements.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$asm.manifest": "http://purl.allotrope.org/manifests/plate-reader/REC/2024/06/plate-reader.manifest",
"$asm.manifest": "http://purl.allotrope.org/manifests/plate-reader/REC/2025/03/plate-reader.manifest",
"plate reader aggregate document": {
"plate reader document": [
{
Expand All @@ -20,21 +20,21 @@
"value": 505.0,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
},
"excitation wavelength setting": {
"value": 380,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
}
}
]
},
"measurement identifier": "MOLDEV_SOFTMAX_PRO_TEST_ID_0",
"sample document": {
"sample identifier": "PLate1 A1",
"location identifier": "A1",
"sample identifier": "PLate1 A1",
"well plate identifier": "PLate1"
},
"error aggregate document": {
Expand Down Expand Up @@ -81,21 +81,21 @@
"value": 505.0,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
},
"excitation wavelength setting": {
"value": 380,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
}
}
]
},
"measurement identifier": "MOLDEV_SOFTMAX_PRO_TEST_ID_1",
"sample document": {
"sample identifier": "PLate1 A2",
"location identifier": "A2",
"sample identifier": "PLate1 A2",
"well plate identifier": "PLate1"
},
"error aggregate document": {
Expand Down Expand Up @@ -142,21 +142,21 @@
"value": 505.0,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
},
"excitation wavelength setting": {
"value": 380,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
}
}
]
},
"measurement identifier": "MOLDEV_SOFTMAX_PRO_TEST_ID_2",
"sample document": {
"sample identifier": "PLate1 A3",
"location identifier": "A3",
"sample identifier": "PLate1 A3",
"well plate identifier": "PLate1"
},
"error aggregate document": {
Expand Down Expand Up @@ -203,21 +203,21 @@
"value": 505.0,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
},
"excitation wavelength setting": {
"value": 380,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
}
}
]
},
"measurement identifier": "MOLDEV_SOFTMAX_PRO_TEST_ID_3",
"sample document": {
"sample identifier": "PLate1 B1",
"location identifier": "B1",
"sample identifier": "PLate1 B1",
"well plate identifier": "PLate1"
},
"error aggregate document": {
Expand Down Expand Up @@ -264,21 +264,21 @@
"value": 505.0,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
},
"excitation wavelength setting": {
"value": 380,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
}
}
]
},
"measurement identifier": "MOLDEV_SOFTMAX_PRO_TEST_ID_4",
"sample document": {
"sample identifier": "PLate1 B2",
"location identifier": "B2",
"sample identifier": "PLate1 B2",
"well plate identifier": "PLate1"
},
"error aggregate document": {
Expand Down Expand Up @@ -325,21 +325,21 @@
"value": 505.0,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
},
"excitation wavelength setting": {
"value": 380,
"unit": "nm"
},
"wavelength filter cutoff setting": {
"value": 495,
"unit": "nm"
}
}
]
},
"measurement identifier": "MOLDEV_SOFTMAX_PRO_TEST_ID_5",
"sample document": {
"sample identifier": "PLate1 B3",
"location identifier": "B3",
"sample identifier": "PLate1 B3",
"well plate identifier": "PLate1"
},
"error aggregate document": {
Expand Down Expand Up @@ -372,10 +372,10 @@
"data system document": {
"ASM file identifier": "N/A",
"data system instance identifier": "N/A",
"file name": "no_measurements.txt",
"UNC path": "tests/parsers/moldev_softmax_pro/testdata/no_measurements.txt",
"file name": "no_measurements.txt",
"ASM converter name": "allotropy_molecular_devices_softmax_pro",
"ASM converter version": "0.1.61",
"ASM converter version": "0.1.92",
"software name": "SoftMax Pro"
},
"device system document": {
Expand Down
Loading
Loading