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

Compare commits

base: portelli:b796bfbd68e03824cacb614a568652097e2844b7
Branches Tags
portelli:master
portelli:develop
portelli:feature/cmake
portelli:andrew-pr
portelli:feature/fit-phys
portelli:3.5.1
portelli:3.5
portelli:3.4
portelli:3.3.1
portelli:3.3
portelli:3.2.2
portelli:3.2.1
portelli:3.2
portelli:3.1.2
portelli:3.1.1
portelli:3.1
..
compare: portelli:fecc5690f3cdbcfe7e5f5b8a2c74f2751d04eb8c
Branches Tags
portelli:develop
portelli:feature/cmake
portelli:andrew-pr
portelli:master
portelli:feature/fit-phys
portelli:3.5.1
portelli:3.5
portelli:3.4
portelli:3.3.1
portelli:3.3
portelli:3.2.2
portelli:3.2.1
portelli:3.2
portelli:3.1.2
portelli:3.1.1
portelli:3.1

2 Commits
b796bfbd68 ... fecc5690f3

Author SHA1 Message Date
Matt Spraggs
fecc5690f3
Merge 269d0c338e into c73b609ac5 2023-08-21 10:03:16 -05:00
Antonin Portelli
c73b609ac5 2pt fit: option to bypass parameter guess 2023-08-18 13:54:55 +01:00
1 changed files with 7 additions and 3 deletions
Show Stats Expand all files Collapse all files

10
physics/2pt-fit.cpp
View File

@ -24,7 +24,7 @@ int main(int argc, char *argv[])
{
// parse arguments /////////////////////////////////////////////////////////
OptParser opt;
bool parsed, doLaplace, doPlot, doHeatmap, doCorr, fold, doScan;
bool parsed, doLaplace, doPlot, doHeatmap, doCorr, fold, doScan, noGuess;
string corrFileName, model, outFileName, outFmt, savePlot;
Index ti, tf, shift, nPar, thinning;
double svdTol;
@ -59,6 +59,8 @@ int main(int argc, char *argv[])
"show the fit plot");
opt.addOption("h", "heatmap" , OptParser::OptType::trigger, true,
"show the fit correlation heatmap");
opt.addOption("", "no-guess" , OptParser::OptType::trigger, true,
"do not try to guess fit parameters");
opt.addOption("", "save-plot", OptParser::OptType::value, true,
"saves the source and .pdf", "");
opt.addOption("", "scan", OptParser::OptType::trigger, true,
@ -87,6 +89,7 @@ int main(int argc, char *argv[])
fold = opt.gotOption("fold");
doPlot = opt.gotOption("p");
doHeatmap = opt.gotOption("h");
noGuess = opt.gotOption("no-guess");
savePlot = opt.optionValue("save-plot");
doScan = opt.gotOption("scan");
switch (opt.optionValue<unsigned int>("v"))
@ -167,13 +170,14 @@ int main(int argc, char *argv[])
fitter.setThinning(thinning);
// set initial values ******************************************************
if (modelPar.type != CorrelatorType::undefined)
if ((modelPar.type != CorrelatorType::undefined) and !noGuess)
{
init = CorrelatorModels::parameterGuess(corr, modelPar);
}
else
{
init.fill(0.1);
init.fill(1.);
init(0) = 0.2;
}
// set limits for minimisers ***********************************************