diff --git a/pub/src/.deps/expr.Tpo b/pub/src/.deps/expr.Tpo
new file mode 100644
index 0000000000000000000000000000000000000000..53720c68155d20e7bf20c480b0bcebfe94e83afe
--- /dev/null
+++ b/pub/src/.deps/expr.Tpo
@@ -0,0 +1,513 @@
+expr.o: expr.cpp /usr/include/math.h /usr/include/features.h \
+ /usr/include/bits/predefs.h /usr/include/sys/cdefs.h \
+ /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
+ /usr/include/gnu/stubs-32.h /usr/include/bits/huge_val.h \
+ /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
+ /usr/include/bits/inf.h /usr/include/bits/nan.h \
+ /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
+ /usr/include/bits/mathinline.h /usr/include/c++/4.3/iostream \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/c++config.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/os_defines.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/cpu_defines.h \
+ /usr/include/c++/4.3/ostream /usr/include/c++/4.3/ios \
+ /usr/include/c++/4.3/iosfwd /usr/include/c++/4.3/bits/stringfwd.h \
+ /usr/include/c++/4.3/bits/postypes.h /usr/include/c++/4.3/cwchar \
+ /usr/include/c++/4.3/cstddef \
+ /usr/lib/gcc/i486-linux-gnu/4.3.4/include/stddef.h /usr/include/wchar.h \
+ /usr/include/stdio.h /usr/lib/gcc/i486-linux-gnu/4.3.4/include/stdarg.h \
+ /usr/include/bits/wchar.h /usr/include/xlocale.h /usr/include/stdint.h \
+ /usr/include/c++/4.3/exception /usr/include/c++/4.3/bits/char_traits.h \
+ /usr/include/c++/4.3/bits/stl_algobase.h \
+ /usr/include/c++/4.3/bits/functexcept.h \
+ /usr/include/c++/4.3/exception_defines.h \
+ /usr/include/c++/4.3/bits/cpp_type_traits.h \
+ /usr/include/c++/4.3/ext/type_traits.h \
+ /usr/include/c++/4.3/ext/numeric_traits.h \
+ /usr/include/c++/4.3/bits/stl_pair.h \
+ /usr/include/c++/4.3/bits/stl_move.h \
+ /usr/include/c++/4.3/bits/concept_check.h \
+ /usr/include/c++/4.3/bits/stl_iterator_base_types.h \
+ /usr/include/c++/4.3/bits/stl_iterator_base_funcs.h \
+ /usr/include/c++/4.3/bits/stl_iterator.h \
+ /usr/include/c++/4.3/debug/debug.h /usr/include/c++/4.3/cstdio \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/libio.h /usr/include/_G_config.h \
+ /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
+ /usr/include/bits/stdio.h /usr/include/c++/4.3/bits/localefwd.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/c++locale.h \
+ /usr/include/c++/4.3/clocale /usr/include/locale.h \
+ /usr/include/bits/locale.h /usr/include/c++/4.3/cctype \
+ /usr/include/ctype.h /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/c++/4.3/bits/ios_base.h \
+ /usr/include/c++/4.3/ext/atomicity.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/gthr.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/gthr-default.h \
+ /usr/include/pthread.h /usr/include/sched.h /usr/include/time.h \
+ /usr/include/bits/sched.h /usr/include/bits/time.h \
+ /usr/include/signal.h /usr/include/bits/sigset.h \
+ /usr/include/bits/pthreadtypes.h /usr/include/bits/setjmp.h \
+ /usr/include/unistd.h /usr/include/bits/posix_opt.h \
+ /usr/include/bits/environments.h /usr/include/bits/confname.h \
+ /usr/include/getopt.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/atomic_word.h \
+ /usr/include/c++/4.3/bits/locale_classes.h /usr/include/c++/4.3/string \
+ /usr/include/c++/4.3/bits/allocator.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/c++allocator.h \
+ /usr/include/c++/4.3/ext/new_allocator.h /usr/include/c++/4.3/new \
+ /usr/include/c++/4.3/bits/ostream_insert.h \
+ /usr/include/c++/4.3/cxxabi-forced.h \
+ /usr/include/c++/4.3/bits/stl_function.h \
+ /usr/include/c++/4.3/backward/binders.h \
+ /usr/include/c++/4.3/bits/basic_string.h \
+ /usr/include/c++/4.3/bits/basic_string.tcc \
+ /usr/include/c++/4.3/bits/locale_classes.tcc \
+ /usr/include/c++/4.3/streambuf /usr/include/c++/4.3/bits/streambuf.tcc \
+ /usr/include/c++/4.3/bits/basic_ios.h \
+ /usr/include/c++/4.3/bits/locale_facets.h /usr/include/c++/4.3/cwctype \
+ /usr/include/wctype.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/ctype_base.h \
+ /usr/include/c++/4.3/bits/streambuf_iterator.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/ctype_inline.h \
+ /usr/include/c++/4.3/bits/locale_facets.tcc \
+ /usr/include/c++/4.3/bits/basic_ios.tcc \
+ /usr/include/c++/4.3/bits/ostream.tcc /usr/include/c++/4.3/istream \
+ /usr/include/c++/4.3/bits/istream.tcc /usr/include/stdlib.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/sys/types.h /usr/include/sys/select.h \
+ /usr/include/bits/select.h /usr/include/sys/sysmacros.h \
+ /usr/include/alloca.h mystd.h /usr/include/c++/4.3/fstream \
+ /usr/include/c++/4.3/bits/codecvt.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/basic_file.h \
+ /usr/include/c++/4.3/i486-linux-gnu/bits/c++io.h \
+ /usr/include/c++/4.3/bits/fstream.tcc /usr/include/c++/4.3/vector \
+ /usr/include/c++/4.3/bits/stl_construct.h \
+ /usr/include/c++/4.3/bits/stl_uninitialized.h \
+ /usr/include/c++/4.3/bits/stl_vector.h \
+ /usr/include/c++/4.3/bits/stl_bvector.h \
+ /usr/include/c++/4.3/bits/vector.tcc olm.h boost/shared_ptr.hpp \
+ /usr/include/boost/smart_ptr/shared_ptr.hpp \
+ /usr/include/boost/config.hpp /usr/include/boost/config/user.hpp \
+ /usr/include/boost/config/select_compiler_config.hpp \
+ /usr/include/boost/config/compiler/gcc.hpp \
+ /usr/include/boost/config/select_stdlib_config.hpp \
+ /usr/include/boost/config/no_tr1/utility.hpp \
+ /usr/include/c++/4.3/utility /usr/include/c++/4.3/bits/stl_relops.h \
+ /usr/include/boost/config/stdlib/libstdcpp3.hpp \
+ /usr/include/boost/config/select_platform_config.hpp \
+ /usr/include/boost/config/platform/linux.hpp \
+ /usr/include/c++/4.3/cstdlib \
+ /usr/include/boost/config/posix_features.hpp \
+ /usr/include/boost/config/suffix.hpp \
+ /usr/include/boost/config/no_tr1/memory.hpp /usr/include/c++/4.3/memory \
+ /usr/include/c++/4.3/bits/stl_tempbuf.h \
+ /usr/include/c++/4.3/bits/stl_raw_storage_iter.h \
+ /usr/include/c++/4.3/backward/auto_ptr.h /usr/include/boost/assert.hpp \
+ /usr/include/assert.h /usr/include/boost/checked_delete.hpp \
+ /usr/include/boost/throw_exception.hpp \
+ /usr/include/boost/exception/detail/attribute_noreturn.hpp \
+ /usr/include/boost/detail/workaround.hpp \
+ /usr/include/boost/exception/exception.hpp \
+ /usr/include/boost/current_function.hpp \
+ /usr/include/boost/smart_ptr/detail/shared_count.hpp \
+ /usr/include/boost/smart_ptr/bad_weak_ptr.hpp \
+ /usr/include/boost/smart_ptr/detail/sp_counted_base.hpp \
+ /usr/include/boost/smart_ptr/detail/sp_has_sync.hpp \
+ /usr/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp \
+ /usr/include/boost/detail/sp_typeinfo.hpp /usr/include/c++/4.3/typeinfo \
+ /usr/include/boost/smart_ptr/detail/sp_counted_impl.hpp \
+ /usr/include/c++/4.3/functional \
+ /usr/include/boost/smart_ptr/detail/sp_convertible.hpp \
+ /usr/include/boost/smart_ptr/detail/spinlock_pool.hpp \
+ /usr/include/boost/smart_ptr/detail/spinlock.hpp \
+ /usr/include/boost/smart_ptr/detail/spinlock_sync.hpp \
+ /usr/include/boost/smart_ptr/detail/yield_k.hpp \
+ /usr/include/boost/memory_order.hpp /usr/include/c++/4.3/algorithm \
+ /usr/include/c++/4.3/bits/stl_algo.h \
+ /usr/include/c++/4.3/bits/algorithmfwd.h \
+ /usr/include/c++/4.3/bits/stl_heap.h \
+ /usr/include/boost/smart_ptr/detail/operator_bool.hpp list.h coord.h \
+ scan.h curve.h func.h expr.h readln.h xax_yacc.h xax_lex.h asi.h
+
+/usr/include/math.h:
+
+/usr/include/features.h:
+
+/usr/include/bits/predefs.h:
+
+/usr/include/sys/cdefs.h:
+
+/usr/include/bits/wordsize.h:
+
+/usr/include/gnu/stubs.h:
+
+/usr/include/gnu/stubs-32.h:
+
+/usr/include/bits/huge_val.h:
+
+/usr/include/bits/huge_valf.h:
+
+/usr/include/bits/huge_vall.h:
+
+/usr/include/bits/inf.h:
+
+/usr/include/bits/nan.h:
+
+/usr/include/bits/mathdef.h:
+
+/usr/include/bits/mathcalls.h:
+
+/usr/include/bits/mathinline.h:
+
+/usr/include/c++/4.3/iostream:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/c++config.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/os_defines.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/cpu_defines.h:
+
+/usr/include/c++/4.3/ostream:
+
+/usr/include/c++/4.3/ios:
+
+/usr/include/c++/4.3/iosfwd:
+
+/usr/include/c++/4.3/bits/stringfwd.h:
+
+/usr/include/c++/4.3/bits/postypes.h:
+
+/usr/include/c++/4.3/cwchar:
+
+/usr/include/c++/4.3/cstddef:
+
+/usr/lib/gcc/i486-linux-gnu/4.3.4/include/stddef.h:
+
+/usr/include/wchar.h:
+
+/usr/include/stdio.h:
+
+/usr/lib/gcc/i486-linux-gnu/4.3.4/include/stdarg.h:
+
+/usr/include/bits/wchar.h:
+
+/usr/include/xlocale.h:
+
+/usr/include/stdint.h:
+
+/usr/include/c++/4.3/exception:
+
+/usr/include/c++/4.3/bits/char_traits.h:
+
+/usr/include/c++/4.3/bits/stl_algobase.h:
+
+/usr/include/c++/4.3/bits/functexcept.h:
+
+/usr/include/c++/4.3/exception_defines.h:
+
+/usr/include/c++/4.3/bits/cpp_type_traits.h:
+
+/usr/include/c++/4.3/ext/type_traits.h:
+
+/usr/include/c++/4.3/ext/numeric_traits.h:
+
+/usr/include/c++/4.3/bits/stl_pair.h:
+
+/usr/include/c++/4.3/bits/stl_move.h:
+
+/usr/include/c++/4.3/bits/concept_check.h:
+
+/usr/include/c++/4.3/bits/stl_iterator_base_types.h:
+
+/usr/include/c++/4.3/bits/stl_iterator_base_funcs.h:
+
+/usr/include/c++/4.3/bits/stl_iterator.h:
+
+/usr/include/c++/4.3/debug/debug.h:
+
+/usr/include/c++/4.3/cstdio:
+
+/usr/include/bits/types.h:
+
+/usr/include/bits/typesizes.h:
+
+/usr/include/libio.h:
+
+/usr/include/_G_config.h:
+
+/usr/include/bits/stdio_lim.h:
+
+/usr/include/bits/sys_errlist.h:
+
+/usr/include/bits/stdio.h:
+
+/usr/include/c++/4.3/bits/localefwd.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/c++locale.h:
+
+/usr/include/c++/4.3/clocale:
+
+/usr/include/locale.h:
+
+/usr/include/bits/locale.h:
+
+/usr/include/c++/4.3/cctype:
+
+/usr/include/ctype.h:
+
+/usr/include/endian.h:
+
+/usr/include/bits/endian.h:
+
+/usr/include/bits/byteswap.h:
+
+/usr/include/c++/4.3/bits/ios_base.h:
+
+/usr/include/c++/4.3/ext/atomicity.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/gthr.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/gthr-default.h:
+
+/usr/include/pthread.h:
+
+/usr/include/sched.h:
+
+/usr/include/time.h:
+
+/usr/include/bits/sched.h:
+
+/usr/include/bits/time.h:
+
+/usr/include/signal.h:
+
+/usr/include/bits/sigset.h:
+
+/usr/include/bits/pthreadtypes.h:
+
+/usr/include/bits/setjmp.h:
+
+/usr/include/unistd.h:
+
+/usr/include/bits/posix_opt.h:
+
+/usr/include/bits/environments.h:
+
+/usr/include/bits/confname.h:
+
+/usr/include/getopt.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/atomic_word.h:
+
+/usr/include/c++/4.3/bits/locale_classes.h:
+
+/usr/include/c++/4.3/string:
+
+/usr/include/c++/4.3/bits/allocator.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/c++allocator.h:
+
+/usr/include/c++/4.3/ext/new_allocator.h:
+
+/usr/include/c++/4.3/new:
+
+/usr/include/c++/4.3/bits/ostream_insert.h:
+
+/usr/include/c++/4.3/cxxabi-forced.h:
+
+/usr/include/c++/4.3/bits/stl_function.h:
+
+/usr/include/c++/4.3/backward/binders.h:
+
+/usr/include/c++/4.3/bits/basic_string.h:
+
+/usr/include/c++/4.3/bits/basic_string.tcc:
+
+/usr/include/c++/4.3/bits/locale_classes.tcc:
+
+/usr/include/c++/4.3/streambuf:
+
+/usr/include/c++/4.3/bits/streambuf.tcc:
+
+/usr/include/c++/4.3/bits/basic_ios.h:
+
+/usr/include/c++/4.3/bits/locale_facets.h:
+
+/usr/include/c++/4.3/cwctype:
+
+/usr/include/wctype.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/ctype_base.h:
+
+/usr/include/c++/4.3/bits/streambuf_iterator.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/ctype_inline.h:
+
+/usr/include/c++/4.3/bits/locale_facets.tcc:
+
+/usr/include/c++/4.3/bits/basic_ios.tcc:
+
+/usr/include/c++/4.3/bits/ostream.tcc:
+
+/usr/include/c++/4.3/istream:
+
+/usr/include/c++/4.3/bits/istream.tcc:
+
+/usr/include/stdlib.h:
+
+/usr/include/bits/waitflags.h:
+
+/usr/include/bits/waitstatus.h:
+
+/usr/include/sys/types.h:
+
+/usr/include/sys/select.h:
+
+/usr/include/bits/select.h:
+
+/usr/include/sys/sysmacros.h:
+
+/usr/include/alloca.h:
+
+mystd.h:
+
+/usr/include/c++/4.3/fstream:
+
+/usr/include/c++/4.3/bits/codecvt.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/basic_file.h:
+
+/usr/include/c++/4.3/i486-linux-gnu/bits/c++io.h:
+
+/usr/include/c++/4.3/bits/fstream.tcc:
+
+/usr/include/c++/4.3/vector:
+
+/usr/include/c++/4.3/bits/stl_construct.h:
+
+/usr/include/c++/4.3/bits/stl_uninitialized.h:
+
+/usr/include/c++/4.3/bits/stl_vector.h:
+
+/usr/include/c++/4.3/bits/stl_bvector.h:
+
+/usr/include/c++/4.3/bits/vector.tcc:
+
+olm.h:
+
+boost/shared_ptr.hpp:
+
+/usr/include/boost/smart_ptr/shared_ptr.hpp:
+
+/usr/include/boost/config.hpp:
+
+/usr/include/boost/config/user.hpp:
+
+/usr/include/boost/config/select_compiler_config.hpp:
+
+/usr/include/boost/config/compiler/gcc.hpp:
+
+/usr/include/boost/config/select_stdlib_config.hpp:
+
+/usr/include/boost/config/no_tr1/utility.hpp:
+
+/usr/include/c++/4.3/utility:
+
+/usr/include/c++/4.3/bits/stl_relops.h:
+
+/usr/include/boost/config/stdlib/libstdcpp3.hpp:
+
+/usr/include/boost/config/select_platform_config.hpp:
+
+/usr/include/boost/config/platform/linux.hpp:
+
+/usr/include/c++/4.3/cstdlib:
+
+/usr/include/boost/config/posix_features.hpp:
+
+/usr/include/boost/config/suffix.hpp:
+
+/usr/include/boost/config/no_tr1/memory.hpp:
+
+/usr/include/c++/4.3/memory:
+
+/usr/include/c++/4.3/bits/stl_tempbuf.h:
+
+/usr/include/c++/4.3/bits/stl_raw_storage_iter.h:
+
+/usr/include/c++/4.3/backward/auto_ptr.h:
+
+/usr/include/boost/assert.hpp:
+
+/usr/include/assert.h:
+
+/usr/include/boost/checked_delete.hpp:
+
+/usr/include/boost/throw_exception.hpp:
+
+/usr/include/boost/exception/detail/attribute_noreturn.hpp:
+
+/usr/include/boost/detail/workaround.hpp:
+
+/usr/include/boost/exception/exception.hpp:
+
+/usr/include/boost/current_function.hpp:
+
+/usr/include/boost/smart_ptr/detail/shared_count.hpp:
+
+/usr/include/boost/smart_ptr/bad_weak_ptr.hpp:
+
+/usr/include/boost/smart_ptr/detail/sp_counted_base.hpp:
+
+/usr/include/boost/smart_ptr/detail/sp_has_sync.hpp:
+
+/usr/include/boost/smart_ptr/detail/sp_counted_base_gcc_x86.hpp:
+
+/usr/include/boost/detail/sp_typeinfo.hpp:
+
+/usr/include/c++/4.3/typeinfo:
+
+/usr/include/boost/smart_ptr/detail/sp_counted_impl.hpp:
+
+/usr/include/c++/4.3/functional:
+
+/usr/include/boost/smart_ptr/detail/sp_convertible.hpp:
+
+/usr/include/boost/smart_ptr/detail/spinlock_pool.hpp:
+
+/usr/include/boost/smart_ptr/detail/spinlock.hpp:
+
+/usr/include/boost/smart_ptr/detail/spinlock_sync.hpp:
+
+/usr/include/boost/smart_ptr/detail/yield_k.hpp:
+
+/usr/include/boost/memory_order.hpp:
+
+/usr/include/c++/4.3/algorithm:
+
+/usr/include/c++/4.3/bits/stl_algo.h:
+
+/usr/include/c++/4.3/bits/algorithmfwd.h:
+
+/usr/include/c++/4.3/bits/stl_heap.h:
+
+/usr/include/boost/smart_ptr/detail/operator_bool.hpp:
+
+list.h:
+
+coord.h:
+
+scan.h:
+
+curve.h:
+
+func.h:
+
+expr.h:
+
+readln.h:
+
+xax_yacc.h:
+
+xax_lex.h:
+
+asi.h:
diff --git a/pub/src/curve.cpp b/pub/src/curve.cpp
index cd6133e31234ed988dc6ec1bfa7a6e24e919fa25..844727a4c2c623550f6f250c80ed30d9ae612b7f 100644
--- a/pub/src/curve.cpp
+++ b/pub/src/curve.cpp
@@ -36,6 +36,7 @@ namespace NCurveFile
double numint_epsabs=1e-10, numint_epsrel=1e-10;
};
+bool allow_slow_conv = true;
//***************************************************************************//
//* generic operations on curves *//
@@ -483,7 +484,7 @@ void NCurveFile::SetFitTuningPars( string which )
//! Fit.
-void NCurveFile::Fit(void)
+void NCurveFile::Fit( bool _allow_slow_conv )
{
COlc *fc;
COld *fd;
@@ -493,6 +494,7 @@ void NCurveFile::Fit(void)
lm_control_type control;
FitDatTyp data;
double ysum1, ysum2, ydev2;
+ allow_slow_conv = _allow_slow_conv;
NOlm::IterateC fiter;
while((fc=fiter())) {
@@ -577,6 +579,7 @@ void NCurveFile::Fit(void)
printf( "%s\n", lm_shortmsg[ control.info ] );
}
}
+ allow_slow_conv = true;
}
diff --git a/pub/src/curve.h b/pub/src/curve.h
index 3ac89cb9c23a4f49d2d81d8b244ffaa50e6208bf..1690710b43b3bba6ba82ae991eabc074021c4116 100644
--- a/pub/src/curve.h
+++ b/pub/src/curve.h
@@ -30,7 +30,7 @@ namespace NCurveFile {
void SetFixed( string how );
void SetFitTuningPars( string which );
- void Fit( void );
+ void Fit( bool _allow_slow_conv );
void SetIntTuningPars( string which );
void IntegralProperty( void );
diff --git a/pub/src/expr.cpp b/pub/src/expr.cpp
index c42c934112faa2e039b4168a4cbec9db0fbb54f5..f6aa5d1a14e85791d486b3e6949d03478b1a5d6e 100644
--- a/pub/src/expr.cpp
+++ b/pub/src/expr.cpp
@@ -15,6 +15,7 @@
#include "readln.h"
bool debug = false;
+extern bool allow_slow_conv;
#define DEB(args) if ( debug ) printf args
@@ -510,7 +511,7 @@ void CTree::tree_val( CTOut *ret, const CContext *ctx ) const
}
}
}
- } else
+ } else
conv_step = 0;
// Preset fv,sv,nv.
fv = NOlm::MOM[kconv].D();
@@ -557,6 +558,9 @@ void CTree::tree_val( CTOut *ret, const CContext *ctx ) const
}
}
}
+ if( !conv_step && !allow_slow_conv )
+ throw string(
+ "not equidistant and slow convolution not allowed" );
}
// The actual computation is rather different for _CONV and _DIRAC:
if ( typ == _CONV ) {
diff --git a/pub/src/frida2.cpp b/pub/src/frida2.cpp
index a2d10f549d7140df6de7561a4027d7fda57c6708..1e4eda690a10cf893d0061dfc890735e05b2d7b9 100644
--- a/pub/src/frida2.cpp
+++ b/pub/src/frida2.cpp
@@ -115,6 +115,7 @@ int main()
" cp print parameters\n"
"Fit to data:\n"
" cf fit\n"
+ " cfs fit, allow slow convolution\n"
" cx toggle fixed (also: cx+ cx-)\n"
" cyli weight y lin\n"
" cylg weight y log\n"
@@ -153,7 +154,9 @@ int main()
NCurveFile::ShowPar();
} else if (cmd == "cf") {
- NCurveFile::Fit();
+ NCurveFile::Fit( false );
+ } else if (cmd == "cfs") {
+ NCurveFile::Fit( true );
} else if (cmd.substr(0,2) == "cx") {
NCurveFile::SetFixed(cmd.substr(2));
} else if (cmd == "cyli") {