diff --git a/deepdog/results/__init__.py b/deepdog/results/__init__.py index 252638b..ebe8755 100644 --- a/deepdog/results/__init__.py +++ b/deepdog/results/__init__.py @@ -13,11 +13,13 @@ FILENAME_REGEX = r"(?P\d{8}-\d{6})-(?P.*)\.realdata\.f MODEL_REGEXES = [ r"geom_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)-orientation_(?Pfree|fixedxy|fixedz)-dipole_count_(?P\d+)_(?P\w*)", r"geom_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)_(?P-?\d+)-magnitude_(?P\d*\.?\d+)-orientation_(?Pfree|fixedxy|fixedz)-dipole_count_(?P\d+)_(?P\w*)", + r"geom_(?P-?\d*\.?\d+)_(?P-?\d*\.?\d+)_(?P-?\d*\.?\d+)_(?P-?\d*\.?\d+)_(?P-?\d*\.?\d+)_(?P-?\d*\.?\d+)-magnitude_(?P\d*\.?\d+)-orientation_(?Pfree|fixedxy|fixedz)-dipole_count_(?P\d+)_(?P\w*)" ] FILE_SLUG_REGEXES = [ r"mock_tarucha-(?P\d+)", r"(?:(?Pmock)_)?tarucha(?:_(?P\d+))?-(?P\d+)", + r"(?P\w+)-(?P\d+)", ]