portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2025-04-10 19:20:44 +01:00
Code Releases Activity

1) fold now requires second argument: modelPar to properly fold correlators with cosh/sinh form. 2) makeSinhModel has the appropriate alternate sign s.t the prefactor remains positive. 3) parameterGuess uses correct analytic form for sinh-type correlator's init(1), corresponding to the prefactor.

Browse Source
This commit is contained in:
Andrew Zhen Ning Yong 2020-07-07 10:07:05 +01:00
parent 417e068485
commit b6c2efa666
2 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
lib/Physics/CorrelatorFitter.cpp
View File

@ -84,7 +84,7 @@ DoubleModel CorrelatorModels::makeSinhModel(const Index nState, const Index nt)
for (unsigned int i = 0; i < nState; ++i) for (unsigned int i = 0; i < nState; ++i)
{ {
res += p[2*i + 1]*(exp(-p[2*i]*x[0]) - exp(-p[2*i]*(nt - x[0]))); res += p[2*i + 1]*(- exp(-p[2*i]*x[0]) + exp(-p[2*i]*(nt - x[0])));
} }
return res; return res;
@ -200,8 +200,6 @@ DVec CorrelatorModels::parameterGuess(const DMatSample &corr,
LATAN_ERROR(Argument, "correlator type is undefined"); LATAN_ERROR(Argument, "correlator type is undefined");
break; break;
case CorrelatorType::exp: case CorrelatorType::exp:
case CorrelatorType::cosh:
case CorrelatorType::sinh:
init.resize(2*par.nState); init.resize(2*par.nState);
init(0) = log(corr[central](nt/4)/corr[central](nt/4 + 1)); init(0) = log(corr[central](nt/4)/corr[central](nt/4 + 1));
init(1) = corr[central](nt/4)/(exp(-init(0)*nt/4)); init(1) = corr[central](nt/4)/(exp(-init(0)*nt/4));
@ -211,6 +209,26 @@ DVec CorrelatorModels::parameterGuess(const DMatSample &corr,
init(p + 1) = init(p - 1)/2.; init(p + 1) = init(p - 1)/2.;
} }
break; break;
case CorrelatorType::cosh:
init.resize(2*par.nState);
init(0) = log(corr[central](nt/4)/corr[central](nt/4 + 1));
init(1) = corr[central](nt/4)/(exp(-init(0)*nt/4) + exp(-init(0)*3*nt/4));
for (Index p = 2; p < init.size(); p += 2)
{
init(p) = 2*init(p - 2);
init(p + 1) = init(p - 1)/2.;
}
break;
case CorrelatorType::sinh:
init.resize(2*par.nState);
init(0) = log(corr[central](nt/4)/corr[central](nt/4 + 1));
init(1) = corr[central](nt/4)/( -exp(-init(0)*nt/4) +exp(-init(0)*3*nt/4));
for (Index p = 2; p < init.size(); p += 2)
{
init(p) = 2*init(p - 2);
init(p + 1) = init(p - 1)/2.;
}
break;
case CorrelatorType::linear: case CorrelatorType::linear:
init.resize(2); init.resize(2);
init(0) = corr[central](nt/4) - corr[central](nt/4 + 1, 0); init(0) = corr[central](nt/4) - corr[central](nt/4 + 1, 0);
@ -253,16 +271,39 @@ DMatSample CorrelatorUtils::shift(const DMatSample &c, const Index ts)
} }
} }
DMatSample CorrelatorUtils::fold(const DMatSample &c) DMatSample CorrelatorUtils::fold(const DMatSample &c, const CorrelatorModels::ModelPar &par)
{ {
const Index nt = c[central].rows(); const Index nt = c[central].rows();
DMatSample buf = c; DMatSample buf = c;
int sign;
FOR_STAT_ARRAY(buf, s) bool fold = false;
switch (par.type)
{ {
for (Index t = 0; t < nt; ++t) case CorrelatorType::cosh:
case CorrelatorType::cst:
sign = 1;
fold = true;
break;
case CorrelatorType::sinh:
sign = -1;
fold = true;
break;
case CorrelatorType::linear:
cout << "Linear model is asymmetric: will not fold." << endl;
break;
default:
break;
}
if (fold)
{
FOR_STAT_ARRAY(buf, s)
{ {
buf[s](t) = 0.5*(c[s](t) + c[s]((nt - t) % nt)); for (Index t = 0; t < nt; ++t)
{
buf[s](t) = 0.5*(c[s](t) + sign*c[s]((nt - t) % nt));
}
} }
} }

2
lib/Physics/CorrelatorFitter.hpp
View File

@ -56,7 +56,7 @@ namespace CorrelatorModels
namespace CorrelatorUtils namespace CorrelatorUtils
{ {
DMatSample shift(const DMatSample &c, const Index ts); DMatSample shift(const DMatSample &c, const Index ts);
DMatSample fold(const DMatSample &c); DMatSample fold(const DMatSample &c, const CorrelatorModels::ModelPar &par);
DMatSample fourierTransform(const DMatSample &c, FFT &fft, DMatSample fourierTransform(const DMatSample &c, FFT &fft,
const unsigned int dir = FFT::Forward); const unsigned int dir = FFT::Forward);
}; };