Add region bounds checks

andorEmccd/andorEmccd.py

@@ -405,6 +405,19 @@ def set_image_region(self, hStart, hEnd, vStart, vEnd, hBin=1, vBin=1):
         binning.
         The region is 0 indexed and inclusive, so the valid ranges for hStart
         is 0..self.ccdWidth-1 etc."""
+
+        def out_of_range(val, max):
+            return val < 0 or val > max-1
+
+        if out_of_range(hStart, self.ccdWidth):
+            raise ValueError("hStart out of range")
+        if out_of_range(hEnd, self.ccdWidth):
+            raise ValueError("hEnd out of range")
+        if out_of_range(vStart, self.ccdHeight):
+            raise ValueError("vStart out of range")
+        if out_of_range(vEnd, self.ccdHeight):
+            raise ValueError("vEnd out of range")
+
         self.roiWidth = int((1+hEnd-hStart) / hBin)
         self.roiHeight = int((1+vEnd-vStart) / vBin)
 

setup.py

@@ -3,7 +3,4 @@
 setup(name='andorEmccd',
     version='0.1',
     packages=['andorEmccd'],
-    entry_points={
-        "console_scripts": ["andorEmccd_controller=andorEmccd.controller:main"],
-    }
-)
+)