Skip to content

Commit ab3b7e7

Browse files
authored
fix: Molecular Devices SoftMax Pro - move reduced data from custom info to calculated data document (#1032)
1 parent 02f3f25 commit ab3b7e7

5 files changed

Lines changed: 113606 additions & 6536 deletions

File tree

src/allotropy/parsers/moldev_softmax_pro/softmax_pro_data_creator.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
GroupBlock,
3131
GroupSampleData,
3232
PlateBlock,
33-
SpectrumRawPlateData,
3433
StructureData,
3534
)
3635
from allotropy.parsers.utils.calculated_data_documents.definition import (
@@ -263,12 +262,6 @@ def _create_measurement_group(
263262
if not (measurements := _create_measurements(plate_block, position)):
264263
return None
265264

266-
maximum_wavelength_signal = None
267-
if isinstance(plate_block.block_data.raw_data, SpectrumRawPlateData):
268-
maximum_wavelength_signal = (
269-
plate_block.block_data.raw_data.maximum_wavelength_signal[position]
270-
)
271-
272265
measurement_time = DEFAULT_EPOCH_TIMESTAMP
273266
if date_last_saved:
274267
delta = datetime.timedelta(seconds=plate_block.header.read_time or 0)
@@ -278,7 +271,6 @@ def _create_measurement_group(
278271
measurements=measurements,
279272
plate_well_count=plate_block.header.num_wells,
280273
measurement_time=measurement_time,
281-
maximum_wavelength_signal=maximum_wavelength_signal,
282274
)
283275

284276

src/allotropy/parsers/moldev_softmax_pro/softmax_pro_structure.py

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -564,8 +564,6 @@ def _update_kinetic_data(
564564

565565
@dataclass(frozen=True)
566566
class SpectrumRawPlateData(RawData):
567-
maximum_wavelength_signal: dict[str, float | None]
568-
569567
@staticmethod
570568
def create(reader: CsvReader, header: PlateHeader) -> SpectrumRawPlateData:
571569

@@ -593,23 +591,9 @@ def create(reader: CsvReader, header: PlateHeader) -> SpectrumRawPlateData:
593591
df_data=data.iloc[:, 2:],
594592
)
595593
)
596-
reader.pop()
597594
reader.drop_empty()
598-
max_wavelength_signal_data = RawData.get_measurement_section(
599-
reader, columns, rows
600-
).iloc[:, 2:]
601-
signal_data = {
602-
f"{num_to_chars(row_idx)}{col}": try_float_or_none(str(raw_value))
603-
for row_idx, *row_data in max_wavelength_signal_data.itertuples()
604-
for col, raw_value in zip(
605-
max_wavelength_signal_data.columns, row_data, strict=True
606-
)
607-
}
608595

609-
return SpectrumRawPlateData(
610-
wavelength_data=wavelength_data,
611-
maximum_wavelength_signal=signal_data,
612-
)
596+
return SpectrumRawPlateData(wavelength_data=wavelength_data)
613597

614598

615599
@dataclass(frozen=True)
@@ -618,8 +602,6 @@ class PlateReducedData:
618602

619603
@staticmethod
620604
def create(reader: CsvReader, header: PlateHeader) -> PlateReducedData:
621-
if header.read_type == ReadType.SPECTRUM.value:
622-
return PlateReducedData(data=[])
623605

624606
raw_data = assert_not_none(
625607
reader.pop_csv_block_as_df(sep="\t", header=0),

0 commit comments

Comments
 (0)