Merge pull request #35 from European-XFEL/dssc-aspect-auto

Get aspect ratio automatically for given detector in notebook

Author: takluyver

geoAssembler/geometry.py

@@ -42,6 +42,7 @@ class GeometryAssembler:
     frag_ss_pixels = None
     frag_fs_pixels = None
     pixel_size = None
+    pixel_aspect_ratio = 1.
     detector_name = 'generic'
 
     def __init__(self, exgeom_obj):
@@ -261,6 +262,7 @@ def quad_pos(self):
 class DSSCGeometry(GeometryAssembler):
     """Detector layout for DSSC."""
     detector_name = 'DSSC'
+    pixel_aspect_ratio = 1.5/np.sqrt(3)
 
     def __init__(self, exgeom_obj, filename):
         """Set the properties for DSSC detector.

geoAssembler/nb/notebook.py

@@ -25,7 +25,7 @@ class CircleShape(Ellipse):
     type = 'circle'
 
     def __str__(self):
-        return "Circle(%i)"%self.width
+        return f"Circle({self.height})"
 
     def __init__(self, centre, diameter, ax, aspect, **kwargs):
         """Create an circle on top of an image with a given aspect ratio.
@@ -45,10 +45,9 @@ def __init__(self, centre, diameter, ax, aspect, **kwargs):
         Aspect ratio (width / height)
         """
 
-        a = diameter * aspect
-        b = diameter
+        width = diameter * aspect
         self.aspect = aspect
-        super().__init__(centre[::-1], a, b,
+        super().__init__(centre[::-1], width, diameter,
                          facecolor='none', edgecolor='r', lw=1)
 
     def set_size(self, diameter):
@@ -66,14 +65,14 @@ def get_angle(self):
         return 0
 
     def get_size(self):
-        return self.width
+        return self.height
 
 class SquareShape(Rectangle):
     """Circular Shape that supporting different aspect ratios."""
     type = 'square'
 
     def __str__(self):
-        return "Square(%i)"%self.get_width()
+        return f"Square({self.get_height()})"
 
     def __init__(self, centre, size, ax, aspect, angle=0):
         """Create an square on top of an image with a given aspect ratio.
@@ -127,7 +126,7 @@ def set_size(self, size):
         self.stale = True
 
     def get_size(self):
-        return self.get_width()
+        return self.get_height()
 
     def set_angle(self, angle):
         """Rotate the square by a given angle."""
@@ -145,7 +144,7 @@ class MainWidget:
     """Ipython Widget version of the Calibration Class."""
 
     def __init__(self, raw_data, geometry=None, det='AGIPD', vmin=None,
-                 vmax=None, figsize=None, bg=None, aspect=1, frontview=False, 
+                 vmax=None, figsize=None, bg=None, aspect=None, frontview=False,
                  **kwargs):
         """Display detector data and arrange panels.
 
@@ -188,7 +187,6 @@ def __init__(self, raw_data, geometry=None, det='AGIPD', vmin=None,
         self.data = raw_data
         Defaults.check_detector(det)
         self.im = None
-        self.aspect = aspect
         self.vmin = vmin or np.nanmin(self.data)
         self.vmax = vmax or np.nanmax(self.data)
         self.raw_data = np.clip(raw_data, self.vmin, self.vmax)
@@ -207,6 +205,7 @@ def __init__(self, raw_data, geometry=None, det='AGIPD', vmin=None,
             self.geom = read_geometry(det, geometry)
         else:
             self.geom = GeometryAssembler.wrap_extra_geom(geometry)
+        self.aspect = aspect or self.geom.pixel_aspect_ratio
 
         data, _ = self.geom.position_all_modules(self.raw_data)
         # Create a canvas

geoAssembler/nb/tabs.py

@@ -199,14 +199,14 @@ def _update_navi(self, pos):
         """Add navigation buttons."""
         if pos is not None:
             quad_offset = self.parent.geom.quad_offsets[pos - 1]
-            posx_sel = widgets.BoundedIntText(value=quad_offset[1],
+            posx_sel = widgets.BoundedIntText(value=quad_offset[0],
                                               min=-1000,
                                               max=1000,
                                               step=1,
                                               disabled=False,
                                               continuous_update=True,
                                               description='Horz.')
-            posy_sel = widgets.BoundedIntText(value=quad_offset[0],
+            posy_sel = widgets.BoundedIntText(value=quad_offset[1],
                                               min=-1000,
                                               max=1000,
                                               step=1,