From 7eec190716dd2b874e93802726da35fbebf0aeef Mon Sep 17 00:00:00 2001 From: jonnymaserati Date: Sun, 17 Dec 2023 20:20:33 +0100 Subject: [PATCH] Prevent endless loop in connector in clc when pos1 and pos2 are identical. --- welleng/connector.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/welleng/connector.py b/welleng/connector.py index d591f9a..6275c9d 100644 --- a/welleng/connector.py +++ b/welleng/connector.py @@ -690,9 +690,13 @@ def _target_pos_and_vec_defined(self, pos3, vec_old=[0., 0., 0.]): + args + (True,) ) ) - if abs( - self.dls - self.dls2 - ) < self.delta_dls: + if any(( + abs( + self.dls - self.dls2 + ) < self.delta_dls, + np.allclose(self.pos1, self.pos2), + np.allclose(self.pos3, self.pos_target) + )): break self._happy_finish() return