portelli/LatAnalyze
1
0
Fork 0
mirror of https://github.com/aportelli/LatAnalyze.git synced 2024-11-10 00:45:36 +00:00
Code Releases Activity

Tidying done

Browse Source
This commit is contained in:
Andrew Zhen Ning Yong 2019-01-24 12:29:46 +00:00
parent 82d41d0b5d
commit 9d45d2e7a5
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
physics/2pt-fit.cpp
View File

@ -226,7 +226,7 @@ int main(int argc, char *argv[])
// set parameter name ///////////// // set parameter name /////////////
if(constModel) if(constModel)
{ {
mod.parName().setName(0, "delta_m"); mod.parName().setName(0, "const");
} }
else else
{ {
@ -251,12 +251,12 @@ int main(int argc, char *argv[])
init(0) = log(data.y(nt/4, 0)[central]/data.y(nt/4 + 1, 0)[central]); init(0) = log(data.y(nt/4, 0)[central]/data.y(nt/4 + 1, 0)[central]);
init(1) = data.y(nt/4, 0)[central]/(exp(-init(0)*nt/4)); init(1) = data.y(nt/4, 0)[central]/(exp(-init(0)*nt/4));
} }
for (Index p = 2; p < nPar; p += 2) for (Index p = 2; p < nPar; p += 2)
{ {
init(p) = 2*init(p - 2); init(p) = 2*init(p - 2);
init(p + 1) = init(p - 1)/2.; init(p + 1) = init(p - 1)/2.;
} }
// set limits for minimiser //////////////
for (Index p = 0; p < nPar; p += 2) for (Index p = 0; p < nPar; p += 2)
{ {
if (linearModel) if (linearModel)
@ -288,6 +288,7 @@ int main(int argc, char *argv[])
globMin.setVerbosity(verbosity); globMin.setVerbosity(verbosity);
locMin.setMaxIteration(1000000); locMin.setMaxIteration(1000000);
locMin.setVerbosity(verbosity); locMin.setVerbosity(verbosity);
// fit /////////////////////////////////
for (Index t = 0; t < nt; ++t) for (Index t = 0; t < nt; ++t)
{ {
data.fitPoint((t >= ti) and (t <= tf) data.fitPoint((t >= ti) and (t <= tf)
@ -311,34 +312,20 @@ int main(int argc, char *argv[])
fit = data.fit(locMin, init, mod); fit = data.fit(locMin, init, mod);
fit.print(); fit.print();
} }
// plots /////////////////////////////////////////////////////////////////// // plots ///////////////////////////////////////////////////////////////////
if (doPlot) if (doPlot)
{ {
Plot p; Plot p;
// if (!constModel)
// {
// p << PlotRange(Axis::x, 0, nt - 1);
// if (!linearModel)
// {
// p << LogScale(Axis::y);
// }
// p << Color("rgb 'blue'") << PlotFunction(fit.getModel(), 0, nt - 1); //<<<< problematic line for const fit
// p << Color("rgb 'blue'") << PlotPredBand(fit.getModel(_), 0, nt - 1);
// p << Color("rgb 'red'") << PlotData(data.getData());
// p.display();
// }
p << PlotRange(Axis::x, 0, nt - 1); p << PlotRange(Axis::x, 0, nt - 1);
if (!linearModel and !constModel) if (!linearModel and !constModel)
{ {
p << LogScale(Axis::y); p << LogScale(Axis::y);
} }
p << Color("rgb 'blue'") << PlotPredBand(fit.getModel(_), 0, nt - 1); p << Color("rgb 'blue'") << PlotPredBand(fit.getModel(_), 0, nt - 1);
p << Color("rgb 'blue'") << PlotFunction(fit.getModel(), 0, nt - 1); //<<<< problematic line for const fit p << Color("rgb 'blue'") << PlotFunction(fit.getModel(), 0, nt - 1);
p << Color("rgb 'red'") << PlotData(data.getData()); p << Color("rgb 'red'") << PlotData(data.getData());
p.display(); p.display();
// effective mass plot ////////////////////////////////////////////////////// // effective mass plot //////////////////////////////////////////////////////
if (!constModel) if (!constModel)
{ {