mirror of
https://github.com/aportelli/LatAnalyze.git
synced 2025-04-10 19:20:44 +01:00
2pt-fit.cpp now has correct number of arguments for fold function if --fold is called.
This commit is contained in:
parent
b6c2efa666
commit
3e3cdf2d69
@ -110,10 +110,6 @@ int main(int argc, char *argv[])
|
|||||||
nt = corr[central].rows();
|
nt = corr[central].rows();
|
||||||
corr = corr.block(0, 0, nt, 1);
|
corr = corr.block(0, 0, nt, 1);
|
||||||
corr = CorrelatorUtils::shift(corr, shift);
|
corr = CorrelatorUtils::shift(corr, shift);
|
||||||
if (fold)
|
|
||||||
{
|
|
||||||
corr = CorrelatorUtils::fold(corr);
|
|
||||||
}
|
|
||||||
|
|
||||||
// make model //////////////////////////////////////////////////////////////
|
// make model //////////////////////////////////////////////////////////////
|
||||||
CorrelatorFitter fitter(corr);
|
CorrelatorFitter fitter(corr);
|
||||||
@ -140,6 +136,11 @@ int main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fold)
|
||||||
|
{
|
||||||
|
corr = CorrelatorUtils::fold(corr,modelPar);
|
||||||
|
}
|
||||||
|
|
||||||
// fit /////////////////////////////////////////////////////////////////////
|
// fit /////////////////////////////////////////////////////////////////////
|
||||||
DVec init(nPar);
|
DVec init(nPar);
|
||||||
NloptMinimizer globMin(NloptMinimizer::Algorithm::GN_CRS2_LM);
|
NloptMinimizer globMin(NloptMinimizer::Algorithm::GN_CRS2_LM);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user