From 0f3201edb49417c2c13a08db6638140ebb732056 Mon Sep 17 00:00:00 2001 From: jennmald Date: Fri, 20 Feb 2026 13:53:24 -0500 Subject: [PATCH 1/2] fix file paths for the ophyd-sync version of the eiger --- src/cditools/eiger.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/cditools/eiger.py b/src/cditools/eiger.py index 33ec826..d425dd0 100644 --- a/src/cditools/eiger.py +++ b/src/cditools/eiger.py @@ -128,9 +128,11 @@ class EigerBase(EigerDetector): "cam1:", name="file_handler", # TODO: These paths need to be changed once the detector is deployed at CDI. - write_path_template="/nsls2/data/tst/legacy/mock-proposals/2025-2/pass-56789/assets/eiger/%Y/%m/%d", - root="/nsls2/data/tst/legacy/mock-proposals/2025-2/pass-56789/assets/eiger", + # write_path_template="/nsls2/data/tst/legacy/mock-proposals/2025-2/pass-56789/assets/eiger/%Y/%m/%d", + # root="/nsls2/data/tst/legacy/mock-proposals/2025-2/pass-56789/assets/eiger", + root_str="/nsls2/data/cdi/proposals/", ) + _asset_path = "eiger" stats1 = Cpt(StatsPlugin, "Stats1:") stats2 = Cpt(StatsPlugin, "Stats2:") stats3 = Cpt(StatsPlugin, "Stats3:") @@ -142,10 +144,20 @@ class EigerBase(EigerDetector): roi4 = Cpt(ROIPlugin, "ROI4:") proc1 = Cpt(ProcessPlugin, "Proc1:") + def _update_paths(self): + self.write_path_template = self.root_path_str + "%Y/%m/%d/" + self.read_path_template = self.root_path_str + "%Y/%m/%d/" + self.reg_root = self.root_path_str + + @property + def root_path_str(self): + return f"{self.root_str}/{self._md['cycle']}/{self._md['data_session']}/assets/{self._asset_path}" + def stage(self, *args: Any, **kwargs: dict[str, Any]) -> list[object]: staged_devices: list[object] = super().stage(*args, **kwargs) self.cam.manual_trigger.set(True).wait(5.0) file_write_path: Path = Path(cast(str, self.file_handler.file_path.get())) + self._update_paths() if not Path.exists(file_write_path): msg = f"Path {file_write_path} does not exist." raise FileNotFoundError(msg) From 51c3196e739c01a6bec8d43e2fc840967ce529f0 Mon Sep 17 00:00:00 2001 From: jennmald Date: Tue, 24 Feb 2026 10:48:11 -0500 Subject: [PATCH 2/2] fix the asset to match nsls2 api --- src/cditools/eiger.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cditools/eiger.py b/src/cditools/eiger.py index d425dd0..44a90f2 100644 --- a/src/cditools/eiger.py +++ b/src/cditools/eiger.py @@ -132,7 +132,7 @@ class EigerBase(EigerDetector): # root="/nsls2/data/tst/legacy/mock-proposals/2025-2/pass-56789/assets/eiger", root_str="/nsls2/data/cdi/proposals/", ) - _asset_path = "eiger" + _asset_path = "eiger2-1" stats1 = Cpt(StatsPlugin, "Stats1:") stats2 = Cpt(StatsPlugin, "Stats2:") stats3 = Cpt(StatsPlugin, "Stats3:")