Revert "curveopt: try simple, but no good"

This reverts commit 7b5370bb5115b5179c4fb36093677330ef909e59.

diff --git a/curveopt.py b/curveopt.py
index 5ce8cf7c1e6da88a2e61fae3c9e5b299ac4bc33c..ab27e4458cc98e5fa41b4314229c58e0e07b99a2 100644 (file)
--- a/curveopt.py
+++ b/curveopt.py
@@ -48,7 +48,7 @@ class OptimisedCurve():
 
     oc._dbg(repr(fc_input))
 
-    findcurve_epsilon = 1E-10
+    findcurve_epsilon = 0.0001
 
     cl = ['./findcurve', '%d' % (nt+1), '%.18g' % findcurve_epsilon]
     oc._dbg('STARTING FINDCURVE %s' % cl)

diff --git a/findcurve.c b/findcurve.c
index ca3cd8fd4ae76c2ab12ddcd5cdccc7b4e0d1cb6a..dff770a105423bec8e9e52f5560f9e679874beba 100644 (file)
--- a/findcurve.c
+++ b/findcurve.c
@@ -137,7 +137,7 @@ int main(int argc, const char *const *argv) {
   gsl_vector_set_all(step_size, 0.01);
 
   gsl_multimin_fminimizer *minimiser =
-    gsl_multimin_fminimizer_alloc(gsl_multimin_fminimizer_nmsimplex2rand, NX);
+    gsl_multimin_fminimizer_alloc(gsl_multimin_fminimizer_nmsimplex2, NX);
 
   for (;;) {
     /* NINPUT + 1 doubles: startpoint, epsilon for residual */