LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

removed some unnecessary output and slightly improved automatic phase estimate

Browse Source
This commit is contained in:
nemu 2009-01-09 13:10:18 +00:00
parent 1784869368
commit ba6028fc6f
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/classes/PMusrCanvas.cpp
View File

@ -1589,9 +1589,9 @@ cout << endl << ">> theory scale = " << scale << ", data.res/theory.res = " << f
} }
// apply global phase if present // apply global phase if present
cout << endl << ">> fFourier.fPhase = " << fFourier.fPhase; //cout << endl << ">> fFourier.fPhase = " << fFourier.fPhase;
if (fFourier.fPhase != 0.0) { if (fFourier.fPhase != 0.0) {
cout << endl << ">> apply global phase fFourier.fPhase = " << fFourier.fPhase; //cout << endl << ">> apply global phase fFourier.fPhase = " << fFourier.fPhase;
double re, im; double re, im;
const double cp = TMath::Cos(fFourier.fPhase/180.0*TMath::Pi()); const double cp = TMath::Cos(fFourier.fPhase/180.0*TMath::Pi());
const double sp = TMath::Sin(fFourier.fPhase/180.0*TMath::Pi()); const double sp = TMath::Sin(fFourier.fPhase/180.0*TMath::Pi());
@ -1772,7 +1772,7 @@ cout << endl << ">> in FindOptimalFourierPhase ... ";
if ((fData[0].dataFourierRe == 0) || (fData[0].dataFourierIm == 0)) if ((fData[0].dataFourierRe == 0) || (fData[0].dataFourierIm == 0))
return 0.0; return 0.0;
double minPhase, x, valIm; double minPhase, x, valIm, val_xMin, val_xMax;
double minIm, maxIm, asymmetry; double minIm, maxIm, asymmetry;
// get min/max of the imaginary part for phase = 0.0 as a starting point // get min/max of the imaginary part for phase = 0.0 as a starting point
minPhase = 0.0; minPhase = 0.0;
@ -1784,16 +1784,18 @@ cout << endl << ">> in FindOptimalFourierPhase ... ";
if (first) { if (first) {
minIm = valIm; minIm = valIm;
maxIm = valIm; maxIm = valIm;
val_xMin = valIm;
first = false; first = false;
} else { } else {
if (valIm < minIm) if (valIm < minIm)
minIm = valIm; minIm = valIm;
if (valIm > maxIm) if (valIm > maxIm)
maxIm = valIm; maxIm = valIm;
val_xMax = valIm;
} }
} }
} }
asymmetry = maxIm + minIm; asymmetry = (maxIm+minIm)*(val_xMin-val_xMax);
// go through all phases an check if there is a larger max-min value of the imaginary part // go through all phases an check if there is a larger max-min value of the imaginary part
double cp, sp; double cp, sp;
@ -1808,19 +1810,21 @@ cout << endl << ">> in FindOptimalFourierPhase ... ";
if (first) { if (first) {
minIm = valIm; minIm = valIm;
maxIm = valIm; maxIm = valIm;
val_xMin = valIm;
first = false; first = false;
} else { } else {
if (valIm < minIm) if (valIm < minIm)
minIm = valIm; minIm = valIm;
if (valIm > maxIm) if (valIm > maxIm)
maxIm = valIm; maxIm = valIm;
val_xMax = valIm;
} }
} }
} }
if (fabs(asymmetry) > fabs(maxIm+minIm)) { if (fabs(asymmetry) > fabs((maxIm+minIm)*(val_xMin-val_xMax))) {
cout << endl << ">> phase = " << phase << ", asymmetry = " << asymmetry << ", min/max = " << minIm << "/" << maxIm; //cout << endl << ">> phase = " << phase << ", asymmetry = " << asymmetry << ", min/max = " << minIm << "/" << maxIm;
minPhase = phase; minPhase = phase;
asymmetry = maxIm+minIm; asymmetry = (maxIm+minIm)*(val_xMin-val_xMax);
} }
} }
cout << endl << ">> optimal phase = " << minPhase << endl; cout << endl << ">> optimal phase = " << minPhase << endl;