Skip to content

Commit 7b65e60

Browse files
author
munrojm
committed
Add composition metric col support
1 parent 672a21d commit 7b65e60

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/atomscale/timeseries/rheed.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,13 @@ class RHEEDProvider(TimeseriesProvider[RHEEDVideoResult]):
4141
"first_order_fwhm_1": "First Order FWHM",
4242
"lattice_spacing": "Lattice Spacing",
4343
"tar_metric": "TAR Metric",
44+
"composition_metric": "Composition Metric",
4445
}
45-
DROP_IF_ALL_NA: Sequence[str] = ["reconstruction_intensity", "tar_metric"]
46+
DROP_IF_ALL_NA: Sequence[str] = [
47+
"reconstruction_intensity",
48+
"tar_metric",
49+
"composition_metric",
50+
]
4651
INDEX_COLS: Sequence[str] = ["Angle", "Frame Number"]
4752

4853
def fetch_raw(self, client: BaseClient, data_id: str, **kwargs) -> Any:

tests/test_rheed_video.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def result(client: Client):
2222

2323

2424
def test_get_dataframe(result: RHEEDVideoResult):
25+
# Core columns that should always be present
2526
column_names = set(
2627
[
2728
"Strain",
@@ -38,9 +39,12 @@ def test_get_dataframe(result: RHEEDVideoResult):
3839
"Half Order Intensity R",
3940
"Specular FWHM",
4041
"First Order FWHM",
41-
"Time",
4242
"UNIX Timestamp",
4343
"Relative Time",
44+
# Optional columns (included if data exists)
45+
"Time",
46+
"TAR Metric",
47+
"Composition Metric",
4448
]
4549
)
4650

0 commit comments

Comments
 (0)