Skip to content

fix: Molecular Devices SoftMax Pro - update blocks regex to handle trailing whitespace #1048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 1, 2025
Merged

fix: Molecular Devices SoftMax Pro - update blocks regex to handle trailing whitespace #1048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b516fd
Update softmax regex to handle trailing whitespace
nathan-stender Aug 1, 2025
5b51f86
Merge branch 'main' into nstender-softmax-regex-line
nathan-stender Aug 1, 2025
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 src/allotropy/parsers/moldev_softmax_pro/softmax_pro_structure.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
try_non_nan_float_or_none,
)

BLOCKS_LINE_REGEX = r"^##BLOCKS=\s*(\d+)$"
BLOCKS_LINE_REGEX = r"^##BLOCKS=\s*(\d+)\s*$"
END_LINE_REGEX = "~End"
EXPORT_VERSION = "1.3"
VALID_NAN_VALUES = ("Masked", "Range?", "Error")
Expand Down
2 changes: 1 addition & 1 deletion tests/parsers/moldev_softmax_pro/testdata/partial_plate.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
##BLOCKS= 1
##BLOCKS= 1
Plate: Plate1 1.3 PlateFormat Spectrum Absorbance Raw FALSE 21 525 565 2 1 16 384 1 16
Temperature(¡C) 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
525 26.2 0.0994 0.0964 0.0967 0.0972 0.095 0.0947 0.0932 0.0936 0.0958 0.0969 0.099 0.1037 0.1302 0.1248 0.1008 0.1006
Expand Down
Loading