Handle recursion in imageseries get_region()

hexrd/imageseries/baseclass.py

@@ -1,6 +1,9 @@
 """Base class for imageseries
 """
-from .imageseriesabc import ImageSeriesABC
+import numpy as np
+
+from .imageseriesabc import ImageSeriesABC, RegionType
+
 
 class ImageSeries(ImageSeriesABC):
     """collection of images
@@ -39,3 +42,6 @@ def shape(self):
     @property
     def metadata(self):
         return self._adapter.metadata
+
+    def get_region(self, frame_idx: int, region: RegionType) -> np.ndarray:
+        return self._adapter.get_region(frame_idx, region)

hexrd/imageseries/imageseriesabc.py

@@ -1,6 +1,9 @@
 """Abstract Base Class"""
 import collections.abc
 
+# Type for extracting regions
+RegionType = tuple[tuple[int, int], tuple[int, int]]
+
 
 class ImageSeriesABC(collections.abc.Sequence):
     pass

hexrd/imageseries/load/__init__.py

@@ -2,11 +2,9 @@
 import pkgutil
 import numpy as np
 
-from ..imageseriesabc import ImageSeriesABC
+from ..imageseriesabc import ImageSeriesABC, RegionType
 from .registry import Registry
 
-RegionType = tuple[tuple[int, int], tuple[int, int]]
-
 # Metaclass for adapter registry
 
 class _RegisterAdapterClass(abc.ABCMeta):

hexrd/imageseries/process.py

@@ -96,7 +96,7 @@ def _subtract_dark(self, img, dark):
         return ret
 
     def _rectangle_optimized(self, img_key, r):
-        return self._imser._adapter.get_region(img_key, r)
+        return self._imser.get_region(img_key, r)
 
     def _rectangle(self, img, r):
         # restrict to rectangle