Upload grid_seeded.py

tilt angle tolerance increased to 30 degree

grid_seeded.py

@@ -108,7 +108,19 @@ WIN_PERIODS = 6.2        # window width in ruling periods: 4 for the block,
                          # the rest for phase search and the angle crop
 PER_WORK    = WORK / WIN_PERIODS      # a period is ALWAYS this many work px
 HP_W        = int(0.25 * PER_WORK) | 1
-ANG_RANGE   = 14.0       # deg, rotation half-range
+ANG_RANGE   = 30.0       # deg, rotation half-range. Widened from 14: phone-through-
+                         # eyepiece photos are routinely tilted 15-17 deg (measured on
+                         # the 20260901 cos7 set), which sat AT/OUTSIDE the old +/-14 box.
+                         # The coarse tilt search then pinned at the boundary or locked
+                         # onto a spurious negative-angle autocorrelation peak, and every
+                         # downstream period and line offset came out wrong -- the fit was
+                         # then (correctly) rejected by QC, so the tap "failed". Set to 30
+                         # for headroom against steeper future tilts. Low-tilt photos are
+                         # unaffected: their autocorrelation peak is in the same place, and
+                         # widening only scans extra angles that score lower.
+                         # HARD CEILING: keep this < 45. A square grid repeats every 90 deg,
+                         # so a tilt past 45 aliases into the perpendicular axis (the two
+                         # ruling directions swap) and the reported angle becomes ambiguous.
 BOOT_FRAC   = 0.55       # v3c's fixed window -- used only to seed the fixed point
 MAX_ITER    = 4
 REPEAT_TOL  = 0.03       # period change below this ends the fixed point
@@ -686,10 +698,31 @@ def _finish(g, s1, verify):
     }
 
 
+# ---- multi-start retry --------------------------------------------------
+# One tap fits ONE analysis window. On a faint, cluttered or tilted grid that
+# window can land on a patch where the period fixed point wanders and the fit
+# is (correctly) rejected by QC -- while the SAME block, seeded a little to one
+# side, fits cleanly. Measured on the 20260901 cos7 set: a single centre tap
+# failed on 2 of 4 quadrants, yet every quadrant fit at some nearby tap. A user
+# re-tapping is doing exactly this by hand. So on failure we retry from a small
+# ring of nearby seeds and keep the first that PASSES THE SAME QC gate -- this
+# never loosens acceptance, it only gives the fitter more starting points.
+RETRY_RING = 8           # seeds tried on failure, evenly spaced on a ring
+RETRY_RADIUS_FRAC = 0.08  # ring radius as a fraction of the short image side.
+                          # ~0.5-0.8 of a ruling period on these photos, so the
+                          # retries stay well inside the tapped block and cannot
+                          # jump to a neighbouring one (block ~4 periods across).
+
+
 def detect_from_seed(image, seed_xy, verify=True, period_hint=None,
-                     lock=False, want_debug=False):
+                     lock=False, want_debug=False,
+                     retries=RETRY_RING, retry_radius_frac=RETRY_RADIUS_FRAC):
     """One tap -> the four corners of the surrounding 4x4 counting block.
 
+    Fits at the tap; if that is rejected, retries from a ring of nearby seeds
+    (see RETRY_RING above) and returns the first fit that passes QC, otherwise
+    the original rejection. Set retries=0 for the old single-shot behaviour.
+
     Parameters
     ----------
     image : ndarray, HxW grey or HxWx3 RGB. Use the FULL-resolution image;
@@ -705,6 +738,30 @@ def detect_from_seed(image, seed_xy, verify=True, period_hint=None,
 
     Returns a JSON-safe dict. Always check ``ok`` before using ``corners``.
     """
+    import math
+    out = _detect_from_seed_once(image, seed_xy, verify, period_hint,
+                                 lock, want_debug)
+    if out.get("ok") or retries <= 0:
+        return out
+    H, W = image.shape[:2]
+    r = retry_radius_frac * min(H, W)
+    sx0, sy0 = float(seed_xy[0]), float(seed_xy[1])
+    for k in range(int(retries)):
+        a = 2.0 * math.pi * k / int(retries)
+        s2 = (sx0 + r * math.cos(a), sy0 + r * math.sin(a))
+        if not (0 <= s2[0] < W and 0 <= s2[1] < H):
+            continue
+        alt = _detect_from_seed_once(image, s2, verify, period_hint,
+                                     lock, want_debug)
+        if alt.get("ok"):
+            alt["retry_seed"] = [int(s2[0]), int(s2[1])]
+            return alt
+    return out
+
+
+def _detect_from_seed_once(image, seed_xy, verify=True, period_hint=None,
+                           lock=False, want_debug=False):
+    """Single-window fit at exactly `seed_xy`. See detect_from_seed."""
     g = cv2.cvtColor(image, cv2.COLOR_RGB2GRAY) if image.ndim == 3 else image
     g = np.ascontiguousarray(g)
     H, W = g.shape[:2]