deriveExtCPParameters - Initial estimates setup after data verification

deriveExtCPParameters established Initial parameters estimates before
the data verification steps so when data don't meet the minimum
criteria for estimation those initial parameters are returned.
This change moves the initialization step after data verification,
similar to what deriveCPParameters does for the envelope fitting case.
Fixes #3862
This commit is contained in:
Ale Martinez
2021-04-15 12:21:45 -03:00
parent 0b3a883303
commit ea548695b6

View File

@@ -989,16 +989,6 @@ ExtendedModel::onIntervalsChanged()
void
ExtendedModel::deriveExtCPParameters()
{
// initial estimates
paa = 1000;
etau = 1.2;
ecp = 300;
paa_dec = -2;
ecp_del = -0.9;
tau_del = -4.8;
ecp_dec = -0.6;
ecp_dec_del = -180;
#if 0
// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
// LEAST SQUARES FIT WITH ECP MODEL REQUIRES
@@ -1114,6 +1104,15 @@ ExtendedModel::deriveExtCPParameters()
break;
// initial estimates
paa = 1000;
etau = 1.2;
ecp = 300;
paa_dec = -2;
ecp_del = -0.9;
tau_del = -4.8;
ecp_dec = -0.6;
ecp_dec_del = -180;
// previous loop values
double etau_prev;