From cb645b9a1c8c83372fc67755b20da2ae583d548d Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 25 Mar 2026 16:30:29 +0100 Subject: [PATCH] removed hard coded dac names in python NamedDacs and NamedPowers --- python/slsdet/dacs.py | 5 +---- python/slsdet/powers.py | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/python/slsdet/dacs.py b/python/slsdet/dacs.py index 9f6ada6b9..3dfbd662e 100755 --- a/python/slsdet/dacs.py +++ b/python/slsdet/dacs.py @@ -53,10 +53,7 @@ class NamedDacs: def _dacnames(self): if self._detector.size() == 0: raise RuntimeError("No modules added") - if hasattr(self._detector, 'daclist'): - return [n.replace(" ", "") for n in self._detector.daclist] - else: - return [f"DAC{i}" for i in range(18)] + return [n.replace(" ", "") for n in self._detector.daclist] def __getattr__(self, name): if name in self._dacnames: diff --git a/python/slsdet/powers.py b/python/slsdet/powers.py index 3426e8e23..49115bb74 100755 --- a/python/slsdet/powers.py +++ b/python/slsdet/powers.py @@ -81,7 +81,7 @@ class NamedPowers: if hasattr(self._detector, 'powerlist'): return [n.replace(" ", "") for n in self._detector.powerlist] else: - return ["VA", "VB", "VC", "VD", "VIO"] + raise RuntimeError("Detector does not have powerlist attribute") def __getattr__(self, name): if name in self._powernames: