Skip to content
Snippets Groups Projects
Commit 0ae0a821 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

kconv is not a fit parameter, but a generic curve parameter

parent cdcbbc42
No related branches found
No related tags found
No related merge requests found
......@@ -127,10 +127,10 @@ void COlc::copy_meta_C_from_other( const COlc* other )
copy_meta_O_from_other( other );
expr = other->expr;
T = other->T;
kconv = other->kconv;
nP = other->nP;
PCo = other->PCo;
kd = other->kd;
kconv = other->kconv;
weighing = other->weighing;
plot_to_grid = other->plot_to_grid;
range_expr = other->range_expr;
......
......@@ -93,6 +93,7 @@ class COlc : public COlo {
enum TScrInp { _STDIN, _CMDLIN } scrInpMode; ///< Where pars are read from
string expr; ///< The curve's definition (input expression).
RNode T; ///< The curve's definition (parsed tree).
int kconv; ///< Index of resolution file to convolve with.
int nP; ///< Number of parameters.
// Refined description:
......@@ -100,7 +101,6 @@ class COlc : public COlo {
// Fitting:
int kd; ///< Index of data file to be fitted.
int kconv; ///< Index of resolution file to convolve with.
enum TWgt { _LIN, _LOG, _VAR, _VARC, _VARD, _LAST_TWGT=_VARD }
weighing; ///< Weight mode for fitting.
static string wgtNames[];
......@@ -111,7 +111,7 @@ class COlc : public COlo {
double chi2; ///< Global chi^2
COlc() :
COlo(), evaMode(_EXPR), scrInpMode(_STDIN), kd(-1), kconv(-1), weighing( _VAR ),
COlo(), evaMode(_EXPR), scrInpMode(_STDIN), kconv(-1), kd(-1), weighing( _VAR ),
plot_to_grid( false ), range_expr(""), chi2(0) {}
// Functions that exist similarly for COld and COlc:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment