address @slivingston review comments

murrayrm · murrayrm · commit cf3daa41f0af · 2025-06-25T09:15:48.000-04:00
diff --git a/control/freqplot.py b/control/freqplot.py
@@ -1885,6 +1885,11 @@ def _parse_linestyle(style_name, allow_false=False):
     legend_loc, _, show_legend = _process_legend_keywords(
         kwargs, None, 'upper right')
 
+    # Figure out where the blended curve should start
+    if blend_fraction < 0 or blend_fraction > 1:
+        raise ValueError("blend_fraction must be between 0 and 1")
+    blend_curve_start = (1 - blend_fraction) * max_curve_magnitude
+
     # Create a list of lines for the output
     out = np.empty((len(nyquist_responses), 4), dtype=object)
     for i in range(len(nyquist_responses)):
@@ -1899,9 +1904,6 @@ def _parse_linestyle(style_name, allow_false=False):
             splane_contour = np.log(response.contour) / response.dt
 
         # Find the different portions of the curve (with scaled pts marked)
-        if blend_fraction < 0 or blend_fraction > 1:
-            raise ValueError("blend_fraction must be between 0 and 1")
-        blend_curve_start = (1 - blend_fraction) * max_curve_magnitude
         reg_mask = np.logical_or(
             np.abs(resp) > blend_curve_start,
             np.logical_not(np.isclose(splane_contour.real, 0)))
@@ -1918,8 +1920,7 @@ def _parse_linestyle(style_name, allow_false=False):
             abs_subset = np.abs(subset)
             unit_vectors = subset / abs_subset  # Preserve phase/direction
 
-            if blend_curve_start is None or \
-               blend_curve_start == max_curve_magnitude:
+            if blend_curve_start == max_curve_magnitude:
                 # Clip at max_curve_magnitude
                 resp[rescale_idx] = max_curve_magnitude * unit_vectors
             else:
diff --git a/control/tests/nyquist_test.py b/control/tests/nyquist_test.py
@@ -646,7 +646,11 @@ def test_nyquist_rescale():
     from datetime import date
 
     # Create the file to store figures
-    git_info = subprocess.check_output(['git', 'describe'], text=True).strip()
+    try:
+        git_info = subprocess.check_output(
+            ['git', 'describe'], text=True).strip()
+    except subprocess.CalledProcessError:
+        git_info = 'UNKNOWN-REPO-INFO'
     pdf = PdfPages(
         f'nyquist_gallery-{git_info}-{date.today().isoformat()}.pdf')
 
