Skip to content

Commit 1f91d47

Browse files
committed
I04_1-150: minor, formatting of message text
1 parent 0baf4d6 commit 1f91d47

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

dls_barcode/camera/scanner_worker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def _process_frame(self, frame, config, overlay_queue, result_queue, message_que
6666
if scan_result.any_new_barcodes():
6767
result_queue.put((plate, image))
6868
elif scan_result.any_valid_barcodes():
69-
# We have read valid barcodes but they are not new
69+
# We have read valid barcodes but they are not new, so the scanner didn't even output a plate
7070
self._last_puck_time = time.time()
7171
message_queue.put(NoNewBarcodeMessage())
7272
elif scan_result.error() is not None and (time.time() - self._last_puck_time > NO_PUCK_TIME):

dls_barcode/geometry/unipuck_calculator.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ def perform_alignment(self):
3434
num_points = len(self._slot_centers)
3535

3636
if num_points > self._num_slots:
37-
raise GeometryAlignmentError("Too many points to perform Unipuck alignment")
38-
37+
raise GeometryAlignmentError("Too many slots detected to perform Unipuck alignment")
3938
elif num_points < MIN_POINTS_FOR_ALIGNMENT:
40-
raise GeometryAlignmentError("Not enough points to perform Unipuck alignment")
39+
raise GeometryAlignmentError("Not enough slots detected to perform Unipuck alignment")
4140

4241
puck = self._calculate_puck_alignment()
4342
return puck
@@ -57,8 +56,8 @@ def _calculate_puck_alignment(self):
5756

5857
return puck
5958

60-
except Exception as ex:
61-
raise GeometryAlignmentError("Unipuck Alignment failed")
59+
except Exception:
60+
raise GeometryAlignmentError("Unipuck alignment failed")
6261

6362
@staticmethod
6463
def _find_puck_center(pin_centers):

dls_barcode/plate/plate.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ def __init__(self, geometry_name, num_slots=-1):
1818
self.type = geometry_name
1919
self._geometry = None
2020

21-
2221
# Initialize slots
2322
self._slots = [Slot(i) for i in range(1, self.num_slots+1)]
2423

@@ -37,7 +36,6 @@ def barcodes(self):
3736
"""
3837
return [slot.barcode_data() for slot in self._slots]
3938

40-
4139
def geometry(self):
4240
return self._geometry
4341

0 commit comments

Comments
 (0)