From 7309bb681100f9085f2b62f35ed9b7a1c1546ca7 Mon Sep 17 00:00:00 2001
From: James Cherry <cherry@parallaxsw.com>
Date: Wed, 4 Nov 2020 14:33:11 -0800
Subject: [PATCH] DmpZeroC2

---
 dcalc/DmpCeff.cc | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/dcalc/DmpCeff.cc b/dcalc/DmpCeff.cc
index fec6e609..3365e0ab 100644
--- a/dcalc/DmpCeff.cc
+++ b/dcalc/DmpCeff.cc
@@ -1199,25 +1199,21 @@ void
 DmpZeroC2::gateDelaySlew(double &delay,
 			 double &slew)
 {
-#if 0
-  // Not converging to a reasonable solution. set_load10
-  const char *error = findDriverParams(c1_);
-  ceff_ = c1_;
-  driver_valid_ = (error == nullptr);
-  if (error == nullptr)
-    error = findDriverDelaySlew(delay, slew);
-  if (error) {
-    fail(error);
+  try {
+    findDriverParams(c1_);
+    ceff_ = c1_;
+    driver_valid_ = true;
+    findDriverDelaySlew(delay, slew);
+  }
+  catch (DmpError &error) {
+    fail(error.what());
     // Fall back to table slew.
+    driver_valid_ = false;
+    ceff_ = c1_;
     gateCapDelaySlew(ceff_, delay, slew);
   }
   vo_delay_ = delay;
   gate_slew_ = slew;
-#endif
-  ceff_ = c1_;
-  gateCapDelaySlew(ceff_, delay, slew);
-  vo_delay_ = delay;
-  gate_slew_ = slew;
 }
 
 double