From ed1ab947da8f6d8a7d4e2f3b514abc854c9b4de7 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Mon, 27 Jan 2020 12:15:15 +0000 Subject: [PATCH 1/2] Add region bounds checks This was an uncommitted change on hoa2mstr; unclear who made it and when. --- andorEmccd/andorEmccd.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/andorEmccd/andorEmccd.py b/andorEmccd/andorEmccd.py index b4b6513..873e146 100755 --- a/andorEmccd/andorEmccd.py +++ b/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) From c3b43bdaf8ef7806558ba4c51329d1a16c0a5ff8 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Mon, 14 Mar 2022 14:27:21 +0000 Subject: [PATCH 2/2] setup.py: Remove ARTIQ controller remnant --- setup.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/setup.py b/setup.py index d5ddfed..697b132 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,4 @@ setup(name='andorEmccd', version='0.1', packages=['andorEmccd'], - entry_points={ - "console_scripts": ["andorEmccd_controller=andorEmccd.controller:main"], - } -) \ No newline at end of file +)