Skip to content

Commit

Permalink
fix: rename xpress -> xspress
Browse files Browse the repository at this point in the history
Signed-off-by: Sofia Donato Ferreira <[email protected]>
  • Loading branch information
flowln committed Feb 17, 2025
1 parent 9c8c7f9 commit 42969e1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/sophys/common/devices/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
)
from .pilatus_300k import Pilatus, PilatusWithoutHDF5
from .pimega import Pimega, PimegaFlyScan
from .xpress import Xpress
from .xspress import Xspress
from .storage_ring import StorageRing
from .tatu import Tatu9401, Tatu9403
from .dcm_lite import DcmLite
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,26 +6,26 @@
from .cam import Xspress3DetectorCamV33


class XpressBase(SingleTrigger, DetectorBase):
class XspressBase(SingleTrigger, DetectorBase):
pass


def Xpress(prefix: str, roi_num: int = 1, **kwargs):
xpressComponents = {
def Xspress(prefix: str, roi_num: int = 1, **kwargs):
xspressComponents = {
"hdf5": Component(HDF5PluginWithFileStoreV34, "HDF1:"),
"cam": Component(Xspress3DetectorCamV33, "det1:"),
}
for num in range(1, roi_num + 1):
for mca_num in range(1, 5):
xpressComponents.update(
xspressComponents.update(
{
f"mca{mca_num}roi_{num}": Component(
ROIStatNPlugin_V25, f"MCA{mca_num}ROI:{num}:"
)
}
)

xpress = create_device_from_components(
name="xpress", base_class=XpressBase, **xpressComponents
xspress = create_device_from_components(
name="xspress", base_class=XspressBase, **xspressComponents
)
return xpress(prefix=prefix, **kwargs)
return xspress(prefix=prefix, **kwargs)

0 comments on commit 42969e1

Please sign in to comment.